drum 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c57a5a57b0b2a67b669af5f6880f8f8811ba396847918e7c2a05a2a14cc80728
-  data.tar.gz: a82247076c0d3065cf851bb05ac2f2785c5e70b460b6d3411176be4b2eb233c8
+  metadata.gz: e1cf895018608f7c8ecbf68a5f243228d1569af86b9015c0f178b13f6614cd7c
+  data.tar.gz: f52ba7d7d00e81cd8f3f3a1793d637def247beb9c88a58d167d64e9c890ab841
 SHA512:
-  metadata.gz: 82c97fae35962275b4d9f38daaece537c8ef4a66ae5101396294f98d43371473b76d522f0798979dc16dcf9312e516881c1ec06d75bc515c07bea739cdeca94b
-  data.tar.gz: cc88ce5d6624f2ff2c12b2dd7dcc8b46701bc9ddfa9da21a453c39a733b438288071ccd3d7b698c30a226045422d154b9ef2bb8f3b366dbd5d5e7f3a747ffebf
+  metadata.gz: 5c24724da7a46dc623202cef18dc779f9c5fa98d0f34491da5a4445927ee47cf7b0dda2f0372c9ed0d26a6a3a4ec13cfb9f515227009ffb0239d6bb751908038
+  data.tar.gz: 806e30e6353f897cd3f163f663769913ccb33f9f5df7b1f629cf97b5258cf3f682b9bbc185906785b570d8f97e9930b74fa837d5fd1a5cc019336e42d5708528

data/Gemfile.lock

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

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'
 
@@ -254,6 +256,13 @@ module Drum
       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
@@ -555,6 +564,14 @@ module Drum
           log.info 'Fetching playlists...'
           Enumerator.new(sp_playlists.length) do |enum|
             sp_playlists.each do |sp_playlist|
+              # 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
@@ -565,10 +582,15 @@ module Drum
                   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
+                  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.info "Could not download playlist '#{sp_playlist.name}': #{e}"
+                  log.warn "Could not download playlist '#{sp_playlist.name}': #{e}"
                   break
                 end
               end

data/lib/drum/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: drum
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - fwcd