flickarr 0.1.5 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6dd50d5580622268a50b6050a2d74bb4cca723d0d0e66c6238e5d86b017b952d
-  data.tar.gz: a50e621f678f3f8a3479ecef24dca5d448269adb7a714a803225e5ced9d9e1aa
+  metadata.gz: bfbcdb81c34decb6b15d1934f9bd8e51d1107e16b04abad502318e4709638b89
+  data.tar.gz: 4a6fd7023a681e476bc3fb646e3349eec285ecbdbc4d3e901542c42687bb0345
 SHA512:
-  metadata.gz: a1673833cb8cdd13da7166d9bb26576793cf19acfda964e0d94f068d565c73e66b59971921c13dcca0262999c1426860b2cc1e59ee9daa9b1bd15a0af3c34210
-  data.tar.gz: 0b0efcf5314432863584a1fb640b5353510df81fea003a0794c779c1e53e11dd3e5e1a79f938151319c4091a54017e156f7564b3018942fba4b5a78817bc4420
+  metadata.gz: 7b8230c529f206ebcc4281c2fd02197ef900595ff27a3b9161800f811616245290f784733b5cc53204d3b7e43ee574727a512c4b2446084947abc88cd37c0819
+  data.tar.gz: 253b362b06572d1c68f8fcaf538bfde88dcbe065b2d5784921e90b91cbfa40198186a99b9df090786d375fe5746e05b010ebaa2d111edbb2231f79d76610fb3a

data/CHANGELOG.md

@@ -1,5 +1,16 @@
 ## [Unreleased]
 
+## [0.1.7] - 2026-04-05
+
+- Handle download errors (e.g. 410 Gone) gracefully in single-photo export instead of crashing
+- Retry 410 Gone photo downloads using a URL constructed from `getInfo` fields (`server`, `originalsecret`)
+
+## [0.1.6] - 2026-03-31
+
+- Add `version` and `help` commands to help output
+- Retry transient Flickr API errors ("service not currently available") with backoff, instead of crashing
+- Truncate very long slugs to prevent `Errno::ENAMETOOLONG` on filenames exceeding 255 bytes
+
 ## [0.1.5] - 2026-03-23
 
 - Add `flickarr version` / `-v` / `--version` command

data/HELP.txt

@@ -48,3 +48,6 @@ COMMANDS:
   export:collections        Export all collections (groups of albums)
   export:collections <URL>  Export a single collection (groups of albums) with references to albums
   export:profile            Export Flickr profile to archive
+
+  help, -h, --help          Show this help
+  version, -v, --version    Show version (checks for updates)

data/README.md

@@ -49,7 +49,7 @@ flickarr auth
 flickarr export
 ```
 
-See [HOWTO.md](HOWTO.md) for detailed setup instructions.
+See [doc/HOWTO.md](doc/HOWTO.md) for detailed setup instructions.
 
 ## Usage
 

data/{HOWTO.md → doc/HOWTO.md}

@@ -22,16 +22,24 @@ gem install flickarr
 
 You need your own Flickr API key and secret. Flickarr uses these to authenticate with the Flickr API on your behalf.
 
-1. Go to https://www.flickr.com/services/apps/create/
-2. Click "Apply for a Non-Commercial Key"
+1. Go to https://flickr.com/services/apps/create and click the [Request an API Key](https://flickr.com/services/apps/create/apply) link in the **Get your API Key** section.
+   ![Screenshot of Flickr App Gardn page](how-to-1.png)
+
+2. On the next page https://flickr.com/services/apps/create/apply click "[Apply for a Non-Commercial Key](https://flickr.com/services/apps/create/noncommercial)"
+
+   ![Screenshot of Flickr app application page](how-to-2.png)
+
 3. Fill in the form:
    - **Application Name**: anything you want (e.g. "Flickarr Export")
    - **Description**: anything (e.g. "Personal archive export")
+
+   ![Screenshot of Flickr API key creation page](how-to-3.png)
+
 4. Submit the form
+
 5. Copy your **Key** and **Secret** from the confirmation page
 
-<!-- TODO: screenshot of Flickr API key creation page -->
-<!-- TODO: screenshot of Flickr API key and secret confirmation page -->
+![Screenshot of Flickr API key and secret confirmation page](how-to-4.png)
 
 ## 4. Initialize Flickarr
 
@@ -73,10 +81,12 @@ This starts the OAuth flow:
 2. Flickr asks you to authorize the app — click "OK, I'll Authorize It"
 3. Flickr shows you a verification code (9 digits, like `888-675-309`)
 4. Copy that code
+
+   ![Screenshot of Flickr verification page](how-to-5.png)
+
 5. Paste the code back into your terminal
 
-<!-- TODO: screenshot of Flickr OAuth authorization page -->
-<!-- TODO: screenshot of Flickr verification code page -->
+   ![Screenshot of Flickr auhorization code page](how-to-6.png)
 
 After authenticating, your access tokens, username, and user ID are saved to the config file. You only need to do this once.
 
@@ -134,7 +144,7 @@ flickarr export:albums
 Export a single album by URL:
 
 ```sh
-flickarr export:sets https://www.flickr.com/photos/USERNAME/sets/72157718538273371/
+flickarr export:sets https://flickr.com/photos/USERNAME/sets/72157718538273371/
 ```
 
 Collections (groups of albums) work the same way:
@@ -146,7 +156,7 @@ flickarr export:collections
 Export a single collection by URL:
 
 ```sh
-flickarr export:collections https://www.flickr.com/photos/USERNAME/collections/72157666222057746/
+flickarr export:collections https://flickr.com/photos/USERNAME/collections/72157666222057746/
 ```
 
 ## 10. Check your progress

data/lib/flickarr/cli.rb

@@ -464,7 +464,14 @@ module Flickarr
         return
       end
 
-      status = post.write(archive_path: archive, overwrite: @overwrite)
+      begin
+        status = post.write(archive_path: archive, overwrite: @overwrite)
+      rescue Down::Error => e
+        warn "Download error on post #{post_id}: #{e.message}"
+        log_error archive: archive, post_id: post_id, username: config.username, error: e
+        return
+      end
+
       path = File.join archive, post.folder_path
 
       case status
@@ -510,6 +517,18 @@ module Flickarr
             end
             warn "Failed to fetch page #{page} after retries: #{e.message}"
             break
+          rescue Flickr::FailedResponse => e
+            if transient_flickr_error?(e)
+              page_retries -= 1
+              if page_retries.positive?
+                warn "Transient API error fetching page #{page}: #{e.message} — retrying in 5s (#{page_retries} left)"
+                sleep 5
+                retry
+              end
+              warn "Failed to fetch page #{page} after retries: #{e.message}"
+              break
+            end
+            raise
           end
           total       = response.total.to_i
           total_pages = response.pages.to_i
@@ -600,6 +619,17 @@ module Flickarr
         log_error archive: archive, post_id: post_id, username: config.username, error: e
         return
       rescue Flickr::FailedResponse => e
+        if transient_flickr_error?(e)
+          retries -= 1
+          if retries.positive?
+            warn "Transient API error on post #{post_id}: #{e.message} — retrying in 5s (#{retries} left)"
+            sleep 5
+            retry
+          end
+          warn "Failed post #{post_id} after retries: #{e.message}"
+          log_error archive: archive, post_id: post_id, username: config.username, error: e
+          return
+        end
         warn "Error on post #{post_id}: #{e.message}"
         log_error archive: archive, post_id: post_id, username: config.username, error: e
         return
@@ -618,6 +648,13 @@ module Flickarr
       end
     end
 
+    def transient_flickr_error? error
+      message = error.message.to_s.downcase
+      code    = error.respond_to?(:code) ? error.code.to_s : ''
+
+      code == '105' || message.include?('not currently available') || message.include?('service unavailable')
+    end
+
     def log_error archive:, post_id:, username:, error:
       log_path = File.join archive, '_errors.log'
       FileUtils.mkdir_p File.dirname(log_path)

data/lib/flickarr/collection.rb

@@ -28,13 +28,15 @@ module Flickarr
     end
 
     def dirname
-      [id, slug].compact.join '_'
+      truncated = Post.truncate_slug(slug, id: id, ext: '')
+      [id, truncated].compact.join '_'
     end
 
     def sets_to_a
       @set_refs.map do |s|
         set_slug = s.title.to_s.slugify
-        set_dirname = [s.id, set_slug.empty? ? nil : set_slug].compact.join('_')
+        set_slug = Post.truncate_slug(set_slug, id: s.id, ext: '')
+        set_dirname = [s.id, set_slug].compact.join('_')
 
         {
           description: s.description.to_s,

data/lib/flickarr/photo.rb

@@ -10,7 +10,21 @@ module Flickarr
       dest = File.join dir, "#{basename}.#{extension}"
 
       FileUtils.mkdir_p dir
-      Down.download original_url, destination: dest
+
+      begin
+        Down.download original_url, destination: dest
+      rescue Down::ClientError => e
+        raise unless e.message.include?('410') && constructed_original_url
+
+        warn "  Photo #{id}: getSizes URL returned 410, retrying with constructed URL..."
+        Down.download constructed_original_url, destination: dest
+      end
+    end
+
+    def constructed_original_url
+      return nil unless @server && @originalsecret
+
+      "https://live.staticflickr.com/#{@server}/#{id}_#{@originalsecret}_o.#{extension}"
     end
 
     def original_url

data/lib/flickarr/photo_set.rb

@@ -42,7 +42,8 @@ module Flickarr
     end
 
     def dirname
-      [id, slug].compact.join '_'
+      truncated = Post.truncate_slug(slug, id: id, ext: '')
+      [id, truncated].compact.join '_'
     end
 
     def photos_to_a
@@ -110,7 +111,8 @@ module Flickarr
     def relative_photo_path item
       ext  = item.media.to_s == 'video' ? 'mp4' : item.originalformat.to_s
       slug = item.title.to_s.slugify
-      base = [item.id, slug.empty? ? nil : slug].compact.join('_')
+      slug = Post.truncate_slug(slug, id: item.id, ext: ext)
+      base = [item.id, slug].compact.join('_')
       date = if item.datetakenunknown.to_i.zero?
                Date.parse item.datetaken
              else

data/lib/flickarr/post.rb

@@ -8,6 +8,7 @@ require 'yaml'
 module Flickarr
   class Post
     FLICKR_URL_PATTERN = %r{\Ahttps?://(?:www\.)?flickr\.com/photos/[^/]+/(\d+)}
+    MAX_FILENAME_BYTES = 255
 
     def self.build info:, sizes:, exif: nil
       case info.media.to_s
@@ -25,14 +26,25 @@ module Flickarr
       id       = item.id
       title    = item.title.to_s
       slug     = title.slugify
-      basename = [id, slug.empty? ? nil : slug].compact.join('_')
       ext      = item.media.to_s == 'video' ? 'mp4' : item.originalformat.to_s
+      slug     = truncate_slug(slug, id: id, ext: ext)
+      basename = [id, slug].compact.join('_')
       date     = compute_date_from_list_item(item)
       folder   = date.strftime '%Y/%m/%d'
 
       File.join archive_path, folder, "#{basename}.#{ext}"
     end
 
+    def self.truncate_slug slug, id:, ext:
+      return nil if slug.nil? || slug.empty?
+
+      # "id_slug.ext" must fit in MAX_FILENAME_BYTES
+      max_slug = MAX_FILENAME_BYTES - id.to_s.bytesize - ext.to_s.bytesize - 2 # underscore + dot
+      return slug if slug.bytesize <= max_slug
+
+      slug[0, max_slug].chomp('-')
+    end
+
     def self.compute_date_from_list_item item
       if item.datetakenunknown.to_i.zero?
         Date.parse item.datetaken
@@ -66,16 +78,21 @@ module Flickarr
       @visibility  = extract_visibility info
       @owner       = extract_owner info
 
-      @dates    = info.dates
-      @location = extract_location info
-      @sizes    = sizes
-      @urls     = extract_urls info
-      @camera   = exif&.camera.to_s if exif
-      @exif     = extract_exif exif
+      @dates          = info.dates
+      @farm           = info.respond_to?(:farm) ? info.farm.to_s : nil
+      @location       = extract_location info
+      @originalsecret = info.respond_to?(:originalsecret) ? info.originalsecret.to_s : nil
+      @server         = info.respond_to?(:server) ? info.server.to_s : nil
+      @sizes          = sizes
+      @urls           = extract_urls info
+      @camera         = exif&.camera.to_s if exif
+      @exif           = extract_exif exif
     end
 
     def basename
-      [id, slug].compact.join '_'
+      longest_ext = [extension, 'yaml'].max_by(&:bytesize)
+      truncated = self.class.truncate_slug(slug, id: id, ext: longest_ext)
+      [id, truncated].compact.join '_'
     end
 
     def date_taken

data/lib/flickarr/version.rb

@@ -3,7 +3,7 @@ require 'net/http'
 require 'uri'
 
 module Flickarr
-  VERSION = '0.1.5'.freeze
+  VERSION = '0.1.7'.freeze
 
   class Version
     RUBYGEMS_URL = 'https://rubygems.org/api/v1/gems/flickarr.json'.freeze

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: flickarr
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.7
 platform: ruby
 authors:
 - Shane Becker
@@ -91,10 +91,16 @@ files:
 - CHANGELOG.md
 - CODE_OF_CONDUCT.md
 - HELP.txt
-- HOWTO.md
 - LICENSE.txt
 - README.md
 - Rakefile
+- doc/HOWTO.md
+- doc/how-to-1.png
+- doc/how-to-2.png
+- doc/how-to-3.png
+- doc/how-to-4.png
+- doc/how-to-5.png
+- doc/how-to-6.png
 - exe/flickarr
 - lib/flickarr.rb
 - lib/flickarr/auth.rb