drum 0.2.0 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 744d7de8c05fe7f7dc8f843b04b2ccd1a77a2688228369706fa4fca79ddf6c07
-  data.tar.gz: c72fc4a18d59cb12017692e1a6fad3cb73cbec24ea73a64adf68279331c3eafb
+  metadata.gz: c57a5a57b0b2a67b669af5f6880f8f8811ba396847918e7c2a05a2a14cc80728
+  data.tar.gz: a82247076c0d3065cf851bb05ac2f2785c5e70b460b6d3411176be4b2eb233c8
 SHA512:
-  metadata.gz: 9cd77d6cf666ef8cd90709b357b59994da0eb20f2a7afaea68f5a60c3aae909d4acf49b407426dd21af4e56caf542e2906dabae73e9270e8221272d543a02e5a
-  data.tar.gz: 488848553a20609b7f72bbd11431c46ba03e8d20db4ad428cca5d34df434a061a1ae55a668ee3a304836f42eb84ba5af84bf84e3a5ab0168271f1b86fd3e8f71
+  metadata.gz: 82c97fae35962275b4d9f38daaece537c8ef4a66ae5101396294f98d43371473b76d522f0798979dc16dcf9312e516881c1ec06d75bc515c07bea739cdeca94b
+  data.tar.gz: cc88ce5d6624f2ff2c12b2dd7dcc8b46701bc9ddfa9da21a453c39a733b438288071ccd3d7b698c30a226045422d154b9ef2bb8f3b366dbd5d5e7f3a747ffebf

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    drum (0.2.0)
+    drum (0.2.2)
       highline (~> 2.0)
       jwt (~> 2.2)
       launchy (~> 2.4)

data/README.md

@@ -29,7 +29,8 @@ The basic usage pattern is always `drum cp [source] [destination]` where `source
   * `@stdout`
 * A dash `-`, synonymous with `@stdin` and `@stdout`, depending on usage
 
-> Note that if the source is folder-like, i.e. includes multiple playlists, the destination has to be folder-like too. (The reverse is not true though.)
+> [!NOTE]
+> If the source is folder-like, i.e. includes multiple playlists, the destination has to be folder-like too. (The reverse is not true though.)
 
 ### Examples
 
@@ -59,7 +60,8 @@ Currently, the following music services are supported:
 * Apple Music
 * Local, YAML-based playlists (via stdio or files)
 
-> Note that the tool only processes metadata, not the actual audio files.
+> [!NOTE]
+> The tool only processes metadata, not the actual audio files.
 
 ## Development
 
@@ -67,11 +69,13 @@ After checking out the repo, run `bin/setup` (or `bundle install`) to install de
 
 To run the application, run `bundle exec bin/drum`. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
 
-> Note that you may need to run `bundle exec ruby bin/drum` on Windows
+> [!IMPORTANT]
+> You may need to run `bundle exec ruby bin/drum` on Windows
 
 To package the application into a gem, run `bundle exec rake build`. The built gem should then be located in `pkg`.
 
-> Note: If you wish to install `drum` using `gem install`, you may need to install additional gems such as `rb-scpt` on macOS to use platform-specific integrations. See [the `Gemfile`](Gemfile) for more information.
+> [!IMPORTANT]
+> If you wish to install `drum` using `gem install`, you may need to install additional gems such as `rb-scpt` on macOS to use platform-specific integrations. See [the `Gemfile`](Gemfile) for more information.
 
 To install the gem, run `bundle exec rake install`.
 
@@ -79,6 +83,9 @@ To generate the documentation, run `bundle exec rake yard`.
 
 To run tests, run `bundle exec rake spec`.
 
+> [!TIP]
+> If you wish to use a language server such as Solargraph and code completion isn't working for required gems, you may have to run `yard gems`: https://solargraph.org/guides/troubleshooting
+
 ### Spotify
 
 To use the service integration with Spotify, set the following environment variables:

data/lib/drum/service/applemusic.rb

@@ -167,8 +167,6 @@ module Drum
         server.shutdown
       end
 
-      trap 'INT' do server.shutdown end
-
       log.info "Launching callback HTTP server on port #{port}, waiting for auth code..."
       server.start
 
@@ -186,6 +184,8 @@ module Drum
       }
 
       user_token
+    ensure
+      server&.shutdown
     end
 
     def authenticate

data/lib/drum/service/spotify.rb

@@ -137,8 +137,6 @@ module Drum
       authorize_url = "https://accounts.spotify.com/authorize?client_id=#{client_id}&response_type=code&redirect_uri=http%3A%2F%2Flocalhost:#{port}%2Fcallback&scope=#{scopes.join('%20')}&state=#{csrf_state}"
       Launchy.open(authorize_url)
 
-      trap 'INT' do server.shutdown end
-      
       log.info "Launching callback HTTP server on port #{port}, waiting for auth code..."
       server.start
       
@@ -155,6 +153,8 @@ module Drum
       })
       
       self.consume_authentication_response(auth_response)
+    ensure
+      server&.shutdown
     end
 
     def authenticate_user_via_refresh(client_id, client_secret, refresh_token)
@@ -241,30 +241,30 @@ module Drum
     # Download helpers
     
     def all_sp_library_playlists(offset: 0)
-      sp_playlists = @me.playlists(limit: PLAYLISTS_CHUNK_SIZE, offset: offset)
-      unless sp_playlists.empty?
-        sp_playlists + self.all_sp_library_playlists(offset: offset + PLAYLISTS_CHUNK_SIZE)
-      else
-        []
+      all_sp_playlists = []
+      while !(sp_playlists = @me.playlists(limit: PLAYLISTS_CHUNK_SIZE, offset: offset)).empty?
+        offset += PLAYLISTS_CHUNK_SIZE
+        all_sp_playlists += sp_playlists
       end
+      all_sp_playlists
     end
 
     def all_sp_playlist_tracks(sp_playlist, offset: 0)
-      sp_tracks = sp_playlist.tracks(limit: TRACKS_CHUNK_SIZE, offset: offset)
-      unless sp_tracks.empty?
-        sp_tracks + self.all_sp_playlist_tracks(sp_playlist, offset: offset + TRACKS_CHUNK_SIZE)
-      else
-        []
+      all_sp_tracks = []
+      while !(sp_tracks = sp_playlist.tracks(limit: TRACKS_CHUNK_SIZE, offset: offset)).empty?
+        offset += TRACKS_CHUNK_SIZE
+        all_sp_tracks += sp_tracks
       end
+      all_sp_tracks
     end
 
     def all_sp_library_tracks(offset: 0)
-      sp_tracks = @me.saved_tracks(limit: SAVED_TRACKS_CHUNKS_SIZE, offset: offset)
-      unless sp_tracks.empty?
-        sp_tracks + self.all_sp_library_tracks(offset: offset + SAVED_TRACKS_CHUNKS_SIZE)
-      else
-        []
+      all_sp_tracks = []
+      while !(sp_tracks = @me.saved_tracks(limit: SAVED_TRACKS_CHUNKS_SIZE, offset: offset)).empty?
+        offset += SAVED_TRACKS_CHUNKS_SIZE
+        all_sp_tracks += sp_tracks
       end
+      all_sp_tracks
     end
 
     def extract_sp_features(sp_track)
@@ -555,11 +555,22 @@ module Drum
           log.info 'Fetching playlists...'
           Enumerator.new(sp_playlists.length) do |enum|
             sp_playlists.each do |sp_playlist|
-              begin
-                new_playlist = self.from_sp_playlist(sp_playlist)
-                enum.yield new_playlist
-              rescue StandardError => e
-                log.info "Could not download playlist '#{sp_playlist.name}': #{e}"
+              3.times do |attempt|
+                begin
+                  if attempt > 0
+                    log.info "Attempt \##{attempt + 1} to download '#{sp_playlist.name}'..."
+                  end
+                  new_playlist = self.from_sp_playlist(sp_playlist)
+                  enum.yield new_playlist
+                  break
+                rescue RestClient::TooManyRequests => e
+                  seconds = e.response.headers[:retry_after]&.to_f || 0.5
+                  log.info "Got 429 Too Many Requests while downloading '#{sp_playlist.name}', retrying in #{seconds} seconds..."
+                  sleep seconds
+                rescue StandardError => e
+                  log.info "Could not download playlist '#{sp_playlist.name}': #{e}"
+                  break
+                end
               end
             end
           end

data/lib/drum/version.rb

@@ -1,3 +1,3 @@
 module Drum
-  VERSION = '0.2.0'
+  VERSION = '0.2.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: drum
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.2
 platform: ruby
 authors:
 - fwcd
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-01-19 00:00:00.000000000 Z
+date: 2024-02-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor