drum 0.2.1 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0515ca290089497d8667ed64575eb60dc604ba793812b77437ced8d27f70e6bb
-  data.tar.gz: 1da960b8dc5e79ce85328e918c43d214898824e51d544b613b58ede726666f97
+  metadata.gz: e1cf895018608f7c8ecbf68a5f243228d1569af86b9015c0f178b13f6614cd7c
+  data.tar.gz: f52ba7d7d00e81cd8f3f3a1793d637def247beb9c88a58d167d64e9c890ab841
 SHA512:
-  metadata.gz: db118818875e8c9d0d5281697e033bcaeebb3bc204355e41ab4436ed2da1738297c703ed8aa813f32456f968851729794f3e209c0510ca1ddbf218b93af75ab0
-  data.tar.gz: 24ce2b4be59b259617cc50ba66fc35c48aeeeb89faa716a5ad457a959364ccb39cb37b7fa86c4e4f4da6593b7c753bc9eebcde02226d24a6a65402f5d2e7eca8
+  metadata.gz: 5c24724da7a46dc623202cef18dc779f9c5fa98d0f34491da5a4445927ee47cf7b0dda2f0372c9ed0d26a6a3a4ec13cfb9f515227009ffb0239d6bb751908038
+  data.tar.gz: 806e30e6353f897cd3f163f663769913ccb33f9f5df7b1f629cf97b5258cf3f682b9bbc185906785b570d8f97e9930b74fa837d5fd1a5cc019336e42d5708528

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    drum (0.2.1)
+    drum (0.2.3)
       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/spotify.rb

@@ -31,6 +31,8 @@ module Drum
     TO_SPOTIFY_TRACKS_CHUNK_SIZE = 50
     UPLOAD_PLAYLIST_TRACKS_CHUNK_SIZE = 100
 
+    MAX_PLAYLIST_TRACKS = 10_000
+
     CLIENT_ID_VAR = 'SPOTIFY_CLIENT_ID'
     CLIENT_SECRET_VAR = 'SPOTIFY_CLIENT_SECRET'
 
@@ -241,30 +243,37 @@ 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
+        if offset > sp_playlist.total + TRACKS_CHUNK_SIZE
+          log.warn "Truncating playlist '#{sp_playlist.name}' at #{offset}, which strangely seems to yield more tracks than its length of #{sp_playlist.total} would suggest."
+          break
+        elsif offset > MAX_PLAYLIST_TRACKS
+          log.warn "Truncating playlist '#{sp_playlist.name}' at #{offset}, since it exceeds the maximum of #{MAX_PLAYLIST_TRACKS} tracks."
+          break
+        end
       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 +564,35 @@ 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}"
+              # These playlists seem to cause trouble for some reason, by either
+              # 404ing or by returning seemingly endless amounts of tracks, so
+              # we'll ignore them for now...
+              if sp_playlist.name.start_with?('Your Top Songs')
+                log.info "Skipping '#{sp_playlist.name}'"
+                next
+              end
+
+              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
+                  if seconds <= 300
+                    log.warn "Got 429 Too Many Requests while downloading '#{sp_playlist.name}', retrying in #{seconds} seconds..."
+                    sleep seconds
+                  else
+                    log.error "Got 429 Too Many Requests while downloading '#{sp_playlist.name}' with a too large retry time of #{seconds} seconds"
+                    raise
+                  end
+                rescue StandardError => e
+                  log.warn "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.1'
+  VERSION = '0.2.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: drum
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.3
 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