mirror of
https://github.com/Dictionarry-Hub/profilarr.git
synced 2026-01-23 11:11:11 +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
228 lines
7.0 KiB
Python
228 lines
7.0 KiB
Python
import os
|
|
import yaml
|
|
import logging
|
|
from typing import Any, Dict, List, Optional, Union
|
|
|
|
logger = logging.getLogger(__name__)
|
|
|
|
# Define conflict states
|
|
UNRESOLVED = "UNRESOLVED"
|
|
RESOLVED = "RESOLVED"
|
|
MODIFY_DELETE = "MODIFY_DELETE"
|
|
|
|
|
|
def compare_conflict_yaml(ours_data: Any,
|
|
theirs_data: Any,
|
|
path: str = "") -> List[Dict[str, Any]]:
|
|
"""
|
|
Compare two YAML structures and generate conflict information.
|
|
Handles nested structures and produces conflict records in the format:
|
|
{
|
|
'parameter': 'Field Name',
|
|
'local_value': value_from_ours,
|
|
'incoming_value': value_from_theirs
|
|
}
|
|
"""
|
|
conflicts = []
|
|
|
|
# Handle None/deletion cases
|
|
if ours_data is None and theirs_data is None:
|
|
return conflicts
|
|
if ours_data is None:
|
|
return [{
|
|
'parameter': path or 'File',
|
|
'local_value': 'deleted',
|
|
'incoming_value': theirs_data
|
|
}]
|
|
if theirs_data is None:
|
|
return [{
|
|
'parameter': path or 'File',
|
|
'local_value': ours_data,
|
|
'incoming_value': 'deleted'
|
|
}]
|
|
|
|
# Handle different types as conflicts
|
|
if type(ours_data) != type(theirs_data):
|
|
return [{
|
|
'parameter': path,
|
|
'local_value': ours_data,
|
|
'incoming_value': theirs_data
|
|
}]
|
|
|
|
# Handle lists
|
|
if isinstance(ours_data, list):
|
|
# Check if list contains objects
|
|
has_objects = any(
|
|
isinstance(x, dict) for x in ours_data + theirs_data
|
|
if x is not None)
|
|
|
|
if has_objects:
|
|
return compare_object_arrays(ours_data, theirs_data, path)
|
|
else:
|
|
return compare_primitive_arrays(ours_data, theirs_data, path)
|
|
|
|
# Handle dictionaries
|
|
elif isinstance(ours_data, dict):
|
|
return compare_dicts(ours_data, theirs_data, path)
|
|
|
|
# Handle primitive values
|
|
elif ours_data != theirs_data:
|
|
return [{
|
|
'parameter': path,
|
|
'local_value': ours_data,
|
|
'incoming_value': theirs_data
|
|
}]
|
|
|
|
return conflicts
|
|
|
|
|
|
def compare_object_arrays(ours_data: List[Dict], theirs_data: List[Dict],
|
|
path: str) -> List[Dict]:
|
|
"""Compare arrays of objects using name field as identifier"""
|
|
conflicts = []
|
|
|
|
try:
|
|
# Build lookup dictionaries
|
|
ours_dict = {x.get('name'): x for x in ours_data if x}
|
|
theirs_dict = {x.get('name'): x for x in theirs_data if x}
|
|
|
|
# Find additions/removals
|
|
ours_keys = set(ours_dict.keys())
|
|
theirs_keys = set(theirs_dict.keys())
|
|
|
|
# Handle added items
|
|
for key in (theirs_keys - ours_keys):
|
|
conflicts.append({
|
|
'parameter': f"{path}[{key}]" if path else key,
|
|
'local_value': None,
|
|
'incoming_value': theirs_dict[key]
|
|
})
|
|
|
|
# Handle removed items
|
|
for key in (ours_keys - theirs_keys):
|
|
conflicts.append({
|
|
'parameter': f"{path}[{key}]" if path else key,
|
|
'local_value': ours_dict[key],
|
|
'incoming_value': None
|
|
})
|
|
|
|
# Compare common items
|
|
for key in (ours_keys & theirs_keys):
|
|
if ours_dict[key] != theirs_dict[key]:
|
|
new_path = f"{path}[{key}]" if path else key
|
|
conflicts.extend(
|
|
compare_conflict_yaml(ours_dict[key], theirs_dict[key],
|
|
new_path))
|
|
|
|
except Exception as e:
|
|
logger.warning(
|
|
f"Failed to compare objects by name at {path}, using positional comparison: {str(e)}"
|
|
)
|
|
# Fallback to positional comparison
|
|
for i, (ours_item,
|
|
theirs_item) in enumerate(zip(ours_data, theirs_data)):
|
|
if ours_item != theirs_item:
|
|
new_path = f"{path}[{i}]" if path else str(i)
|
|
conflicts.extend(
|
|
compare_conflict_yaml(ours_item, theirs_item, new_path))
|
|
|
|
return conflicts
|
|
|
|
|
|
def compare_primitive_arrays(ours_data: List, theirs_data: List,
|
|
path: str) -> List[Dict]:
|
|
"""Compare arrays of primitive values"""
|
|
conflicts = []
|
|
|
|
ours_set = set(ours_data)
|
|
theirs_set = set(theirs_data)
|
|
|
|
# Handle additions
|
|
added = theirs_set - ours_set
|
|
if added:
|
|
conflicts.append({
|
|
'parameter': path or 'Array',
|
|
'local_value': sorted(list(ours_set)),
|
|
'incoming_value': sorted(list(theirs_set))
|
|
})
|
|
|
|
return conflicts
|
|
|
|
|
|
def compare_dicts(ours_data: Dict, theirs_data: Dict, path: str) -> List[Dict]:
|
|
"""Compare dictionaries recursively"""
|
|
conflicts = []
|
|
|
|
# Get all keys from both dictionaries
|
|
all_keys = set(ours_data.keys()) | set(theirs_data.keys())
|
|
|
|
for key in all_keys:
|
|
new_path = f"{path}.{key}" if path else key
|
|
|
|
if key not in ours_data:
|
|
conflicts.append({
|
|
'parameter': new_path,
|
|
'local_value': None,
|
|
'incoming_value': theirs_data[key]
|
|
})
|
|
elif key not in theirs_data:
|
|
conflicts.append({
|
|
'parameter': new_path,
|
|
'local_value': ours_data[key],
|
|
'incoming_value': None
|
|
})
|
|
elif ours_data[key] != theirs_data[key]:
|
|
conflicts.extend(
|
|
compare_conflict_yaml(ours_data[key], theirs_data[key],
|
|
new_path))
|
|
|
|
return conflicts
|
|
|
|
|
|
def create_conflict_summary(file_path: str,
|
|
ours_data: Optional[Dict],
|
|
theirs_data: Optional[Dict],
|
|
status: str = UNRESOLVED) -> Dict[str, Any]:
|
|
"""
|
|
Create a summary of conflicts between two versions of a file.
|
|
|
|
Args:
|
|
file_path: Path to the file in conflict
|
|
ours_data: Our version of the YAML data
|
|
theirs_data: Their version of the YAML data
|
|
status: Conflict status (UNRESOLVED, RESOLVED, or MODIFY_DELETE)
|
|
|
|
Returns:
|
|
Dict containing:
|
|
- file_path: Path to the conflicted file
|
|
- type: Type of item
|
|
- name: Name from our version or filename
|
|
- status: Current conflict status
|
|
- conflict_details: List of specific conflicts
|
|
"""
|
|
try:
|
|
from .utils import determine_type # Import here to avoid circular imports
|
|
|
|
# Generate conflict details
|
|
conflict_details = {
|
|
'conflicting_parameters':
|
|
compare_conflict_yaml(ours_data, theirs_data)
|
|
}
|
|
|
|
# Get name from our version or fallback to filename
|
|
name = ours_data.get('name') if ours_data else os.path.basename(
|
|
file_path)
|
|
|
|
return {
|
|
'file_path': file_path,
|
|
'type': determine_type(file_path),
|
|
'name': name,
|
|
'status': status,
|
|
'conflict_details': conflict_details
|
|
}
|
|
|
|
except Exception as e:
|
|
logger.error(
|
|
f"Failed to create conflict summary for {file_path}: {str(e)}")
|
|
return None
|