muzik 0.2.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: eda1f09112cb4b20c59737e2a78bc34282673658313e4aa0a5218c9817e36366
-  data.tar.gz: 23e559027996fc118af38d35d04702feff15d5b5cdecd1fe1a40174eac0a9ae6
+  metadata.gz: 250ee7b2c77575472dee61fe444ea5efa339394eb9568155a07ff1fe407b77a2
+  data.tar.gz: 8df12728541a2717296aa850ef2915fa2326f7a21a2d4944f5caac71936d7b2d
 SHA512:
-  metadata.gz: 820b90c198f055c24876579b153bbbe24d0e99c4c76aa56002783bf37bc8e4c43d2475d2b71d22579dcc7e1d72dd43df10edcdea36283410a40c08930ad83ce9
-  data.tar.gz: 4476b71689009650cc5a61420fdc24a4e8c1fdf41611880faa5e7c04b074e2045454ca515c1b7cc4de4ced71886eddb13b7863582c34bd0dd0947e8ebf120f4c
+  metadata.gz: 52740be7c889dbdafbda9812a2ad76f98a37c69fbba876a385ddfd3d63e46efc0e711252a720b1a6e0420e705f6c461ee6d259ed43f0b43c2cd30dfb94a7e721
+  data.tar.gz: b88a110716a61d7fae02cacd7df68ab69bb081f12e27a714d1c923514cce0365fc4de15e1b61f303d20c19c7d7a5a0e3d84383c53cbbc0c53ddb08f035f008ae

data/bin/muzik

@@ -4,24 +4,27 @@ if ARGV.empty?
   puts('Available commands:')
   [
     'sync [external PATH]',
-    'upload',
+    'upload [nogithub]',
     'tag',
     'download',
     'stage',
     'init',
     'config [FIELD=VALUE...]',
+    'patch',
     'refresh [cloud|local|external PATH]',
     'setup [cloud|local|external PATH]'
   ].each { |command| puts("  #{command}") }
   exit(true)
 end
 
+base_path = "~/muzik#{'-debug' if ARGV.last == '-d'}"
+
 if ARGV.first == 'init'
   create_dir = lambda do |name|
     Dir.mkdir(name) unless Dir.exist?(name)
   end
 
-  directory = File.expand_path('~/muzik')
+  directory = File.expand_path(base_path)
   create_dir.call(directory)
   create_dir.call("#{directory}/download")
   create_dir.call("#{directory}/upload")
@@ -37,7 +40,7 @@ def boom(message)
   exit(false)
 end
 
-location = File.expand_path('~/muzik/config.json')
+location = File.expand_path("#{base_path}/config.json")
 boom('No config file found. Run `muzik init` to initialize it.') unless File.exists?(location)
 
 require 'json'
@@ -48,7 +51,7 @@ rescue StandardError
   boom('Error parsing config file.')
 end
 
-def instantiate(cloud: true, external: nil)
+def instantiate(cloud: true, external: nil, github: true)
   require 'muzik'
 
   options = {
@@ -62,18 +65,22 @@ def instantiate(cloud: true, external: nil)
   else
     options.merge!(
       apple_music: CONFIG['apple_music'],
-      github_access_token: CONFIG['github_access_token'],
-      github_repo: CONFIG['github_repo'],
       local_path: CONFIG['local_path'],
       upload_path: CONFIG['upload_path']
     )
+    if github
+      options.merge!(
+        github_access_token: CONFIG['github_access_token'],
+        github_repo: CONFIG['github_repo']
+      )
+    end
   end
 
   Muzik::Client.new(**options)
 end
 
 def get_external_path(value)
-  boom('No external path provided') unless value
+  boom('No external path provided') unless value && value != '-d'
 
   path = File.expand_path(value.to_s)
   boom("Invalid external path: #{value}") unless File.exists?(path)
@@ -85,7 +92,7 @@ begin
   case ARGV.first
   when 'sync'
     case ARGV[1]
-    when nil
+    when nil, '-d'
       instantiate.sync
     when 'external'
       instantiate(external: get_external_path(ARGV[2])).sync
@@ -93,12 +100,19 @@ begin
       boom("Unknown sync option: #{ARGV[1]}")
     end
   when 'upload'
-    instantiate.upload
+    case ARGV[1]
+    when nil, '-d'
+      instantiate.upload
+    when 'nogithub'
+      instantiate(github: false).upload
+    else
+      boom("Unknown upload option: #{ARGV[1]}")
+    end
   when 'tag'
     system('open', CONFIG['download_path'], '-a', CONFIG['tagging_app'])
   when 'download'
     system(
-      'youtube-dl',
+      'yt-dlp',
       '-x',
       '--audio-format',
       'mp3',
@@ -115,6 +129,39 @@ begin
     end
 
     puts("#{file_count} file#{file_count == 1 ? '' : 's'} staged for upload.".green)
+  when 'auth'
+    location = CONFIG['google_drive_config_location']
+    require 'google_drive'
+    begin
+      GoogleDrive::Session.from_config(location)
+      puts('Google Drive authentication is working properly.'.green)
+    rescue Signet::AuthorizationError
+      begin
+        google_drive_config = JSON.parse(File.read(location))
+      rescue StandardError
+        boom('Error parsing Google Drive config file.')
+      end
+
+      google_drive_config = google_drive_config.slice('client_id', 'client_secret')
+      File.write(location, JSON.pretty_generate(google_drive_config))
+      GoogleDrive::Session.from_config(location)
+      puts('Google Drive authentication updated successfully.'.green)
+    end
+  when 'patch'
+    instantiate(github: false).upload
+    instantiate.refresh_cloud
+  when 'refresh'
+    case ARGV[1]
+    when 'cloud'
+      instantiate.refresh_cloud
+    when 'local'
+      instantiate.refresh_local
+    when 'external'
+      instantiate(external: get_external_path(ARGV[2])).refresh_local
+    else
+      unknown_refresh_type = ARGV[1] == '-d' ? '' : ARGV[1]
+      boom("Unknown refresh type: #{unknown_refresh_type}")
+    end
   when 'config'
     begin
       args = ARGV[1..].map { |arg| arg.split('=', 2) }.to_h
@@ -138,7 +185,7 @@ begin
     args.each { |arg, _| boom("Unkown argument: #{arg}") unless valid_args.include?(arg) }
     args = CONFIG.merge(args)
 
-    directory = File.expand_path('~/muzik')
+    directory = File.expand_path(base_path)
     args['upload_path'] ||= File.expand_path("#{directory}/upload")
     args['download_path'] ||= File.expand_path("#{directory}/download")
     args['trash_path'] ||= File.expand_path("#{directory}/trash")
@@ -147,17 +194,6 @@ begin
     args['tagging_app'] ||= 'Mp3Tag'
 
     File.write("#{directory}/config.json", JSON.pretty_generate(args))
-  when 'refresh'
-    case ARGV[1]
-    when 'cloud'
-      instantiate.refresh_cloud
-    when 'local'
-      instantiate.refresh_local
-    when 'external'
-      instantiate(external: get_external_path(ARGV[2])).refresh_local
-    else
-      boom("Unknown refresh type: #{ARGV[1]}")
-    end
   when 'setup'
     case ARGV[1]
     when 'cloud'
@@ -167,25 +203,8 @@ begin
     when 'external'
       instantiate(cloud: false, external: get_external_path(ARGV[2])).setup_local
     else
-      boom("Unknown setup type: #{ARGV[1]}")
-    end
-  when 'auth'
-    location = CONFIG['google_drive_config_location']
-    require 'google_drive'
-    begin
-      GoogleDrive::Session.from_config(location)
-      puts('Google Drive authentication is working properly.'.green)
-    rescue Signet::AuthorizationError
-      begin
-        google_drive_config = JSON.parse(File.read(location))
-      rescue StandardError
-        boom('Error parsing Google Drive config file.')
-      end
-
-      google_drive_config = google_drive_config.slice('client_id', 'client_secret')
-      File.write(location, JSON.pretty_generate(google_drive_config))
-      GoogleDrive::Session.from_config(location)
-      puts('Google Drive authentication updated successfully.'.green)
+      unknown_setup_type = ARGV[1] == '-d' ? '' : ARGV[1]
+      boom("Unknown setup type: #{unknown_setup_type}")
     end
   else
     boom("Unknown command: #{ARGV.first}")

data/lib/muzik/client.rb

@@ -308,13 +308,15 @@ module Muzik
 
           unless directories[artist]
             directories[artist] =
-              cloud_directory.subfolders(q: ['name = ? and trashed = false', artist]).first ||
-              cloud_directory.create_subfolder(artist)
+              cloud_directory.subfolders(q: ['name = ? and trashed = false', artist]).first
+            if directories[artist].nil? || directories[artist].title != artist
+              directories[artist] = cloud_directory.create_subfolder(artist)
+            end
           end
 
           new_file_name = "#{title}.mp3".tr('/?#', '_')
           file = directories[artist].files(q: ['name = ? and trashed = false', new_file_name]).first
-          if file && !file.trashed?
+          if file && !file.trashed? && file.title == new_file_name
             file.update_from_file(file_name)
             file = google_drive.file_by_id(file.id)
           else

data/lib/muzik/version.rb

@@ -1,3 +1,3 @@
 module Muzik
-  VERSION = '0.2.0'.freeze
+  VERSION = '0.4.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: muzik
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Thomas Russoniello
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-08-19 00:00:00.000000000 Z
+date: 2025-06-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: octokit