appydave-tools 0.69.0 → 0.71.0

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

@@ -152,35 +152,37 @@ module Appydave
 
             s3_path = build_s3_key(relative_path)
 
-            # Check if file already exists with same MD5
-            local_md5 = file_md5(file)
-            s3_md5 = s3_file_md5(s3_path)
-
-            if local_md5 == s3_md5
-              puts "  ⏭️  Skipped: #{relative_path} (unchanged)"
-              skipped += 1
-            else
-              # Warn if we're about to overwrite an existing S3 file
-              if s3_md5 && s3_md5 != local_md5
-                puts "  ⚠️  Warning: #{relative_path} exists in S3 with different content"
-
-                # Try to get S3 timestamp for comparison
-                s3_file_info = get_s3_file_info(s3_path)
-                if s3_file_info && s3_file_info['LastModified']
-                  s3_time = s3_file_info['LastModified']
-                  local_time = File.mtime(file)
-                  puts "     S3: #{s3_time.strftime('%Y-%m-%d %H:%M')} | Local: #{local_time.strftime('%Y-%m-%d %H:%M')}"
-
-                  puts '     ⚠️  S3 file is NEWER than local - you may be overwriting recent changes!' if s3_time > local_time
-                end
-                puts '     Uploading will overwrite S3 version...'
+            # Check if file already exists in S3 and compare
+            s3_info = get_s3_file_info(s3_path)
+
+            if s3_info
+              s3_etag = s3_info['ETag'].gsub('"', '')
+              s3_size = s3_info['Size']
+              match_status = compare_files(local_file: file, s3_etag: s3_etag, s3_size: s3_size)
+
+              if match_status == :synced
+                comparison_method = multipart_etag?(s3_etag) ? 'size match' : 'unchanged'
+                puts "  ⏭️  Skipped: #{relative_path} (#{comparison_method})"
+                skipped += 1
+                next
               end
 
-              if upload_file(file, s3_path, dry_run: dry_run)
-                uploaded += 1
-              else
-                failed += 1
-              end
+              # File exists but content differs - warn before overwriting
+              puts "  ⚠️  Warning: #{relative_path} exists in S3 with different content"
+              puts '     (multipart upload detected - comparing by size)' if multipart_etag?(s3_etag)
+
+              s3_time = s3_info['LastModified']
+              local_time = File.mtime(file)
+              puts "     S3: #{s3_time.strftime('%Y-%m-%d %H:%M')} | Local: #{local_time.strftime('%Y-%m-%d %H:%M')}"
+
+              puts '     ⚠️  S3 file is NEWER than local - you may be overwriting recent changes!' if s3_time > local_time
+              puts '     Uploading will overwrite S3 version...'
+            end
+
+            if upload_file(file, s3_path, dry_run: dry_run)
+              uploaded += 1
+            else
+              failed += 1
             end
           end
           # rubocop:enable Metrics/BlockLength
@@ -208,48 +210,55 @@ module Appydave
             return
           end
 
-          puts "📦 Downloading #{s3_files.size} file(s) from S3 to #{project_id}/s3-staging/..."
+          total_size = s3_files.sum { |f| f['Size'] || 0 }
+          puts "📦 Downloading #{s3_files.size} file(s) (#{file_size_human(total_size)}) from S3 to #{project_id}/s3-staging/..."
           puts ''
 
           downloaded = 0
           skipped = 0
           failed = 0
 
+          # rubocop:disable Metrics/BlockLength
           s3_files.each do |s3_file|
             key = s3_file['Key']
             relative_path = extract_relative_path(key)
             local_file = File.join(staging_dir, relative_path)
 
-            # Check if file already exists with same MD5
-            s3_md5 = s3_file['ETag'].gsub('"', '')
-            local_md5 = File.exist?(local_file) ? file_md5(local_file) : nil
+            # Check if file already exists and compare
+            s3_etag = s3_file['ETag'].gsub('"', '')
+            s3_size = s3_file['Size']
 
-            if local_md5 == s3_md5
-              puts "  ⏭️  Skipped: #{relative_path} (unchanged)"
-              skipped += 1
-            else
-              # Warn if we're about to overwrite an existing local file
-              if local_md5 && local_md5 != s3_md5
-                puts "  ⚠️  Warning: #{relative_path} exists locally with different content"
-
-                # Compare timestamps
-                if s3_file['LastModified'] && File.exist?(local_file)
-                  s3_time = s3_file['LastModified']
-                  local_time = File.mtime(local_file)
-                  puts "     S3: #{s3_time.strftime('%Y-%m-%d %H:%M')} | Local: #{local_time.strftime('%Y-%m-%d %H:%M')}"
-
-                  puts '     ⚠️  Local file is NEWER than S3 - you may be overwriting recent changes!' if local_time > s3_time
-                end
-                puts '     Downloading will overwrite local version...'
+            if File.exist?(local_file)
+              match_status = compare_files(local_file: local_file, s3_etag: s3_etag, s3_size: s3_size)
+
+              if match_status == :synced
+                comparison_method = multipart_etag?(s3_etag) ? 'size match' : 'unchanged'
+                puts "  ⏭️  Skipped: #{relative_path} (#{comparison_method})"
+                skipped += 1
+                next
               end
 
-              if download_file(key, local_file, dry_run: dry_run)
-                downloaded += 1
-              else
-                failed += 1
+              # File exists but content differs - warn before overwriting
+              puts "  ⚠️  Warning: #{relative_path} exists locally with different content"
+              puts '     (multipart upload detected - comparing by size)' if multipart_etag?(s3_etag)
+
+              if s3_file['LastModified']
+                s3_time = s3_file['LastModified']
+                local_time = File.mtime(local_file)
+                puts "     S3: #{s3_time.strftime('%Y-%m-%d %H:%M')} | Local: #{local_time.strftime('%Y-%m-%d %H:%M')}"
+
+                puts '     ⚠️  Local file is NEWER than S3 - you may be overwriting recent changes!' if local_time > s3_time
               end
+              puts '     Downloading will overwrite local version...'
+            end
+
+            if download_file(key, local_file, dry_run: dry_run)
+              downloaded += 1
+            else
+              failed += 1
             end
           end
+          # rubocop:enable Metrics/BlockLength
           puts ''
           puts '✅ Download complete!'
           puts "   Downloaded: #{downloaded}, Skipped: #{skipped}, Failed: #{failed}"
@@ -322,11 +331,12 @@ module Appydave
               total_s3_size += s3_size
               total_local_size += local_size
 
-              local_md5 = file_md5(local_file)
-              s3_md5 = s3_file['ETag'].gsub('"', '')
+              s3_etag = s3_file['ETag'].gsub('"', '')
+              match_status = compare_files(local_file: local_file, s3_etag: s3_etag, s3_size: s3_size)
 
-              if local_md5 == s3_md5
-                puts "  ✓ #{relative_path} (#{file_size_human(s3_size)}) [synced]"
+              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
@@ -526,10 +536,11 @@ module Appydave
             s3_file = s3_files_map[relative_path]
 
             if s3_file
-              # Compare MD5
-              local_md5 = file_md5(local_file)
-              s3_md5 = s3_file['ETag'].gsub('"', '')
-              needs_upload = true if local_md5 != s3_md5
+              # 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
@@ -623,6 +634,47 @@ module Appydave
           nil
         end
 
+        # Check if an S3 ETag is from a multipart upload
+        # Multipart ETags have format: "hash-partcount" (e.g., "d41d8cd98f00b204e9800998ecf8427e-5")
+        def multipart_etag?(etag)
+          return false if etag.nil?
+
+          etag.include?('-')
+        end
+
+        # Compare local file with S3 file, handling multipart ETags
+        # Returns: :synced, :modified, or :unknown
+        # For multipart uploads, falls back to size comparison since MD5 won't match
+        def compare_files(local_file:, s3_etag:, s3_size:)
+          return :unknown unless File.exist?(local_file)
+          return :unknown if s3_etag.nil?
+
+          local_size = File.size(local_file)
+
+          if multipart_etag?(s3_etag)
+            # Multipart upload - MD5 comparison won't work, use size
+            # Size match is a reasonable proxy for "unchanged" in this context
+            local_size == s3_size ? :synced : :modified
+          else
+            # Standard upload - use MD5 comparison
+            local_md5 = file_md5(local_file)
+            return :unknown if local_md5.nil?
+
+            local_md5 == s3_etag ? :synced : :modified
+          end
+        end
+
+        # Get S3 file size from path (for upload comparison)
+        def s3_file_size(s3_path)
+          response = s3_client.head_object(
+            bucket: brand_info.aws.s3_bucket,
+            key: s3_path
+          )
+          response.content_length
+        rescue Aws::S3::Errors::NotFound, Aws::S3::Errors::ServiceError
+          nil
+        end
+
         # Upload file to S3
         def upload_file(local_file, s3_path, dry_run: false)
           if dry_run

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

@@ -0,0 +1,226 @@
+# frozen_string_literal: true
+
+module Appydave
+  module Tools
+    module Dam
+      # Show SSD mount status for all brands
+      class SsdStatus
+        attr_reader :brands_config
+
+        def initialize(brands_config: nil)
+          if brands_config
+            @brands_config = brands_config
+          else
+            Appydave::Tools::Configuration::Config.configure
+            @brands_config = Appydave::Tools::Configuration::Config.brands
+          end
+        end
+
+        # Show SSD status for all brands
+        def show_all
+          results = collect_brand_statuses
+
+          # Identify unique volumes
+          volumes = results.select { |r| r[:configured] }
+                           .map { |r| extract_volume_name(r[:ssd_path]) }
+                           .compact
+                           .uniq
+
+          if volumes.empty?
+            puts '⚠️  No SSD volumes configured'
+            return
+          end
+
+          # Show simple mount status for each volume
+          volumes.each do |volume|
+            volume_path = "/Volumes/#{volume}"
+            if Dir.exist?(volume_path)
+              puts "✅ #{volume} is MOUNTED"
+            else
+              puts "❌ #{volume} is NOT MOUNTED"
+            end
+          end
+
+          puts ''
+          puts '| Brand          | Path                                   | Status       |'
+          puts '|----------------|----------------------------------------|--------------|'
+          results.each do |result|
+            display_brand_row(result)
+          end
+        end
+
+        # Show SSD status for a specific brand
+        def show(brand_key)
+          brand_info = @brands_config.get_brand(brand_key)
+          ssd_path = brand_info.locations.ssd_backup
+
+          puts "💾 SSD Status: #{brand_info.name} (#{brand_info.key})"
+          puts ''
+
+          if ssd_path.nil? || ssd_path.empty? || ssd_path == 'NOT-SET'
+            puts '⚠️  SSD backup not configured for this brand'
+            puts ''
+            puts 'To configure, add ssd_backup to brands.json:'
+            puts ''
+            puts '  "locations": {'
+            puts '    "video_projects": "/path/to/projects",'
+            puts '    "ssd_backup": "/Volumes/T7/youtube-PUBLISHED/appydave"'
+            puts '  }'
+            return
+          end
+
+          puts "Path: #{ssd_path}"
+          puts ''
+
+          if Dir.exist?(ssd_path)
+            display_mounted_details(brand_info, ssd_path)
+          else
+            display_unmounted_details(ssd_path)
+          end
+        end
+
+        private
+
+        def collect_brand_statuses
+          @brands_config.brands.map do |brand_info|
+            ssd_path = brand_info.locations.ssd_backup
+            configured = ssd_path && !ssd_path.empty? && ssd_path != 'NOT-SET'
+            mounted = configured && Dir.exist?(ssd_path)
+
+            # Check if SSD volume is mounted but folder doesn't exist
+            volume_mounted = false
+            if configured && !mounted
+              volume_name = extract_volume_name(ssd_path)
+              volume_mounted = volume_name && Dir.exist?("/Volumes/#{volume_name}")
+            end
+
+            {
+              brand: brand_info,
+              ssd_path: ssd_path,
+              configured: configured,
+              mounted: mounted,
+              volume_mounted: volume_mounted
+            }
+          end
+        end
+
+        def display_brand_row(result)
+          brand_col = result[:brand].key.ljust(14)
+
+          if result[:configured]
+            path_col = truncate_path(result[:ssd_path], 38).ljust(38)
+            status_col = if result[:mounted]
+                           '✅ Ready'
+                         elsif result[:volume_mounted]
+                           '⚠️ No folder'
+                         else
+                           '❌ Not mounted'
+                         end
+          else
+            path_col = '(not configured)'.ljust(38)
+            status_col = '⚠️ N/A'
+          end
+
+          puts "| #{brand_col} | #{path_col} | #{status_col.ljust(12)} |"
+        end
+
+        def display_mounted_details(_brand_info, ssd_path)
+          puts '✅ SSD is mounted'
+          puts ''
+
+          # Count projects on SSD
+          project_dirs = Dir.glob(File.join(ssd_path, '*')).select { |f| File.directory?(f) }
+          project_count = project_dirs.size
+
+          # Calculate total size (quick estimate from directory count)
+          puts "Projects on SSD: #{project_count}"
+
+          # Show disk space info if available
+          show_disk_space(ssd_path)
+
+          # Show recent projects
+          return unless project_count.positive?
+
+          puts ''
+          puts 'Recent projects (last 5 modified):'
+          recent = project_dirs.sort_by { |d| File.mtime(d) }.reverse.first(5)
+          recent.each do |dir|
+            name = File.basename(dir)
+            age = FileHelper.format_age(File.mtime(dir))
+            puts "  #{name} (#{age} ago)"
+          end
+        end
+
+        def display_unmounted_details(ssd_path)
+          # Try to identify the volume
+          volume_name = extract_volume_name(ssd_path)
+          volume_path = "/Volumes/#{volume_name}" if volume_name
+
+          if volume_name && Dir.exist?(volume_path)
+            # SSD is mounted, but specific folder doesn't exist
+            puts '⚠️  SSD is mounted but backup folder does NOT exist'
+            puts ''
+            puts "Volume '#{volume_name}' is connected, but the expected backup folder is missing."
+            puts ''
+            puts 'To create the backup folder:'
+            puts "  mkdir -p #{ssd_path}"
+            puts ''
+            puts 'Or update brands.json with the correct path.'
+          else
+            # SSD is not mounted at all
+            puts '❌ SSD is NOT mounted'
+            puts ''
+            puts 'Expected path does not exist.'
+            puts ''
+
+            if volume_name
+              puts "Volume expected: #{volume_name}"
+              puts ''
+              puts 'To mount:'
+              puts "  1. Connect the '#{volume_name}' drive"
+              puts '  2. Verify it appears in /Volumes/'
+              puts "  3. Run: ls #{ssd_path}"
+            end
+          end
+        end
+
+        def show_disk_space(ssd_path)
+          # Use df to get disk space info
+          output = `df -h "#{ssd_path}" 2>/dev/null`
+          return if output.empty?
+
+          lines = output.lines
+          return unless lines.size >= 2
+
+          # Parse df output (header + data line)
+          parts = lines[1].split
+          return unless parts.size >= 4
+
+          size = parts[1]
+          used = parts[2]
+          avail = parts[3]
+          capacity = parts[4] if parts.size >= 5
+
+          puts ''
+          puts 'Disk Space:'
+          puts "  Total:     #{size}"
+          puts "  Used:      #{used} (#{capacity})" if capacity
+          puts "  Available: #{avail}"
+        end
+
+        def extract_volume_name(path)
+          # Extract volume name from /Volumes/VolumeName/...
+          match = path.match(%r{^/Volumes/([^/]+)})
+          match[1] if match
+        end
+
+        def truncate_path(path, max_length)
+          return path if path.nil? || path.length <= max_length
+
+          # Keep the end of the path (more useful)
+          "...#{path[-(max_length - 3)..]}"
+        end
+      end
+    end
+  end
+end

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

@@ -42,7 +42,7 @@ module Appydave
         def show_project_status
           project_size = calculate_project_size
           last_modified = File.mtime(project_path)
-          age = format_age(last_modified)
+          age = FileHelper.format_age(last_modified)
 
           puts "📊 Status: v-#{brand}/#{File.basename(project_path)} (#{format_size(project_size)})"
           puts "   Last modified: #{age} ago"
@@ -155,7 +155,7 @@ module Appydave
 
             if Dir.exist?(ssd_full_path)
               last_modified = File.mtime(ssd_full_path)
-              age = format_age(last_modified)
+              age = FileHelper.format_age(last_modified)
               puts "     Last synced: #{age} ago"
             end
           end
@@ -163,29 +163,6 @@ module Appydave
           puts ''
         end
 
-        def show_git_status
-          puts 'Git:'
-
-          status = git_status_info
-
-          puts "  🌿 Branch: #{status[:branch]}"
-          puts "  📡 Remote: #{status[:remote]}" if status[:remote]
-
-          if status[:modified_count].positive? || status[:untracked_count].positive?
-            puts "  ↕️  Status: #{status[:modified_count]} modified, #{status[:untracked_count]} untracked"
-          else
-            puts '  ↕️  Status: Clean working directory'
-          end
-
-          if status[:ahead].positive? || status[:behind].positive?
-            puts "  🔄 Sync: #{sync_status_text(status[:ahead], status[:behind])}"
-          else
-            puts '  🔄 Sync: Up to date'
-          end
-
-          puts ''
-        end
-
         def show_brand_git_status
           status = git_status_info
 
@@ -340,31 +317,6 @@ module Appydave
           FileHelper.format_size(bytes)
         end
 
-        def format_age(time)
-          return 'N/A' if time.nil?
-
-          seconds = Time.now - time
-          return 'just now' if seconds < 60
-
-          minutes = seconds / 60
-          return "#{minutes.round}m" if minutes < 60
-
-          hours = minutes / 60
-          return "#{hours.round}h" if hours < 24
-
-          days = hours / 24
-          return "#{days.round}d" if days < 7
-
-          weeks = days / 7
-          return "#{weeks.round}w" if weeks < 4
-
-          months = days / 30
-          return "#{months.round}mo" if months < 12
-
-          years = days / 365
-          "#{years.round}y"
-        end
-
         def calculate_manifest_age(last_updated_str)
           last_updated = Time.parse(last_updated_str)
           Time.now - last_updated
@@ -468,7 +420,7 @@ module Appydave
 
           return unless latest_sync
 
-          age = format_age(latest_sync)
+          age = FileHelper.format_age(latest_sync)
           puts "   Last S3 sync: #{age} ago"
         end
       end