flickarr 0.1.3 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: db2edb2977bb888a2d99120d14ec6f9d7fe3ef105618870ccf1ff075bdc196f5
-  data.tar.gz: 4f38435d1fff9d1235a23dd4717bac0c85d7ca5e16fd4b3a82ed421e7e349682
+  metadata.gz: 6dd50d5580622268a50b6050a2d74bb4cca723d0d0e66c6238e5d86b017b952d
+  data.tar.gz: a50e621f678f3f8a3479ecef24dca5d448269adb7a714a803225e5ced9d9e1aa
 SHA512:
-  metadata.gz: 954b3c5e1e8bdd59dac42b7ad8574541012022971cdd2095e6d28bc8a394ca9f5a55c0c0786216d7b29ebb0f92cae4fd6d9da80d759602333ff0919f3ea6a21d
-  data.tar.gz: 43b8f47b7b1812b0dc863401be1f72c9b75fbc4d87abcdf7c86743f578883f832217b0756d128e5077b578499dbb8849ad95de604b0214fd13c66aee053ab3fa
+  metadata.gz: a1673833cb8cdd13da7166d9bb26576793cf19acfda964e0d94f068d565c73e66b59971921c13dcca0262999c1426860b2cc1e59ee9daa9b1bd15a0af3c34210
+  data.tar.gz: 0b0efcf5314432863584a1fb640b5353510df81fea003a0794c779c1e53e11dd3e5e1a79f938151319c4091a54017e156f7564b3018942fba4b5a78817bc4420

data/CHANGELOG.md

@@ -1,5 +1,15 @@
 ## [Unreleased]
 
+## [0.1.5] - 2026-03-23
+
+- Add `flickarr version` / `-v` / `--version` command
+- Show version header in help output
+- Check for gem updates: always on `version` and `status`, periodically (daily) after other commands
+
+## [0.1.4] - 2026-03-22
+
+- Retry transient network errors (connection reset, timeouts, HTML-instead-of-JSON) up to 3 times with backoff
+
 ## [0.1.3] - 2026-03-22
 
 - Fix crash on photos with partial location data (e.g. coordinates but no locality)

data/lib/flickarr/cli.rb

@@ -4,7 +4,8 @@ module Flickarr
   class CLI
     DEFAULT_CONFIG_PATH = File.join(Dir.home, '.flickarr', 'config.yml').freeze
     VALID_CONFIG_KEYS = %i[access_secret access_token api_key last_page_photos last_page_posts last_page_videos
-                           library_path shared_secret total_collections total_photos total_sets total_videos
+                           latest_version latest_version_checked_at library_path shared_secret
+                           total_collections total_photos total_sets total_videos
                            user_nsid username].freeze
 
     def initialize args, config_path: DEFAULT_CONFIG_PATH
@@ -12,7 +13,7 @@ module Flickarr
       @limit       = nil
       @overwrite   = false
 
-      if args.empty? || %w[-h --help help].include?(args.first)
+      if args.empty? || %w[-h --help help -v --version version].include?(args.first)
         @args = args
       else
         @parser = build_parser
@@ -35,12 +36,15 @@ module Flickarr
       when 'export:photos'                                 then run_export_posts(media: 'photos')
       when 'export:profile'                                then run_export_profile
       when 'export:videos'                                 then run_export_posts(media: 'videos')
+      when '-v', '--version', 'version'                    then run_version
       when 'init'                                          then run_init
       when 'open'                                          then run_open
       when 'path'                                          then run_path
       when 'status'                                        then run_status
       else                                                      print_help
       end
+
+      check_for_update unless %w[-v --version version status -h --help help config config:set init].include?(command)
     end
 
     private
@@ -301,7 +305,13 @@ module Flickarr
       collection_count = count_subdirs(File.join(archive, 'Collections'))
       disk_usage       = human_size(dir_size(archive))
 
+      checker = Version.new(config)
+      checker.check
+      config.save(@config_path)
+      version_str = checker.update_message || "#{Flickarr::VERSION} (up to date)"
+
       rows = [
+        ['Version',     version_str],
         ['Archive',     archive],
         ['Profile',     profile_exists ? 'Downloaded' : 'Not downloaded'],
         ['Photos',      format_count(photo_count, config.total_photos)],
@@ -353,6 +363,35 @@ module Flickarr
       end
     end
 
+    def check_for_update
+      return unless File.exist?(@config_path)
+
+      config  = Config.load(@config_path)
+      checker = Version.new(config)
+      return unless checker.stale?
+
+      message = checker.update_message
+      config.save(@config_path)
+      return unless message
+
+      warn "\n#{message}"
+    rescue StandardError
+      nil
+    end
+
+    def run_version
+      config  = Config.load(@config_path)
+      checker = Version.new(config)
+      latest  = checker.check
+      config.save(@config_path)
+
+      if latest && Gem::Version.new(latest) > Gem::Version.new(Flickarr::VERSION)
+        puts "#{Flickarr::VERSION} (latest: #{latest} — run `gem update flickarr`)"
+      else
+        puts "#{Flickarr::VERSION} (up to date)"
+      end
+    end
+
     def count_subdirs path
       return 0 unless Dir.exist?(path)
 
@@ -459,7 +498,19 @@ module Flickarr
 
       catch(:stop_export) do
         loop do
-          response    = fetch_posts_page(client: client, config: config, media: media, page: page)
+          page_retries = 3
+          begin
+            response = fetch_posts_page(client: client, config: config, media: media, page: page)
+          rescue Errno::ECONNRESET, JSON::ParserError, Net::OpenTimeout, Net::ReadTimeout, Errno::ETIMEDOUT => e
+            page_retries -= 1
+            if page_retries.positive?
+              warn "Transient 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
           total       = response.total.to_i
           total_pages = response.pages.to_i
 
@@ -531,12 +582,23 @@ module Flickarr
     end
 
     def export_single_post client:, config:, post_id:, count:, total:
+      retries = 3
       query   = client.photo(id: post_id)
       archive = config.archive_path
 
       begin
         post   = Post.build(info: query.info, sizes: query.sizes.size, exif: query.exif)
         status = post.write(archive_path: archive, overwrite: @overwrite)
+      rescue Errno::ECONNRESET, JSON::ParserError, Net::OpenTimeout, Net::ReadTimeout, Errno::ETIMEDOUT => e
+        retries -= 1
+        if retries.positive?
+          warn "Transient 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
       rescue Flickr::FailedResponse => e
         warn "Error on post #{post_id}: #{e.message}"
         log_error archive: archive, post_id: post_id, username: config.username, error: e
@@ -684,6 +746,8 @@ module Flickarr
     end
 
     def print_help
+      puts "flickarr version #{Flickarr::VERSION}"
+      puts
       help_path = File.expand_path('../../HELP.txt', __dir__)
       puts File.read(help_path)
       puts

data/lib/flickarr/config.rb

@@ -6,7 +6,8 @@ module Flickarr
     DEFAULT_LIBRARY_PATH = File.join(Dir.home, 'Pictures', 'Flickarr').freeze
 
     attr_accessor :access_secret, :access_token, :api_key, :last_page_photos, :last_page_posts, :last_page_videos,
-                  :library_path, :shared_secret, :total_collections, :total_photos, :total_sets, :total_videos,
+                  :latest_version, :latest_version_checked_at, :library_path, :shared_secret,
+                  :total_collections, :total_photos, :total_sets, :total_videos,
                   :user_nsid, :username
 
     def initialize
@@ -16,6 +17,8 @@ module Flickarr
       @last_page_photos = nil
       @last_page_posts = nil
       @last_page_videos = nil
+      @latest_version = nil
+      @latest_version_checked_at = nil
       @library_path = DEFAULT_LIBRARY_PATH
       @shared_secret = ENV.fetch('FLICKARR_SHARED_SECRET', nil)
       @total_collections = nil
@@ -43,20 +46,22 @@ module Flickarr
 
     def to_h
       {
-        access_secret:     access_secret,
-        access_token:      access_token,
-        api_key:           api_key,
-        last_page_photos:  last_page_photos,
-        last_page_posts:   last_page_posts,
-        last_page_videos:  last_page_videos,
-        library_path:      library_path,
-        shared_secret:     shared_secret,
-        total_collections: total_collections,
-        total_photos:      total_photos,
-        total_sets:        total_sets,
-        total_videos:      total_videos,
-        user_nsid:         user_nsid,
-        username:          username
+        access_secret:             access_secret,
+        access_token:              access_token,
+        api_key:                   api_key,
+        last_page_photos:          last_page_photos,
+        last_page_posts:           last_page_posts,
+        last_page_videos:          last_page_videos,
+        latest_version:            latest_version,
+        latest_version_checked_at: latest_version_checked_at,
+        library_path:              library_path,
+        shared_secret:             shared_secret,
+        total_collections:         total_collections,
+        total_photos:              total_photos,
+        total_sets:                total_sets,
+        total_videos:              total_videos,
+        user_nsid:                 user_nsid,
+        username:                  username
       }
     end
 
@@ -67,20 +72,22 @@ module Flickarr
       yaml = YAML.load_file(path, symbolize_names: true)
       return config unless yaml.is_a?(Hash)
 
-      config.access_secret     = yaml[:access_secret]     if yaml[:access_secret]
-      config.access_token      = yaml[:access_token]      if yaml[:access_token]
-      config.api_key           = yaml[:api_key]           if yaml[:api_key]
-      config.last_page_photos  = yaml[:last_page_photos]  if yaml[:last_page_photos]
-      config.last_page_posts   = yaml[:last_page_posts]   if yaml[:last_page_posts]
-      config.last_page_videos  = yaml[:last_page_videos]  if yaml[:last_page_videos]
-      config.library_path      = yaml[:library_path]      if yaml[:library_path]
-      config.shared_secret     = yaml[:shared_secret]     if yaml[:shared_secret]
-      config.total_collections = yaml[:total_collections] if yaml[:total_collections]
-      config.total_photos      = yaml[:total_photos]      if yaml[:total_photos]
-      config.total_sets        = yaml[:total_sets]        if yaml[:total_sets]
-      config.total_videos      = yaml[:total_videos]      if yaml[:total_videos]
-      config.user_nsid         = yaml[:user_nsid]         if yaml[:user_nsid]
-      config.username          = yaml[:username]          if yaml[:username]
+      config.access_secret              = yaml[:access_secret]              if yaml[:access_secret]
+      config.access_token               = yaml[:access_token]               if yaml[:access_token]
+      config.api_key                    = yaml[:api_key]                    if yaml[:api_key]
+      config.last_page_photos           = yaml[:last_page_photos]           if yaml[:last_page_photos]
+      config.last_page_posts            = yaml[:last_page_posts]            if yaml[:last_page_posts]
+      config.last_page_videos           = yaml[:last_page_videos]           if yaml[:last_page_videos]
+      config.latest_version             = yaml[:latest_version]             if yaml[:latest_version]
+      config.latest_version_checked_at  = yaml[:latest_version_checked_at]  if yaml[:latest_version_checked_at]
+      config.library_path               = yaml[:library_path]               if yaml[:library_path]
+      config.shared_secret              = yaml[:shared_secret]              if yaml[:shared_secret]
+      config.total_collections          = yaml[:total_collections]          if yaml[:total_collections]
+      config.total_photos               = yaml[:total_photos]               if yaml[:total_photos]
+      config.total_sets                 = yaml[:total_sets]                 if yaml[:total_sets]
+      config.total_videos               = yaml[:total_videos]               if yaml[:total_videos]
+      config.user_nsid                  = yaml[:user_nsid]                  if yaml[:user_nsid]
+      config.username                   = yaml[:username]                   if yaml[:username]
 
       config
     end

data/lib/flickarr/version.rb

@@ -1,3 +1,67 @@
+require 'json'
+require 'net/http'
+require 'uri'
+
 module Flickarr
-  VERSION = '0.1.3'.freeze
+  VERSION = '0.1.5'.freeze
+
+  class Version
+    RUBYGEMS_URL = 'https://rubygems.org/api/v1/gems/flickarr.json'.freeze
+    CACHE_TTL_SECONDS = 86_400 # 1 day
+
+    def initialize config
+      @config = config
+    end
+
+    def check
+      fetch_latest if stale?
+      @config.latest_version
+    end
+
+    def stale?
+      return true if @config.latest_version_checked_at.nil?
+
+      last_check = Time.parse(@config.latest_version_checked_at.to_s)
+      Time.now - last_check > CACHE_TTL_SECONDS
+    rescue ArgumentError
+      true
+    end
+
+    def update_available?
+      latest = check
+      return false unless latest
+
+      Gem::Version.new(latest) > Gem::Version.new(Flickarr::VERSION)
+    rescue ArgumentError
+      false
+    end
+
+    def update_message
+      latest = check
+      return nil unless latest
+
+      if Gem::Version.new(latest) > Gem::Version.new(Flickarr::VERSION)
+        "Update available: #{latest} (current: #{Flickarr::VERSION}) — run `gem update flickarr`"
+      end
+    rescue ArgumentError
+      nil
+    end
+
+    private
+
+    def fetch_latest
+      uri      = URI(RUBYGEMS_URL)
+      response = Net::HTTP.get_response(uri)
+      return unless response.is_a?(Net::HTTPSuccess)
+
+      data    = JSON.parse(response.body)
+      version = data['version']
+
+      @config.latest_version            = version
+      @config.latest_version_checked_at = Time.now.iso8601
+      version
+    rescue StandardError
+      nil
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: flickarr
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.5
 platform: ruby
 authors:
 - Shane Becker
@@ -95,7 +95,6 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
-- TODO.md
 - exe/flickarr
 - lib/flickarr.rb
 - lib/flickarr/auth.rb

data/TODO.md

@@ -1,6 +0,0 @@
-# Flickarr TODO
-
-## Features
-
-- [ ] Retry on transient network failures (5xx, timeouts)
-- [ ] Verify downloaded file integrity (checksum or size check)