mirror of
https://github.com/Dictionarry-Hub/profilarr.git
synced 2026-01-22 10:51:02 +01:00
d7d6b13e46
- added option to set radarr/sonarr specific scores that profilarr's compiler will handle on import - revise design for arr settings container - now styled as a table - completely rewrote import module. Now uses connection pooling to reuse connections. - fixed import progress bug where 1 failed format causes all other formats to be labelled as failed (even if they succeeded) - fixed bug where on pull sync wasn't working - improve styling for link / unlink database modals - fixed issue where 0 score formats were removed in selective mode
66 lines
2.3 KiB
Python
66 lines
2.3 KiB
Python
# git/operations/pull.py
|
|
|
|
import git
|
|
import logging
|
|
from git import GitCommandError
|
|
from ..status.status import GitStatusManager
|
|
from ...arr.manager import get_pull_configs
|
|
from ...importer import handle_pull_import
|
|
|
|
logger = logging.getLogger(__name__)
|
|
|
|
|
|
def pull_branch(repo_path, branch_name):
|
|
try:
|
|
repo = git.Repo(repo_path)
|
|
|
|
# Check for uncommitted changes first
|
|
if repo.is_dirty(untracked_files=True):
|
|
return False, {
|
|
'type': 'uncommitted_changes',
|
|
'message':
|
|
'Cannot pull: You have uncommitted local changes that would be lost',
|
|
'details': 'Please commit or stash your changes before pulling'
|
|
}
|
|
|
|
# Fetch first to get remote changes
|
|
repo.remotes.origin.fetch()
|
|
|
|
try:
|
|
# Pull with explicit merge strategy
|
|
repo.git.pull('origin', branch_name, '--no-rebase')
|
|
|
|
# Update remote status
|
|
status_manager = GitStatusManager.get_instance(repo_path)
|
|
if status_manager:
|
|
status_manager.update_remote_status()
|
|
|
|
# -------------------------------
|
|
# *** "On pull" ARR import logic using new importer:
|
|
# 1) Query all ARR configs that have sync_method="pull"
|
|
# 2) For each, run the importer pull handler
|
|
# -------------------------------
|
|
pull_configs = get_pull_configs()
|
|
logger.info(
|
|
f"[Pull] Found {len(pull_configs)} ARR configs to import (sync_method='pull')"
|
|
)
|
|
for cfg in pull_configs:
|
|
handle_pull_import(cfg['id'])
|
|
|
|
return True, f"Successfully pulled changes for branch {branch_name}"
|
|
|
|
except GitCommandError as e:
|
|
if "CONFLICT" in str(e):
|
|
return True, {
|
|
'state': 'resolve',
|
|
'type': 'merge_conflict',
|
|
'message':
|
|
'Repository is now in conflict resolution state. Please resolve conflicts to continue merge.',
|
|
'details': 'Please resolve conflicts to continue merge'
|
|
}
|
|
raise e
|
|
|
|
except Exception as e:
|
|
logger.error(f"Error pulling branch: {str(e)}", exc_info=True)
|
|
return False, f"Error pulling branch: {str(e)}"
|