appydave-tools 0.66.0 → 0.68.0

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

@@ -10,6 +10,7 @@ module Appydave
       # Project listing functionality for VAT
       class ProjectListing
         # List all brands with summary table
+        # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
         def self.list_brands_with_counts(detailed: false)
           brands = Config.available_brands
 
@@ -77,9 +78,11 @@ module Appydave
                "#{total_projects} project#{'s' if total_projects != 1}, " \
                "#{format_size(total_size)}"
         end
+        # rubocop:enable Metrics/AbcSize, Metrics/MethodLength
 
         # List all projects for a specific brand (Mode 3)
-        def self.list_brand_projects(brand_arg)
+        # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
+        def self.list_brand_projects(brand_arg, detailed: false)
           # ProjectResolver expects the original brand key/shortcut, not the expanded v-* version
           projects = ProjectResolver.list_projects(brand_arg)
 
@@ -102,58 +105,63 @@ module Appydave
 
           # Gather project data
           brand_path = Config.brand_path(brand_arg)
+          brand_info = Appydave::Tools::Configuration::Config.brands.get_brand(brand_arg)
           is_git_repo = Dir.exist?(File.join(brand_path, '.git'))
 
           project_data = projects.map do |project|
-            project_path = Config.project_path(brand_arg, project)
-            size = FileHelper.calculate_directory_size(project_path)
-            modified = File.mtime(project_path)
-
-            # Check if project has uncommitted changes (if brand is git repo)
-            git_status = if is_git_repo
-                           calculate_project_git_status(brand_path, project)
-                         else
-                           'N/A'
-                         end
-
-            # Check if project has s3-staging folder
-            s3_sync = if Dir.exist?(File.join(project_path, 's3-staging'))
-                        '✓ staged'
-                      else
-                        'none'
-                      end
-
-            {
-              name: project,
-              path: project_path,
-              size: size,
-              modified: modified,
-              age: format_age(modified),
-              stale: stale?(modified),
-              git_status: git_status,
-              s3_sync: s3_sync
-            }
+            collect_project_data(brand_arg, brand_path, brand_info, project, is_git_repo, detailed: detailed)
           end
 
-          # Print table header
+          # Print common header
           puts "Projects in #{brand}:"
           puts ''
           puts 'ℹ️  Note: Lists only projects with files, not empty directories'
           puts ''
-          puts 'PROJECT                                               SIZE             AGE              GIT              S3'
-          puts '-' * 130
 
-          # Print table rows
-          project_data.each do |data|
-            age_display = data[:stale] ? "#{data[:age]} ⚠️" : data[:age]
-            puts format(
-              '%-45s %12s %15s  %-15s  %-10s',
-              data[:name],
-              format_size(data[:size]),
-              age_display,
-              data[:git_status],
-              data[:s3_sync]
-            )
+          if detailed
+            # Detailed view with additional columns
+            header = 'PROJECT                                               SIZE             AGE              GIT              S3           ' \
+                     'PATH                                      HEAVY FILES         LIGHT FILES         SSD BACKUP                      ' \
+                     'S3 ↑ UPLOAD      S3 ↓ DOWNLOAD'
+            puts header
+            puts '-' * 250
+
+            project_data.each do |data|
+              age_display = data[:stale] ? "#{data[:age]} ⚠️" : data[:age]
+              s3_upload = data[:s3_last_upload] ? format_age(data[:s3_last_upload]) : 'N/A'
+              s3_download = data[:s3_last_download] ? format_age(data[:s3_last_download]) : 'N/A'
+
+              puts format(
+                '%-45s %12s %15s  %-15s  %-12s  %-35s  %-18s  %-18s  %-30s  %-15s  %-15s',
+                data[:name],
+                format_size(data[:size]),
+                age_display,
+                data[:git_status],
+                data[:s3_sync],
+                shorten_path(data[:path]),
+                data[:heavy_files] || 'N/A',
+                data[:light_files] || 'N/A',
+                data[:ssd_backup] || 'N/A',
+                s3_upload,
+                s3_download
+              )
+            end
+          else
+            # Default view
+            puts 'PROJECT                                               SIZE             AGE              GIT              S3'
+            puts '-' * 130
+
+            project_data.each do |data|
+              age_display = data[:stale] ? "#{data[:age]} ⚠️" : data[:age]
+              puts format(
+                '%-45s %12s %15s  %-15s  %-12s',
+                data[:name],
+                format_size(data[:size]),
+                age_display,
+                data[:git_status],
+                data[:s3_sync]
+              )
+            end
           end
 
           # Print footer summary
@@ -163,8 +171,10 @@ module Appydave
           puts ''
           puts "Total: #{project_count} project#{'s' if project_count != 1}, #{format_size(total_size)}"
         end
+        # rubocop:enable Metrics/AbcSize, Metrics/MethodLength
 
         # List with pattern matching (Mode 3b)
+        # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
         def self.list_with_pattern(brand_arg, pattern)
           # ProjectResolver expects the original brand key/shortcut, not the expanded v-* version
           matches = ProjectResolver.resolve_pattern(brand_arg, pattern)
@@ -227,10 +237,12 @@ module Appydave
           puts "Total: #{match_count} project#{'s' if match_count != 1}, #{format_size(total_size)} " \
                "(#{percentage}% of #{brand})"
         end
+        # rubocop:enable Metrics/AbcSize, Metrics/MethodLength
 
         # Helper methods
 
         # Show brand context header with git, S3, and SSD info
+        # rubocop:disable Metrics/AbcSize
         def self.show_brand_header(brand_arg, brand)
           Appydave::Tools::Configuration::Config.configure
           brand_info = Appydave::Tools::Configuration::Config.brands.get_brand(brand_arg)
@@ -265,8 +277,10 @@ module Appydave
 
           puts ''
         end
+        # rubocop:enable Metrics/AbcSize
 
         # Collect brand data for display
+        # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
         def self.collect_brand_data(brand, detailed: false)
           Appydave::Tools::Configuration::Config.configure
           brand_info = Appydave::Tools::Configuration::Config.brands.get_brand(brand)
@@ -325,6 +339,7 @@ module Appydave
 
           result
         end
+        # rubocop:enable Metrics/AbcSize, Metrics/MethodLength
 
         # Calculate git status for a brand
         def self.calculate_git_status(brand_path)
@@ -368,6 +383,107 @@ module Appydave
           end
         end
 
+        # Calculate 3-state S3 sync status for a project
+        def self.calculate_project_s3_sync_status(brand_arg, brand_info, project)
+          # Check if S3 is configured
+          s3_bucket = brand_info.aws.s3_bucket
+          return 'N/A' if s3_bucket.nil? || s3_bucket.empty? || s3_bucket == 'NOT-SET'
+
+          # Use S3Operations to calculate sync status
+          begin
+            s3_ops = S3Operations.new(brand_arg, project, brand_info: brand_info)
+            s3_ops.calculate_sync_status
+          rescue StandardError
+            # S3 not accessible or other error
+            'N/A'
+          end
+        end
+
+        # Calculate S3 sync timestamps for a project
+        def self.calculate_s3_timestamps(brand_arg, brand_info, project)
+          # Check if S3 is configured
+          s3_bucket = brand_info.aws.s3_bucket
+          return { last_upload: nil, last_download: nil } if s3_bucket.nil? || s3_bucket.empty? || s3_bucket == 'NOT-SET'
+
+          # Use S3Operations to get timestamps
+          begin
+            s3_ops = S3Operations.new(brand_arg, project, brand_info: brand_info)
+            s3_ops.sync_timestamps
+          rescue StandardError
+            # S3 not accessible or other error
+            { last_upload: nil, last_download: nil }
+          end
+        end
+
+        # Collect project data for display
+        # rubocop:disable Metrics/MethodLength, Metrics/AbcSize, Metrics/ParameterLists
+        def self.collect_project_data(brand_arg, brand_path, brand_info, project, is_git_repo, detailed: false)
+          project_path = Config.project_path(brand_arg, project)
+          size = FileHelper.calculate_directory_size(project_path)
+          modified = File.mtime(project_path)
+
+          # Check if project has uncommitted changes (if brand is git repo)
+          git_status = if is_git_repo
+                         calculate_project_git_status(brand_path, project)
+                       else
+                         'N/A'
+                       end
+
+          # Calculate 3-state S3 sync status
+          s3_sync = calculate_project_s3_sync_status(brand_arg, brand_info, project)
+
+          result = {
+            name: project,
+            path: project_path,
+            size: size,
+            modified: modified,
+            age: format_age(modified),
+            stale: stale?(modified),
+            git_status: git_status,
+            s3_sync: s3_sync
+          }
+
+          # Add detailed fields if requested
+          if detailed
+            # Heavy files (video files in root)
+            heavy_count = 0
+            heavy_size = 0
+            Dir.glob(File.join(project_path, '*.{mp4,mov,avi,mkv,webm}')).each do |file|
+              heavy_count += 1
+              heavy_size += File.size(file)
+            end
+
+            # Light files (subtitles, images, metadata)
+            light_count = 0
+            light_size = 0
+            Dir.glob(File.join(project_path, '**/*.{srt,vtt,jpg,png,md,txt,json,yml}')).each do |file|
+              light_count += 1
+              light_size += File.size(file)
+            end
+
+            # SSD backup path (if exists)
+            ssd_backup = brand_info.locations.ssd_backup
+            ssd_path = if ssd_backup && !ssd_backup.empty? && ssd_backup != 'NOT-SET'
+                         ssd_project_path = File.join(ssd_backup, project)
+                         File.exist?(ssd_project_path) ? shorten_path(ssd_project_path) : nil
+                       end
+
+            # S3 timestamps (last upload/download)
+            s3_timestamps = calculate_s3_timestamps(brand_arg, brand_info, project)
+
+            result.merge!(
+              heavy_files: "#{heavy_count} (#{format_size(heavy_size)})",
+              light_files: "#{light_count} (#{format_size(light_size)})",
+              ssd_backup: ssd_path,
+              s3_last_upload: s3_timestamps[:last_upload],
+              s3_last_download: s3_timestamps[:last_download]
+            )
+          end
+
+          result
+        end
+        # rubocop:enable Metrics/MethodLength, Metrics/AbcSize, Metrics/ParameterLists
+
         # Calculate total size of all projects in a brand
         def self.calculate_total_size(brand, projects)
           projects.sum do |project|

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

@@ -488,6 +488,101 @@ module Appydave
           puts dry_run ? '✅ Archive dry-run complete!' : '✅ Archive complete!'
         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')
+
+          # 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 MD5
+              local_md5 = file_md5(local_file)
+              s3_md5 = s3_file['ETag'].gsub('"', '')
+              needs_upload = true if local_md5 != s3_md5
+            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
+        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 }
+        end
+
         # Build S3 key for a file
         def build_s3_key(relative_path)
           "#{brand_info.aws.s3_prefix}#{project_id}/#{relative_path}"

data/lib/appydave/tools/version.rb

@@ -2,6 +2,6 @@
 
 module Appydave
   module Tools
-    VERSION = '0.66.0'
+    VERSION = '0.68.0'
   end
 end

data/lib/appydave/tools.rb

@@ -55,6 +55,7 @@ require 'appydave/tools/subtitle_processor/join'
 require 'appydave/tools/dam/errors'
 require 'appydave/tools/dam/file_helper'
 require 'appydave/tools/dam/git_helper'
+require 'appydave/tools/dam/fuzzy_matcher'
 require 'appydave/tools/dam/brand_resolver'
 require 'appydave/tools/dam/config'
 require 'appydave/tools/dam/project_resolver'

data/package.json

@@ -1,6 +1,6 @@
 {
   "name": "appydave-tools",
-  "version": "0.66.0",
+  "version": "0.68.0",
   "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.66.0
+  version: 0.68.0
 platform: ruby
 authors:
 - David Cruwys
@@ -228,6 +228,7 @@ files:
 - bin/youtube_automation.rb
 - bin/youtube_manager.rb
 - docs/README.md
+- docs/ai-instructions/behavioral-regression-audit.md
 - docs/ai-instructions/code-quality-retrospective.md
 - docs/ai-instructions/defensive-logging-audit.md
 - docs/architecture/cli/cli-pattern-comparison.md
@@ -251,8 +252,10 @@ files:
 - docs/archive/tool-discovery.md
 - docs/archive/tool-documentation-analysis.md
 - docs/code-quality/README.md
+- docs/code-quality/behavioral-audit-2025-01-22.md
 - docs/code-quality/implementation-plan.md
 - docs/code-quality/report-2025-01-21.md
+- docs/code-quality/uat-plan-2025-01-22.md
 - docs/guides/configuration-setup.md
 - docs/guides/platforms/windows/README.md
 - docs/guides/platforms/windows/dam-testing-plan-windows-powershell.md
@@ -302,6 +305,7 @@ files:
 - lib/appydave/tools/dam/config_loader.rb
 - lib/appydave/tools/dam/errors.rb
 - lib/appydave/tools/dam/file_helper.rb
+- lib/appydave/tools/dam/fuzzy_matcher.rb
 - lib/appydave/tools/dam/git_helper.rb
 - lib/appydave/tools/dam/manifest_generator.rb
 - lib/appydave/tools/dam/project_listing.rb