mirror of
https://github.com/Dictionarry-Hub/profilarr.git
synced 2026-01-23 03:11:01 +01:00
* feat: initialise task scheduler * feat: add "next run" field to task status * fix: adjust status route path * feat: task dashboard + api functions * fix: return sucess object for alert * refactor: turn task cards into seperate objects * fix: change task names * feat: implement compile and import module - only working for custom formats for now * refactor/feature: refactor compilation module - seperate file for mappings - seperate format compiler into new file - add compiler for profiles * feat: add import logic for quality profiles * fix: properly resolve cutoff IDs for singular qualities * fix: remux mappings for sonarr * fix: retain quality group order - stop groups first, then singular * fix: dynamically find next group ID to stop duplicate IDs from occuring * fix: normalise quality letter case * feat: add api functions for import functionality * fix: adjust validation for import.js * feat: add mass selection tool componnet - keyboard shortcuts to enter state - mass delete / import * feat: add loading indicator on import * style: improve selected card styling * fix: append extra custom formats with 0 score * perf: add git status caching to improve load times * fix: adjust mass import handling and selection logic - use content.name rather than content.id * fix: enhance quality name mapping with alternate names and case-insensitive lookups * feat: add description truncation to ProfileCard for improved readability - also remove qualitites * fix: update upgrade quality selection logic to handle disabling scenarios * feat: expand language mappings with additional languages and identifiers * feat: enhance profile conversion logging with language handling * fix: clarify language setting impact in ProfileLanguagesTab component * feat: add Sonarr language mappings and update language selection logic * feat: implement language normalization and enhance logging in format conversion * feat: enhance logging in format conversion and add language specification handling * feat: add Afrikaans and Albanian languages to the language constants * refactor: remove language strictness feature and update language handling in ProfileModal * feat: add logging setup for improved debugging in mappings module * feat: enhance language compilation to work with new system * feat: update language handling in ProfileLanguagesTab to support 'any' behavior * fix: remove redundant import statement in profile.py * feat: implement in-memory format import functionality and update profile compiler to utilize it for non english language compilation * feat: add comparison for tweaks in quality profile changes * feat: add functions to convert display names to filenames and vice versa * fix: remove unnecessary filename modification in formats data * feat: add process_tweaks function to handle profile tweaks and import formats before compilation * feat: refactor process_tweaks to modularize format import and scoring - include lossless audio tweak handling * feat: add support for Dolby Vision no fallback and bleeding edge codecs in process_tweaks * feat: add support for disabling prereleases based on profile tweaks * fix: reduce cache TTL from 30 seconds to 1 second for quicker updates * feat: add resetState function to initialize profile modal state * feat: enhance save_yaml_file function to optionally use data name for filename * feat: enhance handle_rename function to account for staged renames * feat: enhance revert functionality to handle untracked files and staged deletions * chore: update timezone setting in docker-compose.yml * feat: increase maximum description length in ProfileCard component * refactor: generic YAML comparison and change summary functionality * refactor: incoming changes now uses generic comparison logic * refactor: add YAML conflict comparison functionality with detailed summary generation for merge conflicts * refactor: heavily simplified resolve conflict modal to work with new generic conflict parsing * refactor: implement GitStatusManager for improved repository status handling and sync task updates * refactor: integrate GitStatusManager to update remote status after pull operations * refactor: remove isDevMode prop from ChangeRow, ConflictRow, ConflictTable, ChangeTable, RepoContainer, and ActionButtons components * refactor: migrate settings handling from settings_utils to db module and enhance settings management * refactor: remove deprecated authentication methods and streamline push operations with SSH access * refactor: enhance error handling and authentication for Git operations, including PAT support * refactor: remove old settings_utils * refactor: add settings prop to StatusContainer and update database initialization for profilarr_pat * refactor: simplify format name handling in ViewChanges component by removing old API call * fix: update fetchSettings to handle cases with no git repository and ensure settings is null * fix: enhance get_git_status to return a valid status object when no git repository is found * style: various improvements to repo container - add database stats - add organisation / profile avatar - parse organisation / repo name - improvements to branch button * feat: implement authentication setup and middleware for secure session management * fix: auto login after setting up authentication * feat: enhance authentication setup with GET method and track failed attempts * feat: add authentication setup and login components with API integration * feat: redesign SetupPage component with improved layout and user guidance * feat: enhance LoginPage layout with improved design and user guidance * refactor: remove unused API functions for regex and format management * improvements: whole lot more stuff (#17) * feat: implement configuration management for directory paths and session settings * feat: implement backup management with API endpoints for backup operations * feat: add backup import functionality with zip file validation and restoration * feat: implement backup API with endpoints for listing, creating, downloading, restoring, deleting, and importing backups * feat: enhance backup listing with file size and last modified time * feat: add backup management interface with listing, creation, restoration, and deletion functionalities * fix: refresh backups list after successful deletion * feat: create BackupCard component for displaying backup details and actions * fix: status parsing improvements - now properly shows outgoing changes with / without developer mode * fix: remove authentication bypass for backup routes during testing * feat: add logging configuration and ensure log directory creation * feat: implement application-wide logging configuration and ensure log directory creation * feat: add logging blueprint with endpoints for retrieving and searching log files * feat: add git logging configuration to enhance logging capabilities * refactor: enhance logging details and improve error handling in repository cloning and file processing * refactor: update tab labels for clarity in settings page * refactor: remove unused tasks and streamline task scheduler * refactor: improve repository settings handling and UI updates in RepoContainer * style: add slight gradient to modal * feat: enhance footer with GitHub repository info and organization avatar * refactor: update imports and enhance modal layout for linking Git repository * refactor: remove documentation and issue links from footer component * refactor: git settings refactor. - new git container to contain repo / status - split repo container into active / empty components - split status into seperate sections for incoming, outgoing, conflict * chore: simplify environment configuration by using .env file in docker-compose * fix: update remote status after commit and push operations * refactor: restructure application initialization and configure Git user settings on startup * refactor: improve default Git user configuration handling in initialization * style: enhance UI styling and structure for Git status display * style: enhance UI layout and styling for ChangeRow and ChangeTable components * style: enhance UI layout and styling for CommitMessage component * style: improve selected row styling * style: enhance UI styling for ConflictRow and ConflictTable components * style: update merge process to include remote status update after finalization * style: update noChangesMessages for improved clarity and engagement * feat: add animated Logo component and integrate it into Navbar * feat: enhance selection handling - add shift selection - add will be selected state and styling * feat: enhance mouse tracking for shift selection * refactor: remove deprecated ActionButtons * style: unify button colors and update tooltips in IncomingChanges and OutgoingChanges components * feat: add auto-pull feature with toggle in settings and backend support * fix: update auto-pull implementation to use integer values * feat: implement auto-pull functionality in remote status update * file: improve value formatting for new files * fix: change logger level to DEBUG and add debug message for profile import attempts * refactor: remove logging statements and streamline exception handling in format compiler * feat: enhance format import process with detailed logging and error handling * feat: enhance profile import process with detailed logging and error handling * refactor: remove non error logging statements for profile compilation * feat: enhance logging for memory-based format import with detailed success and error messages * feat: add logging for language settings and compiled profile data in profile import * feat: add dedicated logging for importarr with separate log file and configuration * feat: add logging API with functions to fetch logs, search, and filter by level * feat: add logs tab to settings page with LogContainer component * feat: add LogContainer and LogViewer components for enhanced log management * fix: dynamic vertical height for log viewer * fix: reduce log file size and increase backup count for improved log management * fix: enhance error logging with exception type and full traceback for better debugging * fix: use mapped cutoff name for profile conversion to ensure correct quality mapping * fix: add validation for git repository existence before syncing * fix: implement delete constraints check before item deletion to prevent breaking references * fix: enhance delete constraints check with improved logging and name normalization * fix: add protection against deletion of required custom formats in delete constraints check * feat: implement ANSI color parsing in LogViewer for improved log readability * feat: enhance ViewChanges component with improved key parsing and rendering of changes * refactor: improve styling and structure of ResolveConflicts component for better readability and usability * fix: improve error handling and response for arr config saving * feat: extend arr configuration with additional fields and sync methods * feat: add DataSelectorModal component for selecting data to sync * feat: enhance ArrModal and DataSelectorModal with improved layout and data display * feat: update ArrContainer to use new API import and include additional arrConfig fields * feat: enhance ArrCard component with sync details and improved layout * feat: add AddButton component with custom positioning and animations * feat: replace Add New Card section with AddButton component for improved UX * feat: reposition AddButton in ArrContainer for better visibility * feat: replace AddNewCard with AddButton in RegexPage for improved UX * feat: replace AddNewCard with AddButton in FormatPage for improved UX * feat: replace AddNewCard with AddButton in ProfilePage for improved UX
220 lines
8.1 KiB
Python
220 lines
8.1 KiB
Python
import logging
|
|
import os
|
|
from typing import Any, Dict, List, Optional
|
|
|
|
logger = logging.getLogger(__name__)
|
|
|
|
|
|
def compare_yaml(old_data: Any,
|
|
new_data: Any,
|
|
path: str = "") -> List[Dict[str, Any]]:
|
|
"""
|
|
Recursively compare two YAML structures and generate a list of changes.
|
|
Handles nested structures including:
|
|
- Simple values (strings, numbers, booleans)
|
|
- Lists of primitives (like tags: ['1080p', 'x264'])
|
|
- Lists of objects (like custom_formats: [{name: 'DON', score: 80}])
|
|
- Nested objects (like qualities: {id: 1, name: 'HD', qualities: [...]})
|
|
|
|
Args:
|
|
old_data: Original data structure
|
|
new_data: New data structure to compare against
|
|
path: Current path in the data structure (for tracking nested changes)
|
|
|
|
Returns:
|
|
List of changes, where each change is a dict containing:
|
|
{
|
|
key: Path to the changed field (e.g. "custom_formats[DON].score")
|
|
change: 'added' | 'removed' | 'modified'
|
|
from: Original value (for modified/removed)
|
|
to: New value (for modified/added)
|
|
value: List of values (for array additions/removals)
|
|
}
|
|
"""
|
|
logger.debug(f"Comparing path: {path or 'root'}")
|
|
changes = []
|
|
|
|
if old_data is None and new_data is None:
|
|
return changes
|
|
|
|
if old_data is None and new_data is not None:
|
|
if isinstance(new_data, dict):
|
|
old_data = {}
|
|
elif isinstance(new_data, list):
|
|
old_data = []
|
|
else:
|
|
old_data = None
|
|
|
|
if old_data is not None and new_data is None:
|
|
logger.debug(f"Path {path} removed")
|
|
return [{"key": path, "change": "removed", "from": old_data}]
|
|
|
|
if type(old_data) != type(new_data):
|
|
logger.debug(
|
|
f"Type mismatch at {path}: {type(old_data)} → {type(new_data)}")
|
|
return [{
|
|
"key": path,
|
|
"change": "modified",
|
|
"from": old_data,
|
|
"to": new_data
|
|
}]
|
|
|
|
if isinstance(old_data, list):
|
|
has_objects = any(
|
|
isinstance(x, dict) for x in old_data + new_data if x is not None)
|
|
if has_objects:
|
|
try:
|
|
old_dict = {x.get("name"): x for x in old_data if x}
|
|
new_dict = {x.get("name"): x for x in new_data if x}
|
|
added = set(new_dict) - set(old_dict)
|
|
removed = set(old_dict) - set(new_dict)
|
|
common = set(old_dict) & set(new_dict)
|
|
|
|
if added:
|
|
logger.debug(f"Added items at {path}: {added}")
|
|
if removed:
|
|
logger.debug(f"Removed items at {path}: {removed}")
|
|
|
|
for key in added:
|
|
changes.append({
|
|
"key": f"{path}[{key}]",
|
|
"change": "added",
|
|
"to": new_dict[key]
|
|
})
|
|
for key in removed:
|
|
changes.append({
|
|
"key": f"{path}[{key}]",
|
|
"change": "removed",
|
|
"from": old_dict[key]
|
|
})
|
|
for key in common:
|
|
if old_dict[key] != new_dict[key]:
|
|
logger.debug(
|
|
f"Found changes in common item {key} at {path}")
|
|
changes.extend(
|
|
compare_yaml(old_dict[key], new_dict[key],
|
|
f"{path}[{key}]"))
|
|
except Exception as e:
|
|
logger.warning(
|
|
f"Failed to compare by name at {path}, falling back to index comparison: {str(e)}"
|
|
)
|
|
for i, (old_item,
|
|
new_item) in enumerate(zip(old_data, new_data)):
|
|
if old_item != new_item:
|
|
changes.extend(
|
|
compare_yaml(old_item, new_item, f"{path}[{i}]"))
|
|
else:
|
|
old_set = set(old_data)
|
|
new_set = set(new_data)
|
|
if added := new_set - old_set:
|
|
logger.debug(f"Added values at {path}: {added}")
|
|
changes.append({
|
|
"key": path,
|
|
"change": "added",
|
|
"value": sorted(list(added))
|
|
})
|
|
if removed := old_set - new_set:
|
|
logger.debug(f"Removed values at {path}: {removed}")
|
|
changes.append({
|
|
"key": path,
|
|
"change": "removed",
|
|
"value": sorted(list(removed))
|
|
})
|
|
|
|
elif isinstance(old_data, dict):
|
|
all_keys = set(old_data) | set(new_data)
|
|
for key in all_keys:
|
|
new_path = f"{path}.{key}" if path else key
|
|
if key not in old_data:
|
|
logger.debug(f"Added key at {new_path}")
|
|
changes.append({
|
|
"key": new_path,
|
|
"change": "added",
|
|
"to": new_data[key]
|
|
})
|
|
elif key not in new_data:
|
|
logger.debug(f"Removed key at {new_path}")
|
|
changes.append({
|
|
"key": new_path,
|
|
"change": "removed",
|
|
"from": old_data[key]
|
|
})
|
|
else:
|
|
changes.extend(
|
|
compare_yaml(old_data[key], new_data[key], new_path))
|
|
else:
|
|
if old_data != new_data:
|
|
logger.debug(f"Modified value at {path}: {old_data} → {new_data}")
|
|
changes.append({
|
|
"key": path,
|
|
"change": "modified",
|
|
"from": old_data,
|
|
"to": new_data
|
|
})
|
|
|
|
for c in changes:
|
|
if c["change"] == "added" and "from" not in c:
|
|
c["from"] = "~"
|
|
return changes
|
|
|
|
|
|
def create_change_summary(old_data: Optional[Dict], new_data: Optional[Dict],
|
|
file_path: str) -> Dict[str, Any]:
|
|
"""
|
|
Create a summary of changes between two YAML structures with file metadata.
|
|
This wrapper adds git-specific fields like name, status, and file path.
|
|
Args:
|
|
old_data: Original YAML data (from git HEAD)
|
|
new_data: New YAML data (from working directory)
|
|
file_path: Path to the file being compared
|
|
|
|
Returns:
|
|
Dict containing:
|
|
- name: Current name (from new_data or filename)
|
|
- prior_name: Previous name (from old_data)
|
|
- outgoing_name: New name if changed, else None
|
|
- status: 'New' | 'Modified' | 'Deleted'
|
|
- file_path: Path to the file
|
|
- modified: True if file was modified/added
|
|
- deleted: True if file was deleted
|
|
- changes: Detailed changes from compare_yaml
|
|
"""
|
|
try:
|
|
filename = os.path.basename(file_path)
|
|
new_name = new_data.get("name") if new_data else None
|
|
old_name = old_data.get("name") if old_data else None
|
|
current_name = new_name or filename
|
|
|
|
if old_data is None and new_data is not None:
|
|
status = "New"
|
|
logger.info(f"New file detected: {file_path}")
|
|
elif old_data is not None and new_data is None:
|
|
status = "Deleted"
|
|
logger.info(f"Deleted file detected: {file_path}")
|
|
else:
|
|
status = "Modified"
|
|
logger.info(f"Modified file detected: {file_path}")
|
|
|
|
detailed_changes = compare_yaml(old_data, new_data)
|
|
|
|
if detailed_changes:
|
|
logger.info(
|
|
f"Found {len(detailed_changes)} changes in {file_path}")
|
|
logger.debug(f"Detailed changes: {detailed_changes}")
|
|
|
|
return {
|
|
"name": current_name,
|
|
"prior_name": old_name,
|
|
"outgoing_name": new_name if new_name != old_name else None,
|
|
"status": status,
|
|
"file_path": file_path,
|
|
"modified": status != "Deleted",
|
|
"deleted": status == "Deleted",
|
|
"changes": detailed_changes
|
|
}
|
|
except Exception as e:
|
|
logger.error(
|
|
f"Error creating change summary for {file_path}: {str(e)}",
|
|
exc_info=True)
|
|
raise
|