appydave-tools 0.77.4 → 0.77.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b37b062c3680912049eb80e1cb4c40a213429d80e4a80fd5a9ea687e68bda536
-  data.tar.gz: a8ee199b0664434908e0178cc21956620a87455540f459ee6e1f85560cbe02f8
+  metadata.gz: a66f70a8ea85fce726ea3da189166f623c7fb1ca007f70b1b5fb75f3fd828077
+  data.tar.gz: 423a8d4309fb166084940efe6bcb7fbd3ab9d620094b006bf95194aef671719a
 SHA512:
-  metadata.gz: 1f7e6164d4e947be359dda0e27b61507b35bbe65e10073760e765b12ea755bfcb66d38784567e1404fe8474745dc34782fe61684c322e091697b4f7df94fccab
-  data.tar.gz: f12c43fe505fd799f991c6f158bc30a82df78b3676aceb6a77208d24bc443293f3e5ee32172fe18f70034d03f9ab6d4c0f5dbee6319e29e62569a6ac7847e4e2
+  metadata.gz: d89bf4f8992c1ab8630a51af56dc97d9fbc651605593be1b70510cc5dd4837472dfc55514d12d9ff0542b439ec04d0c47752a3799136b7ca4cada342d49aa023
+  data.tar.gz: 6fc875fe4006e621674af60652e5ff1241d5404f4d4bdd6e3374314e1460212bce2ec8cfc4129feab3a55ec18ae01fb33f08dc55679ad55d1efde3ed209a5bb0

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+## [0.77.4](https://github.com/appydave/appydave-tools/compare/v0.77.3...v0.77.4) (2026-03-20)
+
+
+### Bug Fixes
+
+* extract S3Downloader from S3Operations; download delegates to focused class ([4d97cdf](https://github.com/appydave/appydave-tools/commit/4d97cdf18ea56ca9b658c8858efd9041dcb7ca5b))
+
 ## [0.77.3](https://github.com/appydave/appydave-tools/compare/v0.77.2...v0.77.3) (2026-03-20)
 
 

data/lib/appydave/tools/dam/s3_operations.rb

@@ -19,96 +19,7 @@ module Appydave
 
         # Show sync status
         def status
-          project_dir = project_directory_path
-          staging_dir = File.join(project_dir, 's3-staging')
-
-          # Check if project directory exists
-          unless Dir.exist?(project_dir)
-            puts "❌ Project not found: #{brand}/#{project_id}"
-            puts ''
-            puts '   This project does not exist locally.'
-            puts '   Possible causes:'
-            puts '     - Project name might be misspelled'
-            puts '     - Project may not exist in this brand'
-            puts ''
-            puts "   Try: dam list #{brand}   # See all projects for this brand"
-            return
-          end
-
-          s3_files = list_s3_files
-          local_files = list_local_files(staging_dir)
-
-          # Build a map of S3 files for quick lookup
-          s3_files_map = s3_files.each_with_object({}) do |file, hash|
-            relative_path = extract_relative_path(file['Key'])
-            hash[relative_path] = file
-          end
-
-          if s3_files.empty? && local_files.empty?
-            puts "ℹ️  No files in S3 or s3-staging/ for #{brand}/#{project_id}"
-            puts ''
-            puts '   This project exists but has no heavy files ready for S3 sync.'
-            puts ''
-            puts '   Next steps:'
-            puts "     1. Add video files to: #{staging_dir}/"
-            puts "     2. Upload to S3: dam s3-up #{brand} #{project_id}"
-            return
-          end
-
-          puts "📊 S3 Sync Status for #{brand}/#{project_id}"
-
-          # Show last sync time
-          if s3_files.any?
-            most_recent = s3_files.map { |f| f['LastModified'] }.compact.max
-            if most_recent
-              time_ago = format_time_ago(Time.now - most_recent)
-              puts "   Last synced: #{time_ago} ago (#{most_recent.strftime('%Y-%m-%d %H:%M')})"
-            end
-          end
-          puts ''
-
-          # Combine all file paths (S3 + local)
-          all_paths = (s3_files_map.keys + local_files.keys).uniq.sort
-
-          total_s3_size = 0
-          total_local_size = 0
-
-          all_paths.each do |relative_path|
-            s3_file = s3_files_map[relative_path]
-            local_file = File.join(staging_dir, relative_path)
-
-            if s3_file && File.exist?(local_file)
-              # File exists in both S3 and local
-              s3_size = s3_file['Size']
-              local_size = File.size(local_file)
-              total_s3_size += s3_size
-              total_local_size += local_size
-
-              s3_etag = s3_file['ETag'].gsub('"', '')
-              match_status = compare_files(local_file: local_file, s3_etag: s3_etag, s3_size: s3_size)
-
-              if match_status == :synced
-                status_label = multipart_etag?(s3_etag) ? 'synced*' : 'synced'
-                puts "  ✓ #{relative_path} (#{file_size_human(s3_size)}) [#{status_label}]"
-              else
-                puts "  ⚠️  #{relative_path} (#{file_size_human(s3_size)}) [modified]"
-              end
-            elsif s3_file
-              # File only in S3
-              s3_size = s3_file['Size']
-              total_s3_size += s3_size
-              puts "  ☁️  #{relative_path} (#{file_size_human(s3_size)}) [S3 only]"
-            else
-              # File only local
-              local_size = File.size(local_file)
-              total_local_size += local_size
-              puts "  📁 #{relative_path} (#{file_size_human(local_size)}) [local only]"
-            end
-          end
-
-          puts ''
-          puts "S3 files: #{s3_files.size}, Local files: #{local_files.size}"
-          puts "S3 size: #{file_size_human(total_s3_size)}, Local size: #{file_size_human(total_local_size)}"
+          S3StatusChecker.new(brand, project_id, **delegated_opts).status
         end
 
         # Cleanup S3 files
@@ -252,97 +163,13 @@ module Appydave
         # Calculate 3-state S3 sync status
         # @return [String] One of: '↑ upload', '↓ download', '✓ synced', 'none'
         def calculate_sync_status
-          project_dir = project_directory_path
-          staging_dir = File.join(project_dir, 's3-staging')
-
-          # No s3-staging directory means no S3 intent
-          return 'none' unless Dir.exist?(staging_dir)
-
-          # Get S3 files (if S3 configured)
-          begin
-            s3_files = list_s3_files
-          rescue StandardError
-            # S3 not configured or not accessible
-            return 'none'
-          end
-
-          local_files = list_local_files(staging_dir)
-
-          # No files anywhere
-          return 'none' if s3_files.empty? && local_files.empty?
-
-          # Build S3 files map
-          s3_files_map = s3_files.each_with_object({}) do |file, hash|
-            relative_path = extract_relative_path(file['Key'])
-            hash[relative_path] = file
-          end
-
-          # Check for differences
-          needs_upload = false
-          needs_download = false
-
-          # Check all local files
-          local_files.each_key do |relative_path|
-            local_file = File.join(staging_dir, relative_path)
-            s3_file = s3_files_map[relative_path]
-
-            if s3_file
-              # Compare using multipart-aware comparison
-              s3_etag = s3_file['ETag'].gsub('"', '')
-              s3_size = s3_file['Size']
-              match_status = compare_files(local_file: local_file, s3_etag: s3_etag, s3_size: s3_size)
-              needs_upload = true if match_status != :synced
-            else
-              # Local file not in S3
-              needs_upload = true
-            end
-          end
-
-          # Check for S3-only files
-          s3_files_map.each_key do |relative_path|
-            local_file = File.join(staging_dir, relative_path)
-            needs_download = true unless File.exist?(local_file)
-          end
-
-          # Return status based on what's needed
-          if needs_upload && needs_download
-            '⚠️ both'
-          elsif needs_upload
-            '↑ upload'
-          elsif needs_download
-            '↓ download'
-          else
-            '✓ synced'
-          end
+          S3StatusChecker.new(brand, project_id, **delegated_opts).calculate_sync_status
         end
 
         # Calculate S3 sync timestamps (last upload/download times)
         # @return [Hash] { last_upload: Time|nil, last_download: Time|nil }
         def sync_timestamps
-          project_dir = project_directory_path
-          staging_dir = File.join(project_dir, 's3-staging')
-
-          # No s3-staging directory means no S3 intent
-          return { last_upload: nil, last_download: nil } unless Dir.exist?(staging_dir)
-
-          # Get S3 files (if S3 configured)
-          begin
-            s3_files = list_s3_files
-          rescue StandardError
-            # S3 not configured or not accessible
-            return { last_upload: nil, last_download: nil }
-          end
-
-          # Last upload time = most recent S3 file LastModified
-          last_upload = s3_files.map { |f| f['LastModified'] }.compact.max if s3_files.any?
-
-          # Last download time = most recent local file mtime (in s3-staging)
-          last_download = if Dir.exist?(staging_dir)
-                            local_files = Dir.glob(File.join(staging_dir, '**/*')).select { |f| File.file?(f) }
-                            local_files.map { |f| File.mtime(f) }.max if local_files.any?
-                          end
-
-          { last_upload: last_upload, last_download: last_download }
+          S3StatusChecker.new(brand, project_id, **delegated_opts).sync_timestamps
         end
 
         private

data/lib/appydave/tools/dam/s3_status_checker.rb

@@ -0,0 +1,178 @@
+# frozen_string_literal: true
+
+module Appydave
+  module Tools
+    module Dam
+      # Handles S3 status and sync state operations.
+      # Inherits shared infrastructure and helpers from S3Base.
+      class S3StatusChecker < S3Base
+        # Show sync status
+        def status
+          project_dir = project_directory_path
+          staging_dir = File.join(project_dir, 's3-staging')
+
+          unless Dir.exist?(project_dir)
+            puts "❌ Project not found: #{brand}/#{project_id}"
+            puts ''
+            puts '   This project does not exist locally.'
+            puts '   Possible causes:'
+            puts '     - Project name might be misspelled'
+            puts '     - Project may not exist in this brand'
+            puts ''
+            puts "   Try: dam list #{brand}   # See all projects for this brand"
+            return
+          end
+
+          s3_files = list_s3_files
+          local_files = list_local_files(staging_dir)
+
+          s3_files_map = s3_files.each_with_object({}) do |file, hash|
+            relative_path = extract_relative_path(file['Key'])
+            hash[relative_path] = file
+          end
+
+          if s3_files.empty? && local_files.empty?
+            puts "ℹ️  No files in S3 or s3-staging/ for #{brand}/#{project_id}"
+            puts ''
+            puts '   This project exists but has no heavy files ready for S3 sync.'
+            puts ''
+            puts '   Next steps:'
+            puts "     1. Add video files to: #{staging_dir}/"
+            puts "     2. Upload to S3: dam s3-up #{brand} #{project_id}"
+            return
+          end
+
+          puts "📊 S3 Sync Status for #{brand}/#{project_id}"
+
+          if s3_files.any?
+            most_recent = s3_files.map { |f| f['LastModified'] }.compact.max
+            if most_recent
+              time_ago = format_time_ago(Time.now - most_recent)
+              puts "   Last synced: #{time_ago} ago (#{most_recent.strftime('%Y-%m-%d %H:%M')})"
+            end
+          end
+          puts ''
+
+          all_paths = (s3_files_map.keys + local_files.keys).uniq.sort
+
+          total_s3_size = 0
+          total_local_size = 0
+
+          all_paths.each do |relative_path|
+            s3_file = s3_files_map[relative_path]
+            local_file = File.join(staging_dir, relative_path)
+
+            if s3_file && File.exist?(local_file)
+              s3_size = s3_file['Size']
+              local_size = File.size(local_file)
+              total_s3_size += s3_size
+              total_local_size += local_size
+
+              s3_etag = s3_file['ETag'].gsub('"', '')
+              match_status = compare_files(local_file: local_file, s3_etag: s3_etag, s3_size: s3_size)
+
+              if match_status == :synced
+                status_label = multipart_etag?(s3_etag) ? 'synced*' : 'synced'
+                puts "  ✓ #{relative_path} (#{file_size_human(s3_size)}) [#{status_label}]"
+              else
+                puts "  ⚠️  #{relative_path} (#{file_size_human(s3_size)}) [modified]"
+              end
+            elsif s3_file
+              s3_size = s3_file['Size']
+              total_s3_size += s3_size
+              puts "  ☁️  #{relative_path} (#{file_size_human(s3_size)}) [S3 only]"
+            else
+              local_size = File.size(local_file)
+              total_local_size += local_size
+              puts "  📁 #{relative_path} (#{file_size_human(local_size)}) [local only]"
+            end
+          end
+
+          puts ''
+          puts "S3 files: #{s3_files.size}, Local files: #{local_files.size}"
+          puts "S3 size: #{file_size_human(total_s3_size)}, Local size: #{file_size_human(total_local_size)}"
+        end
+
+        # Calculate 3-state S3 sync status
+        # @return [String] One of: '↑ upload', '↓ download', '✓ synced', 'none'
+        def calculate_sync_status
+          project_dir = project_directory_path
+          staging_dir = File.join(project_dir, 's3-staging')
+
+          return 'none' unless Dir.exist?(staging_dir)
+
+          begin
+            s3_files = list_s3_files
+          rescue StandardError
+            return 'none'
+          end
+
+          local_files = list_local_files(staging_dir)
+
+          return 'none' if s3_files.empty? && local_files.empty?
+
+          s3_files_map = s3_files.each_with_object({}) do |file, hash|
+            relative_path = extract_relative_path(file['Key'])
+            hash[relative_path] = file
+          end
+
+          needs_upload = false
+          needs_download = false
+
+          local_files.each_key do |relative_path|
+            local_file = File.join(staging_dir, relative_path)
+            s3_file = s3_files_map[relative_path]
+
+            if s3_file
+              s3_etag = s3_file['ETag'].gsub('"', '')
+              s3_size = s3_file['Size']
+              match_status = compare_files(local_file: local_file, s3_etag: s3_etag, s3_size: s3_size)
+              needs_upload = true if match_status != :synced
+            else
+              needs_upload = true
+            end
+          end
+
+          s3_files_map.each_key do |relative_path|
+            local_file = File.join(staging_dir, relative_path)
+            needs_download = true unless File.exist?(local_file)
+          end
+
+          if needs_upload && needs_download
+            '⚠️ both'
+          elsif needs_upload
+            '↑ upload'
+          elsif needs_download
+            '↓ download'
+          else
+            '✓ synced'
+          end
+        end
+
+        # Calculate S3 sync timestamps (last upload/download times)
+        # @return [Hash] { last_upload: Time|nil, last_download: Time|nil }
+        def sync_timestamps
+          project_dir = project_directory_path
+          staging_dir = File.join(project_dir, 's3-staging')
+
+          return { last_upload: nil, last_download: nil } unless Dir.exist?(staging_dir)
+
+          begin
+            s3_files = list_s3_files
+          rescue StandardError
+            return { last_upload: nil, last_download: nil }
+          end
+
+          last_upload = s3_files.map { |f| f['LastModified'] }.compact.max if s3_files.any?
+
+          last_download = if Dir.exist?(staging_dir)
+                            local_files = Dir.glob(File.join(staging_dir, '**/*')).select { |f| File.file?(f) }
+                            local_files.map { |f| File.mtime(f) }.max if local_files.any?
+                          end
+
+          { last_upload: last_upload, last_download: last_download }
+        end
+      end
+    end
+  end
+end

data/lib/appydave/tools/version.rb

@@ -2,6 +2,6 @@
 
 module Appydave
   module Tools
-    VERSION = '0.77.4'
+    VERSION = '0.77.5'
   end
 end

data/lib/appydave/tools.rb

@@ -70,6 +70,7 @@ require 'appydave/tools/dam/config_loader'
 require 'appydave/tools/dam/s3_base'
 require 'appydave/tools/dam/s3_uploader'
 require 'appydave/tools/dam/s3_downloader'
+require 'appydave/tools/dam/s3_status_checker'
 require 'appydave/tools/dam/s3_operations'
 require 'appydave/tools/dam/s3_scanner'
 require 'appydave/tools/dam/share_operations'

data/package.json

@@ -1,6 +1,6 @@
 {
   "name": "appydave-tools",
-  "version": "0.77.4",
+  "version": "0.77.5",
   "description": "AppyDave YouTube Automation Tools",
   "scripts": {
     "release": "semantic-release"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: appydave-tools
 version: !ruby/object:Gem::Version
-  version: 0.77.4
+  version: 0.77.5
 platform: ruby
 authors:
 - David Cruwys
@@ -379,6 +379,7 @@ files:
 - lib/appydave/tools/dam/s3_operations.rb
 - lib/appydave/tools/dam/s3_scan_command.rb
 - lib/appydave/tools/dam/s3_scanner.rb
+- lib/appydave/tools/dam/s3_status_checker.rb
 - lib/appydave/tools/dam/s3_uploader.rb
 - lib/appydave/tools/dam/share_operations.rb
 - lib/appydave/tools/dam/ssd_status.rb