Merge pull request #24 from JohanDevl/develop

Code Restructuring and Modularization

Author: JohanDevl

.github/workflows/docker-test.yml

@@ -40,8 +40,11 @@ jobs:
           # Check if the required scripts exist and are executable
           docker run --rm trakt-export:test ls -la /app/Export_Trakt_4_Letterboxd.sh /app/setup_trakt.sh /app/docker-entrypoint.sh
 
+          # Check if lib directory exists and scripts are executable
+          docker run --rm trakt-export:test bash -c "find /app/lib -name '*.sh' -type f -executable || echo 'No executable scripts found in lib directory'"
+
           # Check if the required directories exist
-          docker run --rm trakt-export:test ls -la /app/config /app/logs /app/copy /app/brain_ops /app/backup /app/TEMP
+          docker run --rm trakt-export:test ls -la /app/config /app/logs /app/copy /app/backup /app/TEMP
 
           # Check if the entrypoint script works correctly
           docker run --rm trakt-export:test bash -c "test -x /app/docker-entrypoint.sh && echo '✅ Entrypoint script is executable'"
@@ -94,66 +97,6 @@ jobs:
 
           echo "✅ Docker Compose test completed successfully"
 
-      - name: Test Docker image with mock data
-        run: |
-          echo "🔍 Testing Docker image with mock data..."
-
-          # Create a test container with mounted volumes
-          mkdir -p ./test-data/config ./test-data/logs ./test-data/copy ./test-data/brain_ops ./test-data/backup
-
-          # Create a mock configuration file
-          cat > ./test-data/config/.config.cfg << 'EOF'
-          API_KEY="test_key"
-          API_SECRET="test_secret"
-          API_URL="https://api.trakt.tv"
-          ACCESS_TOKEN="test_token"
-          REFRESH_TOKEN="test_refresh"
-          REDIRECT_URI="urn:ietf:wg:oauth:2.0:oob"
-          USERNAME="test_user"
-          BACKUP_DIR="./backup/test_backup"
-          DOSLOG="./logs"
-          DOSCOPY="./copy"
-          BRAIN_OPS="./brain_ops"
-          DATE="20250101_0000"
-          LOG="${DOSLOG}/test-Export_Trakt.txt"
-          RED='\033[0;31m'
-          GREEN='\033[0;32m'
-          NC='\033[0m'
-          BOLD='\033[1m'
-          SAISPAS='\e[1;33;41m'
-          EOF
-
-          # Create example config file in the test directory
-          cp ./test-data/config/.config.cfg ./test-data/config/.config.cfg.example
-
-          # Start the container with the mock data and keep it running with sleep
-          docker run -d --name test-container-mock \
-            -v $(pwd)/test-data/config:/app/config \
-            -v $(pwd)/test-data/logs:/app/logs \
-            -v $(pwd)/test-data/copy:/app/copy \
-            -v $(pwd)/test-data/brain_ops:/app/brain_ops \
-            -v $(pwd)/test-data/backup:/app/backup \
-            trakt-export:test sleep 60
-
-          # Wait a moment to ensure the container is running
-          sleep 5
-
-          # Check if the container is running
-          docker ps | grep test-container-mock
-
-          # Check if the container can access the mounted volumes
-          docker exec test-container-mock bash -c "ls -la /app/config /app/logs /app/copy /app/brain_ops /app/backup"
-
-          # Check if the configuration file is accessible
-          docker exec test-container-mock bash -c "cat /app/config/.config.cfg | grep API_KEY"
-
-          # Clean up
-          docker stop test-container-mock
-          docker rm test-container-mock
-          rm -rf ./test-data
-
-          echo "✅ Docker image test with mock data completed successfully"
-
       - name: Summary
         run: |
           echo "🎉 All Docker image tests passed successfully!"

.gitignore

@@ -37,6 +37,16 @@ creds.js
 # Cursor
 .cursor/
 
+# Temporary directory
+/TEMP
+/TEMP/
+TEMP/
+
+# Backup directory
+/backup
+/backup/
+backup/
+
 # Byte-compiled / optimized / DLL files
 __pycache__/
 *.py[cod]
@@ -53,7 +63,6 @@ dist/
 downloads/
 eggs/
 .eggs/
-lib/
 lib64/
 parts/
 sdist/
@@ -177,3 +186,4 @@ dmypy.json
 cython_debug/
 *.tar.gz
 /logs
+

Dockerfile

@@ -15,24 +15,27 @@ WORKDIR /app
 COPY . /app/
 
 # Create necessary directories
-RUN mkdir -p /app/backup /app/logs /app/copy /app/brain_ops /app/TEMP /app/config
+RUN mkdir -p /app/backup /app/logs /app/copy /app/TEMP /app/config
 
 # Make scripts executable
 RUN chmod +x /app/Export_Trakt_4_Letterboxd.sh /app/setup_trakt.sh /app/docker-entrypoint.sh
+RUN find /app/lib -name "*.sh" -exec chmod +x {} \;
+RUN [ -f /app/install.sh ] && chmod +x /app/install.sh || echo "install.sh not found"
 
 # Set proper permissions for volume directories
-RUN chmod -R 777 /app/backup /app/logs /app/copy /app/brain_ops /app/config
+RUN chmod -R 777 /app/backup /app/logs /app/copy /app/config
+RUN chmod -R 755 /app/lib
 
 # Set environment variables
 ENV DOSLOG=/app/logs \
     DOSCOPY=/app/copy \
-    BRAIN_OPS=/app/brain_ops \
     BACKUP_DIR=/app/backup \
+    CONFIG_DIR=/app/config \
     CRON_SCHEDULE="" \
     EXPORT_OPTION="normal"
 
 # Set volume for persistent data
-VOLUME ["/app/logs", "/app/copy", "/app/brain_ops", "/app/backup", "/app/config"]
+VOLUME ["/app/logs", "/app/copy", "/app/backup", "/app/config"]
 
 # Set entrypoint
 ENTRYPOINT ["/app/docker-entrypoint.sh"]