Merge pull request #224 from Dictionarry-Hub/dev

fix(backend): perms env, mm import refactor, deserialize error

Author: santiagosayshey

.gitignore

@@ -20,6 +20,7 @@ backend/app/static/
 
 # Config data
 config/
+config-test/
 radarr-config/
 sonarr-config/
 test-data/

Dockerfile

@@ -1,17 +1,21 @@
 # Dockerfile
 FROM python:3.9-slim
 WORKDIR /app
-# Install git (since we're still using slim)
-RUN apt-get update && apt-get install -y git && rm -rf /var/lib/apt/lists/*
+# Install git and gosu for user switching
+RUN apt-get update && apt-get install -y git gosu && rm -rf /var/lib/apt/lists/*
 # Copy pre-built files from dist directory
 COPY dist/backend/app ./app
 COPY dist/static ./app/static
 COPY dist/requirements.txt .
 RUN pip install --no-cache-dir -r requirements.txt
+# Copy and setup entrypoint script
+COPY entrypoint.sh /entrypoint.sh
+RUN chmod +x /entrypoint.sh
 LABEL org.opencontainers.image.authors="Dictionarry dictionarry@pm.me"
 LABEL org.opencontainers.image.description="Profilarr - Profile manager for *arr apps"
 LABEL org.opencontainers.image.source="https://github.com/Dictionarry-Hub/profilarr"
 LABEL org.opencontainers.image.title="Profilarr"
 LABEL org.opencontainers.image.version="beta"
 EXPOSE 6868
+ENTRYPOINT ["/entrypoint.sh"]
 CMD ["gunicorn", "--bind", "0.0.0.0:6868", "--timeout", "600", "app.main:create_app()"]

backend/app/db/migrations/versions/004_update_language_score_default.py

@@ -0,0 +1,33 @@
+# backend/app/db/migrations/versions/004_update_language_score_default.py
+from ...connection import get_db
+
+version = 4
+name = "update_language_score_default"
+
+
+def up():
+    """Update default language import score to -999999."""
+    with get_db() as conn:
+        # Update existing record to new default value
+        conn.execute('''
+            UPDATE language_import_config 
+            SET score = -999999, 
+                updated_at = CURRENT_TIMESTAMP
+            WHERE id = 1
+        ''')
+        
+        conn.commit()
+
+
+def down():
+    """Revert language import score to previous default."""
+    with get_db() as conn:
+        # Revert to previous default value
+        conn.execute('''
+            UPDATE language_import_config 
+            SET score = -99999, 
+                updated_at = CURRENT_TIMESTAMP
+            WHERE id = 1
+        ''')
+        
+        conn.commit()

backend/app/importer/strategies/profile.py

@@ -38,8 +38,8 @@ def compile(self, filenames: List[str]) -> Dict[str, Any]:
                 # Load profile YAML
                 profile_yaml = load_yaml(f"profile/{filename}.yml")
 
-                # Extract referenced custom formats
-                format_names = extract_format_names(profile_yaml)
+                # Extract referenced custom formats (only for the target arr type)
+                format_names = extract_format_names(profile_yaml, self.arr_type)
 
                 for format_name in format_names:
                     # Skip if already processed

backend/app/importer/utils.py

@@ -46,12 +46,14 @@ def load_yaml(file_path: str) -> Dict[str, Any]:
         return yaml.safe_load(f)
 
 
-def extract_format_names(profile_data: Dict[str, Any]) -> Set[str]:
+def extract_format_names(profile_data: Dict[str, Any], arr_type: str = None) -> Set[str]:
     """
     Extract all custom format names referenced in a profile.
     
     Args:
         profile_data: Profile YAML data
+        arr_type: Target arr type ('radarr' or 'sonarr'). If provided, only extracts
+                  formats for that specific arr type.
         
     Returns:
         Set of unique format names
@@ -64,10 +66,18 @@ def extract_format_names(profile_data: Dict[str, Any]) -> Set[str]:
             format_names.add(cf['name'])
 
     # Extract from app-specific custom_formats
-    for key in ['custom_formats_radarr', 'custom_formats_sonarr']:
-        for cf in profile_data.get(key, []):
+    if arr_type:
+        # Only extract formats for the specific arr type
+        app_key = f'custom_formats_{arr_type.lower()}'
+        for cf in profile_data.get(app_key, []):
             if isinstance(cf, dict) and 'name' in cf:
                 format_names.add(cf['name'])
+    else:
+        # Extract from all app-specific sections (backwards compatibility)
+        for key in ['custom_formats_radarr', 'custom_formats_sonarr']:
+            for cf in profile_data.get(key, []):
+                if isinstance(cf, dict) and 'name' in cf:
+                    format_names.add(cf['name'])
 
     return format_names
 

backend/app/init.py

@@ -124,11 +124,14 @@ def setup_logging():
 
 
 def init_git_user():
-    """Initialize Git user configuration globally and update PAT status."""
+    """Initialize Git user configuration for the repository and update PAT status."""
     logger = logging.getLogger(__name__)
     logger.info("Starting Git user configuration")
 
     try:
+        from .config import config
+        repo_path = config.DB_DIR
+        
         git_name = os.environ.get('GIT_USER_NAME', 'Profilarr')
         git_email = os.environ.get('GIT_USER_EMAIL',
                                    'profilarr@dictionarry.com')
@@ -139,30 +142,38 @@ def init_git_user():
         if git_name == 'Profilarr' or git_email == 'profilarr@dictionarry.com':
             logger.info("Using default Git user configuration")
 
-        # Set global Git configuration
-        subprocess.run(['git', 'config', '--global', 'user.name', git_name],
-                       check=True)
-        subprocess.run(['git', 'config', '--global', 'user.email', git_email],
-                       check=True)
+        # Set repository-level Git configuration if repo exists
+        if os.path.exists(os.path.join(repo_path, '.git')):
+            logger.info(f"Setting git config for repository at {repo_path}")
+            subprocess.run(['git', '-C', repo_path, 'config', '--local', 'user.name', git_name],
+                           check=True)
+            subprocess.run(['git', '-C', repo_path, 'config', '--local', 'user.email', git_email],
+                           check=True)
+            # Add safe.directory to prevent ownership issues
+            subprocess.run(['git', '-C', repo_path, 'config', '--local', '--add', 'safe.directory', repo_path],
+                           check=True)
+        else:
+            logger.warning(f"No git repository found at {repo_path}, skipping git config")
 
         # Update PAT status in database
         update_pat_status()
 
-        # Verify configuration
-        configured_name = subprocess.run(
-            ['git', 'config', '--global', 'user.name'],
-            capture_output=True,
-            text=True,
-            check=True).stdout.strip()
-        configured_email = subprocess.run(
-            ['git', 'config', '--global', 'user.email'],
-            capture_output=True,
-            text=True,
-            check=True).stdout.strip()
-
-        if configured_name != git_name or configured_email != git_email:
-            logger.error("Git configuration verification failed")
-            return False, "Git configuration verification failed"
+        # Verify configuration if repository exists
+        if os.path.exists(os.path.join(repo_path, '.git')):
+            configured_name = subprocess.run(
+                ['git', '-C', repo_path, 'config', '--local', 'user.name'],
+                capture_output=True,
+                text=True,
+                check=True).stdout.strip()
+            configured_email = subprocess.run(
+                ['git', '-C', repo_path, 'config', '--local', 'user.email'],
+                capture_output=True,
+                text=True,
+                check=True).stdout.strip()
+
+            if configured_name != git_name or configured_email != git_email:
+                logger.error("Git configuration verification failed")
+                return False, "Git configuration verification failed"
 
         logger.info("Git user configuration completed successfully")
         return True, "Git configuration successful"

backend/app/media_management/__init__.py

@@ -101,13 +101,12 @@ def sync_media_management():
             try:
                 # Get the current media management data for this category
                 category_data = get_media_management_data(category)
-                logger.info(f"Raw category_data for {category}: {category_data}")
-                arr_type_data = category_data.get(arr_type, {})
-                logger.info(f"Extracted arr_type_data for {arr_type}: {arr_type_data}")
 
                 if category == 'naming':
+                    arr_type_data = category_data.get(arr_type, {})
                     success, message = sync_naming_config(base_url, api_key, arr_type, arr_type_data)
                 elif category == 'misc':
+                    arr_type_data = category_data.get(arr_type, {})
                     success, message = sync_media_management_config(base_url, api_key, arr_type, arr_type_data)
                 elif category == 'quality_definitions':
                     # Quality definitions has a nested structure: qualityDefinitions -> arr_type -> qualities