Merge branch 'dev' into improvements

improvements (#15 )
Reviewed-on: #15
2025-09-27 13:02:11 -04:00 · 2025-09-27 13:00:08 -04:00 · 2025-09-26 17:07:12 -04:00 · 2025-09-26 16:59:12 -04:00 · 2025-09-26 16:49:57 -04:00 · 2025-09-26 16:42:35 -04:00
2 changed files with 0 additions and 383 deletions
@@ -1,161 +0,0 @@
 name: Local Docker Build (Dev)
 on:
  push:
    branches: [ dev ]
  pull_request:
    branches: [ dev ]
 jobs:
  build-dev:
    runs-on: host
    steps:
    - name: Checkout code (DEV)
      run: |
        echo "Current workspace: $(pwd)"
        # Clean workspace and temp directory first
        rm -rf * .git* 2>/dev/null || true
        rm -rf /tmp/repo 2>/dev/null || true
        # Clone the repository since Gitea runner doesn't auto-checkout
        echo "Cloning repository..."
        git clone --branch dev http://${{ secrets.username }}:${{ secrets.token }}@192.168.253.221:3000/sbcrumb/nfoguard.git /tmp/repo
        cp -r /tmp/repo/* .
        cp -r /tmp/repo/.* . 2>/dev/null || true
        rm -rf /tmp/repo
        echo "Repository cloned successfully"
        ls -la
        echo "Checking Dockerfile:"
        head -30 Dockerfile
    - name: Check Docker availability (DEV)
      run: |
        echo "Checking Docker installation..."
        which docker || (echo "Docker not found in PATH" && exit 1)
        docker --version || (echo "Docker not available" && exit 1)
        docker info || (echo "Docker daemon not running" && exit 1)
    - name: Configure Docker for local registry (DEV)
      run: |
        echo "Configuring Docker client for insecure local registry..."
        LOCAL_REGISTRY="192.168.253.221:3000"
        export DOCKER_CONFIG=/tmp/docker-config-dev
        mkdir -p $DOCKER_CONFIG
        # Create Docker client config for insecure registry
        cat > $DOCKER_CONFIG/config.json << EOF
        {
          "auths": {},
          "HttpHeaders": {
            "User-Agent": "Docker-Client/20.10.0 (linux)"
          },
          "credsStore": "",
          "credHelpers": {},
          "experimental": "disabled"
        }
        EOF
        echo "Docker client config created for DEV"
        echo "Testing registry connectivity..."
        curl -s "http://$LOCAL_REGISTRY/v2/" && echo "✅ Registry accessible via HTTP" || echo "❌ Registry not accessible"
    - name: Build Docker image with caching (DEV)
      run: |
        echo "Building DEV Docker image with layer caching..."
        LOCAL_REGISTRY="192.168.253.221:3000"
        CACHE_IMAGE="$LOCAL_REGISTRY/sbcrumb/nfoguard:dev-buildcache"
        # Clear any existing Docker configs to prevent permission issues
        unset DOCKER_CONFIG
        export HOME=/tmp/docker-home-dev
        mkdir -p $HOME
        # Enable Docker BuildKit for better caching
        export DOCKER_BUILDKIT=1
        # Check if DEV cache image exists and pull it
        echo "Checking for existing DEV cache image..."
        CACHE_ARGS=""
        if curl -s "http://$LOCAL_REGISTRY/v2/sbcrumb/nfoguard/manifests/dev-buildcache" > /dev/null 2>&1; then
          echo "✅ DEV cache manifest found, pulling image..."
          if docker pull "$CACHE_IMAGE" 2>/dev/null; then
            echo "✅ DEV cache image pulled successfully"
            CACHE_ARGS="--cache-from=$CACHE_IMAGE"
          else
            echo "⚠️ DEV cache manifest exists but pull failed"
          fi
        else
          echo "ℹ️ No DEV cache image found (first build or cache expired)"
        fi
        # Build DEV image with cache (if available)
        echo "Building DEV image with layer caching..."
        VERSION=$(cat VERSION 2>/dev/null || echo "unknown")
        echo "Building version: $VERSION"
        docker build \
          $CACHE_ARGS \
          --build-arg GIT_BRANCH=dev \
          --build-arg BUILD_SOURCE=gitea \
          --tag nfoguard:dev \
          --tag nfoguard:${VERSION}-dev-gitea \
          --tag nfoguard:dev-${{ github.sha }} \
          --tag "$CACHE_IMAGE" \
          .
        echo "DEV Docker image built and tagged successfully"
    - name: Login and Push to Gitea registry (DEV tags)
      continue-on-error: true
      run: |
        echo "Using LOCAL IP ONLY for DEV push!"
        export DOCKER_CONFIG=/tmp/docker-config-dev
        LOCAL_REGISTRY="192.168.253.221:3000"
        echo "Registry: $LOCAL_REGISTRY (DEV TAGS)"
        # Try login to local registry
        if echo "${{ secrets.token }}" | docker --config $DOCKER_CONFIG login "$LOCAL_REGISTRY" -u "${{ secrets.username }}" --password-stdin 2>/dev/null; then
          echo "✅ DEV Login succeeded"
          # Tag for local registry
          VERSION=$(cat VERSION 2>/dev/null || echo "unknown")
          docker tag nfoguard:dev "$LOCAL_REGISTRY/sbcrumb/nfoguard:dev"
          docker tag nfoguard:${VERSION}-dev-gitea "$LOCAL_REGISTRY/sbcrumb/nfoguard:${VERSION}-dev-gitea"
          docker tag nfoguard:dev "$LOCAL_REGISTRY/sbcrumb/nfoguard:dev-${{ github.sha }}"
          # Push DEV images
          echo "=== Pushing DEV cache image ==="
          timeout 60 docker --config $DOCKER_CONFIG push "$LOCAL_REGISTRY/sbcrumb/nfoguard:dev-buildcache" && echo "✅ DEV cache pushed" || echo "⚠️ DEV cache push failed"
          echo "=== Pushing DEV latest tag ==="
          if timeout 120 docker --config $DOCKER_CONFIG push "$LOCAL_REGISTRY/sbcrumb/nfoguard:dev"; then
            echo "✅ DEV tag pushed successfully"
            echo "=== Pushing version-dev-gitea tag ==="
            if timeout 60 docker --config $DOCKER_CONFIG push "$LOCAL_REGISTRY/sbcrumb/nfoguard:${VERSION}-dev-gitea"; then
              echo "✅ Version-dev-gitea tag pushed successfully: ${VERSION}-dev-gitea"
            fi
            if timeout 60 docker --config $DOCKER_CONFIG push "$LOCAL_REGISTRY/sbcrumb/nfoguard:dev-${{ github.sha }}"; then
              echo "✅ DEV SHA tag pushed successfully"
            fi
          fi
        else
          echo "❌ DEV local registry login failed - continuing to Docker Hub"
        fi
        echo ""
        echo "🎉 DEV build completed successfully!"
        echo ""
        VERSION=$(cat VERSION 2>/dev/null || echo "unknown")
        echo "📦 Available DEV images:"
        echo "  Local only:     nfoguard:dev"
        echo "  Version tag:    nfoguard:${VERSION}-dev-gitea"
        echo "  Local SHA:      nfoguard:dev-${{ github.sha }}"
        echo ""
        echo "🐳 Pull with: docker pull 192.168.253.221:3000/sbcrumb/nfoguard:${VERSION}-dev-gitea"
@@ -1,222 +0,0 @@
 name: Local Docker Build (Main)
 on:
  push:
    branches: [ main ]
  pull_request:
    branches: [ main ]
 jobs:
  build:
    runs-on: host
    steps:
    - name: Checkout code
      run: |
        echo "Current workspace: $(pwd)"
        # Clean workspace and temp directory first
        rm -rf * .git* 2>/dev/null || true
        rm -rf /tmp/repo 2>/dev/null || true
        # Clone the repository since Gitea runner doesn't auto-checkout
        echo "Cloning repository..."
        git clone --branch main http://${{ secrets.username }}:${{ secrets.token }}@192.168.253.221:3000/sbcrumb/nfoguard.git /tmp/repo
        cp -r /tmp/repo/* .
        cp -r /tmp/repo/.* . 2>/dev/null || true
        rm -rf /tmp/repo
        echo "Repository cloned successfully"
        ls -la
        echo "Checking Dockerfile:"
        head -30 Dockerfile
    - name: Check Docker availability
      run: |
        echo "Checking Docker installation..."
        which docker || (echo "Docker not found in PATH" && exit 1)
        docker --version || (echo "Docker not available" && exit 1)
        docker info || (echo "Docker daemon not running" && exit 1)
    - name: Configure Docker for local registry
      run: |
        echo "Configuring Docker client for insecure local registry..."
        LOCAL_REGISTRY="192.168.253.221:3000"
        # We can't use sudo in the container, so we'll configure the client differently
        export DOCKER_CONFIG=/tmp/docker-config
        mkdir -p $DOCKER_CONFIG
        # Create Docker client config for insecure registry
        cat > $DOCKER_CONFIG/config.json << EOF
        {
          "auths": {},
          "HttpHeaders": {
            "User-Agent": "Docker-Client/20.10.0 (linux)"
          },
          "credsStore": "",
          "credHelpers": {},
          "experimental": "disabled"
        }
        EOF
        echo "Docker client config created"
        echo "Note: Since we can't modify daemon config in container, we'll use --insecure-registry flag"
        echo "Testing registry connectivity..."
        curl -s "http://$LOCAL_REGISTRY/v2/" && echo "✅ Registry accessible via HTTP" || echo "❌ Registry not accessible"
    - name: Build Docker image with caching
      run: |
        echo "Building Docker image with layer caching..."
        LOCAL_REGISTRY="192.168.253.221:3000"
        CACHE_IMAGE="$LOCAL_REGISTRY/sbcrumb/nfoguard:buildcache"
        # Clear any existing Docker configs to prevent permission issues
        unset DOCKER_CONFIG
        export HOME=/tmp/docker-home
        mkdir -p $HOME
        # Enable Docker BuildKit for better caching
        export DOCKER_BUILDKIT=1
        # Check if cache image exists and pull it
        echo "Checking for existing cache image..."
        CACHE_ARGS=""
        if curl -s "http://$LOCAL_REGISTRY/v2/sbcrumb/nfoguard/manifests/buildcache" > /dev/null 2>&1; then
          echo "✅ Cache manifest found, pulling image..."
          if docker pull "$CACHE_IMAGE" 2>/dev/null; then
            echo "✅ Cache image pulled successfully"
            CACHE_ARGS="--cache-from=$CACHE_IMAGE"
          else
            echo "⚠️ Cache manifest exists but pull failed"
          fi
        else
          echo "ℹ️ No cache image found (first build or cache expired)"
        fi
        # Build with cache (if available)
        echo "Building with layer caching..."
        VERSION=$(cat VERSION 2>/dev/null || echo "unknown")
        echo "Building version: $VERSION"
        docker build \
          $CACHE_ARGS \
          --build-arg GIT_BRANCH=main \
          --build-arg BUILD_SOURCE=gitea \
          --tag nfoguard:latest \
          --tag nfoguard:${VERSION}-gitea \
          --tag nfoguard:${{ github.sha }} \
          --tag "$CACHE_IMAGE" \
          .
        echo "Docker image built and tagged successfully"
        # Show layer info for debugging (with error handling)
        echo "=== Image layer history ==="
        if docker history nfoguard:latest --format "table {{.CreatedBy}}\t{{.Size}}" 2>/dev/null; then
          echo "✅ Image history displayed successfully"
        else
          echo "⚠️ Could not display image history (permissions issue, but build succeeded)"
        fi
    - name: Login and Push to Gitea registry (local IP only)
      continue-on-error: true  # Don't fail the build if local registry fails
      run: |
        echo "Using LOCAL IP ONLY - no Cloudflare tunnel!"
        export DOCKER_CONFIG=/tmp/docker-config
        # Force local IP - never use domain
        LOCAL_REGISTRY="192.168.253.221:3000"
        echo "Registry: $LOCAL_REGISTRY (LOCAL IP ONLY)"
        # Check image size
        IMAGE_SIZE=$(docker images nfoguard:latest --format "table {{.Size}}" | tail -n1)
        echo "Image size: $IMAGE_SIZE"
        echo "Testing local registry connectivity..."
        curl -s "http://$LOCAL_REGISTRY/v2/" && echo "✅ Local registry accessible via HTTP" || echo "❌ Local registry not accessible"
        # Try multiple approaches to handle the HTTP issue
        echo "Attempting login to LOCAL registry..."
        # Approach 1: Try with explicit HTTP in auth
        if echo "${{ secrets.token }}" | docker --config $DOCKER_CONFIG login "$LOCAL_REGISTRY" -u "${{ secrets.username }}" --password-stdin 2>/dev/null; then
          echo "✅ Login succeeded with direct method"
          # Tag for local registry (cache image already tagged in build step)
          VERSION=$(cat VERSION 2>/dev/null || echo "unknown")
          docker tag nfoguard:latest "$LOCAL_REGISTRY/sbcrumb/nfoguard:latest"
          docker tag nfoguard:${VERSION}-gitea "$LOCAL_REGISTRY/sbcrumb/nfoguard:${VERSION}-gitea"
          docker tag nfoguard:latest "$LOCAL_REGISTRY/sbcrumb/nfoguard:${{ github.sha }}"
          echo "Pushing to LOCAL registry (gigabit speed!)..."
          # Push with reasonable timeout for local network
          echo "=== Pushing cache image (for faster future builds) ==="
          timeout 60 docker --config $DOCKER_CONFIG push "$LOCAL_REGISTRY/sbcrumb/nfoguard:buildcache" && echo "✅ Cache image pushed" || echo "⚠️ Cache push failed"
          echo "=== Pushing latest tag to LOCAL IP ==="
          if timeout 120 docker --config $DOCKER_CONFIG push "$LOCAL_REGISTRY/sbcrumb/nfoguard:latest"; then
            echo "✅ Latest tag pushed successfully to LOCAL registry"
            echo "=== Pushing version-gitea tag ==="
            if timeout 60 docker --config $DOCKER_CONFIG push "$LOCAL_REGISTRY/sbcrumb/nfoguard:${VERSION}-gitea"; then
              echo "✅ Version-gitea tag pushed successfully: ${VERSION}-gitea"
            fi
            echo "=== Pushing SHA tag to LOCAL IP ==="
            if timeout 60 docker --config $DOCKER_CONFIG push "$LOCAL_REGISTRY/sbcrumb/nfoguard:${{ github.sha }}"; then
              echo "✅ SHA tag pushed successfully to LOCAL registry"
            else
              echo "⚠️ SHA tag push failed but latest succeeded"
            fi
          else
            echo "❌ Push to LOCAL registry failed"
            echo "This is likely because Docker daemon needs insecure-registry configuration"
          fi
        else
          echo "❌ Local registry login failed"
          echo "This is expected - Docker daemon needs insecure-registry configuration"
          echo ""
          echo "🔧 To fix, run on the host machine:"
          echo "sudo mkdir -p /etc/docker"
          echo 'echo '"'"'{"insecure-registries":["'$LOCAL_REGISTRY'"]}'"'"' | sudo tee /etc/docker/daemon.json'
          echo "sudo systemctl restart docker"
          echo ""
          echo "⏭️ Continuing to Docker Hub push..."
        fi
        echo "🎉 Local registry step completed!"
        echo ""
        echo "🎉 Local build completed successfully!"
        echo ""
        VERSION=$(cat VERSION 2>/dev/null || echo "unknown")
        echo "📦 Available images:"
        echo "  Local Docker:   nfoguard:latest"
        echo "  Version tag:    nfoguard:${VERSION}-gitea"
        echo "  Local SHA:      nfoguard:${{ github.sha }}"
        echo "  Local Gitea:    192.168.253.221:3000/sbcrumb/nfoguard:latest"
        echo ""
        echo "🐳 Pull with: docker pull 192.168.253.221:3000/sbcrumb/nfoguard:${VERSION}-gitea"
  deploy:
    needs: build
    runs-on: host
    if: github.ref == 'refs/heads/main'
    steps:
    - name: Deploy application
      run: |
        echo "Deploying application..."
        # Add your deployment commands here
        # Examples:
        # docker-compose pull
        # docker-compose up -d
        # or
        # docker stop nfoguard || true
        # docker run -d --name nfoguard -p 8080:8080 nfoguard:latest
        echo "Deployment completed"
Author	SHA1	Message	Date
sbcrumb	5a1633490e	Merge branch 'dev' into improvements Build & Push DEV to DockerHub / docker (pull_request) Failing after 20s Details	2025-09-27 13:02:11 -04:00
sbcrumb	fa1e4e2ec7	improvements (#15 ) Build & Push DEV to DockerHub / docker (push) Failing after 1m12s Details Reviewed-on: #15	2025-09-27 13:00:08 -04:00
sbcrumb	ce1a599fd9	stop tvshow.nfo and show.nfo Local Docker Build (Dev) / build-dev (push) Successful in 28s Details Local Docker Build (Main) / build (pull_request) Successful in 24s Details Local Docker Build (Main) / deploy (pull_request) Has been skipped Details	2025-09-26 17:07:12 -04:00
sbcrumb	3826895275	title search Local Docker Build (Dev) / build-dev (push) Successful in 28s Details	2025-09-26 16:59:12 -04:00
sbcrumb	d2ad048f61	tv update again Local Docker Build (Dev) / build-dev (push) Successful in 28s Details	2025-09-26 16:49:57 -04:00
sbcrumb	7027ae2745	update to nfoguard.py Local Docker Build (Dev) / build-dev (push) Successful in 24s Details	2025-09-26 16:42:35 -04:00
sbcrumb	3d7460ad76	verixon update Local Docker Build (Dev) / build-dev (push) Successful in 33s Details	2025-09-26 16:25:08 -04:00
sbcrumb	806370bd5f	airdate fallback Local Docker Build (Dev) / build-dev (push) Successful in 29s Details	2025-09-26 15:56:40 -04:00
sbcrumb	fc80c08041	tuple update Local Docker Build (Dev) / build-dev (push) Successful in 23s Details	2025-09-26 15:21:45 -04:00
sbcrumb	2c4dd274ff	retry for the AI Local Docker Build (Dev) / build-dev (push) Successful in 16s Details	2025-09-26 15:19:37 -04:00
sbcrumb	c19d0f6290	update Local Docker Build (Dev) / build-dev (push) Successful in 28s Details	2025-09-26 14:56:01 -04:00
sbcrumb	b9e3ae3a5e	debug: Add extensive logging for episode detection Local Docker Build (Dev) / build-dev (push) Successful in 29s Details Added detailed debug logging to diagnose why High Potential shows "0 episodes" despite having video files: - Log season directory detection and pattern matching - Log video file scanning and episode filename parsing - Log season number extraction and matching logic - Log final episode count and processing decisions This will help identify where the episode detection is failing in the pipeline. 🤖 Generated with [Claude Code](https://claude.ai/code) Co-Authored-By: Claude <noreply@anthropic.com>	2025-09-26 14:37:41 -04:00
sbcrumb	4d30ea840f	fix: Add Sonarr direct lookup fallback for reliable series detection Local Docker Build (Dev) / build-dev (push) Successful in 19s Details The /series/lookup endpoint sometimes fails to find series that exist in Sonarr. Added fallback to series_by_imdb_direct() method which scans all series directly. Changes: - Try Sonarr lookup endpoint first (fast) - Fall back to direct series scan if lookup fails (slower but more reliable) - Apply same logic to both episode dates and metadata methods - Version bump to 2.0.5-sonarr-direct-lookup This should find High Potential, Breaking Bad, and other series that exist in Sonarr but weren't found via the lookup endpoint. 🤖 Generated with [Claude Code](https://claude.ai/code) Co-Authored-By: Claude <noreply@anthropic.com>	2025-09-26 14:14:40 -04:00
sbcrumb	27677e49f8	fix: External API fallback flow and conditional NFO creation Local Docker Build (Dev) / build-dev (push) Successful in 23s Details Fixed two critical issues: 1. External API fallback was never reached because early returns when series/episodes not found in Sonarr 2. tvshow.nfo and season.nfo were always created even if they already existed Changes: - Restructured Sonarr lookup to fall through to external APIs when series/episodes not found - Made tvshow.nfo and season.nfo creation conditional (only if files don't exist) - Added debug logging for skipped NFO creation - Version bump to 2.0.4-fallback-fix Now series like High Potential should properly fall back to TMDB/OMDb for episode airdates. 🤖 Generated with [Claude Code](https://claude.ai/code) Co-Authored-By: Claude <noreply@anthropic.com>	2025-09-26 14:12:18 -04:00
sbcrumb	2e6d8a35e7	feat: Add external API fallback for TV episode airdates Local Docker Build (Dev) / build-dev (push) Successful in 19s Details When Sonarr lookup fails to find a series or episode data, the system now falls back to external APIs (TMDB, OMDb) to get episode air dates. This ensures episodes still get proper dateadded values even when not found in Sonarr. Changes: - Add ExternalClientManager integration to TVSeriesProcessor - Implement _get_episode_airdate_from_external_apis method - Support TMDB TV episode lookups with IMDb->TMDB ID conversion - Support OMDb episode season lookups with date parsing - Version bump to 2.0.3-external-fallback 🤖 Generated with [Claude Code](https://claude.ai/code) Co-Authored-By: Claude <noreply@anthropic.com>	2025-09-26 13:56:57 -04:00
sbcrumb	12767d7350	fix: Remove invalid webhook_secret parameter from SonarrClient Local Docker Build (Dev) / build-dev (push) Successful in 23s Details SonarrClient constructor only accepts base_url and api_key parameters. Version bump to 2.0.2-clean	2025-09-26 13:47:11 -04:00
sbcrumb	4411804725	fix: Sonarr client initialization error Local Docker Build (Dev) / build-dev (push) Successful in 24s Details Fix AttributeError for missing sonarr_url config attributes. Use environment variables directly like the original code. Version bump to 2.0.1-clean	2025-09-26 13:45:16 -04:00
sbcrumb	b431107abd	feat: Complete clean TV NFO processing implementation v2.0.0 Local Docker Build (Dev) / build-dev (push) Successful in 17s Details - New EpisodeNFOManager class with video filename matching - NFO files now match video filenames instead of S01E01.nfo format - Clean TVSeriesProcessor with proper Sonarr API integration - Proper date lookup: database -> Sonarr import history -> airdate fallback - Updated manual scan endpoint to use new clean processor - Removed all migration logic and nfo_migration_required sources This is a complete rewrite of TV episode processing with focus on: 1. NFO filenames matching video files 2. Proper dateadded field population from Sonarr 3. Clean separation of concerns 4. Robust fallback logic	2025-09-26 13:39:41 -04:00
sbcrumb	9b0da8b6ed	fix: Remove nfo_migration_required source and ensure proper date lookup Local Docker Build (Dev) / build-dev (push) Successful in 49s Details - Remove bogus 'nfo_migration_required' source that bypassed proper date lookup - Ensure episodes with existing NFOs still get processed through Sonarr API - Episodes should get proper dateadded from Sonarr import history or airdate fallback - Version bump to 1.9.3-longnames	2025-09-26 10:11:52 -04:00
sbcrumb	9bc8955ad4	fix: Preserve and convert NFO filenames to match video files Local Docker Build (Dev) / build-dev (push) Successful in 23s Details - Preserve existing long-named NFO files instead of migrating to short names - Convert existing short NFO names (S01E01.nfo) to match video filenames - Create new NFOs with long names based on matching video files - Only fallback to short names if no matching video file exists	2025-09-26 09:56:23 -04:00