Delay in seconds between checking for command status
+
+
+
+
+
Number of attempts to check for command completion before giving up
+
+
+
+
+
Minimum items in download queue before starting hunt. Set to -1 to disable check.
+
+
diff --git a/upgrade.py b/upgrade.py
index d702bdfb..9ef38998 100644
--- a/upgrade.py
+++ b/upgrade.py
@@ -12,6 +12,7 @@
HUNT_UPGRADE_EPISODES,
MONITORED_ONLY,
RANDOM_SELECTION,
+ RANDOM_UPGRADES,
SKIP_FUTURE_EPISODES,
SKIP_SERIES_REFRESH
)
@@ -45,29 +46,47 @@ def process_cutoff_upgrades() -> bool:
# Get current date for future episode filtering
current_date = datetime.datetime.now().date()
- page = 1
+ # Use the specific RANDOM_UPGRADES setting
+ # (no longer dependent on the master RANDOM_SELECTION setting)
+ should_use_random = RANDOM_UPGRADES
+
+ if should_use_random:
+ logger.info("Using random selection for quality upgrades (RANDOM_UPGRADES=true)")
+ else:
+ logger.info("Using sequential selection for quality upgrades (RANDOM_UPGRADES=false)")
+ page = 1
+
while True:
if episodes_processed >= HUNT_UPGRADE_EPISODES:
logger.info(f"Reached HUNT_UPGRADE_EPISODES={HUNT_UPGRADE_EPISODES} for this cycle.")
break
- # If random selection, pick a random page each iteration
- if RANDOM_SELECTION and total_pages > 1:
+ # If random selection is enabled, pick a random page each iteration
+ if should_use_random and total_pages > 1:
page = random.randint(1, total_pages)
+ # If sequential and we've reached the end, we're done
+ elif not should_use_random and page > total_pages:
+ break
logger.info(f"Retrieving cutoff-unmet episodes (page={page} of {total_pages})...")
cutoff_data = get_cutoff_unmet(page)
if not cutoff_data or "records" not in cutoff_data:
logger.error(f"ERROR: Unable to retrieve cutoffโunmet data from Sonarr on page {page}.")
- break
+
+ # In sequential mode, try the next page
+ if not should_use_random:
+ page += 1
+ continue
+ else:
+ break
episodes = cutoff_data["records"]
total_eps = len(episodes)
logger.info(f"Found {total_eps} episodes on page {page} that need quality upgrades.")
- # Randomize or sequential indices
+ # Randomize or sequential indices within the page
indices = list(range(total_eps))
- if RANDOM_SELECTION:
+ if should_use_random:
random.shuffle(indices)
for idx in indices:
@@ -149,16 +168,12 @@ def process_cutoff_upgrades() -> bool:
logger.warning(f"WARNING: Search command failed for episode ID {episode_id}.")
continue
- # Move to the next page if not random
- if not RANDOM_SELECTION:
+ # Move to the next page if using sequential mode
+ if not should_use_random:
page += 1
- if page > total_pages:
- break
- else:
- # In random mode, we just handle one random page this iteration,
- # then either break or keep looping until we hit HUNT_UPGRADE_EPISODES.
- pass
-
+ # In random mode, we just handle one random page this iteration,
+ # then check if we've processed enough episodes or continue to another random page
+
logger.info(f"Completed processing {episodes_processed} upgrade episodes for this cycle.")
truncate_processed_list(PROCESSED_UPGRADE_FILE)
diff --git a/utils/.github/workflows/docker-image.yml b/utils/.github/workflows/docker-image.yml
deleted file mode 100644
index ea7c086d..00000000
--- a/utils/.github/workflows/docker-image.yml
+++ /dev/null
@@ -1,93 +0,0 @@
-name: Docker Build and Push
-on:
- push:
- branches:
- - main
- - dev
- tags:
- - "*" # This will trigger on any tag push
- pull_request:
- branches:
- - main
-jobs:
- build-and-push:
- runs-on: ubuntu-latest
- steps:
- # 1) Check out your repository code with full depth
- - name: Checkout code
- uses: actions/checkout@v3
- with:
- fetch-depth: 0
-
- # 2) List files to verify huntarr.py is present
- - name: List files in directory
- run: ls -la
-
- # 3) Set up QEMU for multi-architecture builds
- - name: Set up QEMU
- uses: docker/setup-qemu-action@v2
- with:
- platforms: arm64,amd64
-
- # 4) Set up Docker Buildx
- - name: Set up Docker Buildx
- uses: docker/setup-buildx-action@v2
-
- # 5) Log in to Docker Hub
- - name: Log in to Docker Hub
- if: github.event_name != 'pull_request'
- uses: docker/login-action@v2
- with:
- username: ${{ secrets.DOCKERHUB_USERNAME }}
- password: ${{ secrets.DOCKERHUB_PASSWORD }}
-
- # 6) Extract version from tag if it's a tag push
- - name: Extract version from tag
- if: startsWith(github.ref, 'refs/tags/')
- id: get_version
- run: echo "VERSION=${GITHUB_REF#refs/tags/}" >> $GITHUB_OUTPUT
-
- # 7a) Build & Push if on 'main' branch
- - name: Build and Push (main)
- if: github.ref == 'refs/heads/main' && github.event_name != 'pull_request'
- uses: docker/build-push-action@v3
- with:
- context: .
- push: true
- platforms: linux/amd64,linux/arm64
- tags: |
- huntarr/4sonarr:latest
- huntarr/4sonarr:${{ github.sha }}
-
- # 7b) Build & Push if on 'dev' branch
- - name: Build and Push (dev)
- if: github.ref == 'refs/heads/dev' && github.event_name != 'pull_request'
- uses: docker/build-push-action@v3
- with:
- context: .
- push: true
- platforms: linux/amd64,linux/arm64
- tags: |
- huntarr/4sonarr:dev
- huntarr/4sonarr:${{ github.sha }}
-
- # 7c) Build & Push if it's a tag/release
- - name: Build and Push (release)
- if: startsWith(github.ref, 'refs/tags/') && github.event_name != 'pull_request'
- uses: docker/build-push-action@v3
- with:
- context: .
- push: true
- platforms: linux/amd64,linux/arm64
- tags: |
- huntarr/4sonarr:${{ steps.get_version.outputs.VERSION }}
- huntarr/4sonarr:latest
-
- # 7d) Just build on pull requests
- - name: Build (PR)
- if: github.event_name == 'pull_request'
- uses: docker/build-push-action@v3
- with:
- context: .
- push: false
- platforms: linux/amd64,linux/arm64
\ No newline at end of file
diff --git a/utils/logger.py b/utils/logger.py
index 7a1150c5..15b42357 100644
--- a/utils/logger.py
+++ b/utils/logger.py
@@ -7,27 +7,51 @@
import sys
import os
import pathlib
-from config import DEBUG_MODE
# Create log directory
LOG_DIR = pathlib.Path("/tmp/huntarr-logs")
LOG_DIR.mkdir(parents=True, exist_ok=True)
LOG_FILE = LOG_DIR / "huntarr.log"
-def setup_logger():
- """Configure and return the application logger"""
- logger = logging.getLogger("huntarr-sonarr")
+# Global logger instance
+logger = None
+
+def setup_logger(debug_mode=None):
+ """Configure and return the application logger
+
+ Args:
+ debug_mode (bool, optional): Override the DEBUG_MODE from config. Defaults to None.
+
+ Returns:
+ logging.Logger: The configured logger
+ """
+ global logger
- # Set the log level based on DEBUG_MODE
- logger.setLevel(logging.DEBUG if DEBUG_MODE else logging.INFO)
+ # Get DEBUG_MODE from config, but only if we haven't been given a value
+ if debug_mode is None:
+ from config import DEBUG_MODE as CONFIG_DEBUG_MODE
+ use_debug_mode = CONFIG_DEBUG_MODE
+ else:
+ use_debug_mode = debug_mode
+
+ if logger is None:
+ # First-time setup
+ logger = logging.getLogger("huntarr-sonarr")
+ else:
+ # Reset handlers to avoid duplicates
+ for handler in logger.handlers[:]:
+ logger.removeHandler(handler)
+
+ # Set the log level based on use_debug_mode
+ logger.setLevel(logging.DEBUG if use_debug_mode else logging.INFO)
# Create console handler
console_handler = logging.StreamHandler(sys.stdout)
- console_handler.setLevel(logging.DEBUG if DEBUG_MODE else logging.INFO)
+ console_handler.setLevel(logging.DEBUG if use_debug_mode else logging.INFO)
# Create file handler for the web interface
file_handler = logging.FileHandler(LOG_FILE)
- file_handler.setLevel(logging.DEBUG if DEBUG_MODE else logging.INFO)
+ file_handler.setLevel(logging.DEBUG if use_debug_mode else logging.INFO)
# Set format
formatter = logging.Formatter(
@@ -41,14 +65,17 @@ def setup_logger():
logger.addHandler(console_handler)
logger.addHandler(file_handler)
+ if use_debug_mode:
+ logger.debug("Debug logging enabled")
+
return logger
-# Create the logger instance
+# Create the logger instance on module import
logger = setup_logger()
def debug_log(message: str, data: object = None) -> None:
"""Log debug messages with optional data."""
- if DEBUG_MODE:
+ if logger.level <= logging.DEBUG:
logger.debug(f"{message}")
if data is not None:
try:
diff --git a/web_server.py b/web_server.py
index 5a8e6908..8459a5ec 100644
--- a/web_server.py
+++ b/web_server.py
@@ -14,8 +14,9 @@
import logging
from config import ENABLE_WEB_UI
import settings_manager
+from utils.logger import setup_logger
-# Check if web UI is enabled
+# Check if web UI is disabled
if not ENABLE_WEB_UI:
print("Web UI is disabled. Exiting web server.")
exit(0)
@@ -89,20 +90,37 @@ def update_settings():
if "huntarr" in data:
old_settings = settings_manager.get_setting("huntarr", None, {})
for key, value in data["huntarr"].items():
- old_value = old_settings.get(key, "Default") # Use "Default" instead of None for display
+ old_value = old_settings.get(key)
if old_value != value:
- changes_log.append(f"Changed {key} from {old_value} to {value}")
+ # Remove the "from Default" text - just log the new value
+ changes_log.append(f"Changed {key} to {value}")
settings_manager.update_setting("huntarr", key, value)
# Update UI settings
if "ui" in data:
old_settings = settings_manager.get_setting("ui", None, {})
for key, value in data["ui"].items():
- old_value = old_settings.get(key, "Default") # Use "Default" instead of None for display
+ old_value = old_settings.get(key)
if old_value != value:
- changes_log.append(f"Changed UI.{key} from {old_value} to {value}")
+ # Remove the "from Default" text - just log the new value
+ changes_log.append(f"Changed UI.{key} to {value}")
settings_manager.update_setting("ui", key, value)
+ # Update advanced settings
+ if "advanced" in data:
+ old_settings = settings_manager.get_setting("advanced", None, {})
+ for key, value in data["advanced"].items():
+ old_value = old_settings.get(key)
+ if old_value != value:
+ changes_log.append(f"Changed advanced.{key} to {value}")
+ settings_manager.update_setting("advanced", key, value)
+
+ # Special handling for debug_mode setting
+ if key == "debug_mode" and old_value != value:
+ # Reconfigure the logger with new debug mode setting
+ setup_logger(value)
+ changes_log.append(f"Reconfigured logger with DEBUG_MODE={value}")
+
# Write changes to log file
if changes_log:
with open(LOG_FILE, 'a') as f:
@@ -145,10 +163,11 @@ def update_theme():
if "dark_mode" in data and old_value != data["dark_mode"]:
settings_manager.update_setting("ui", "dark_mode", data["dark_mode"])
- # Log the theme change
+ # Log the theme change - simplified to remove "from X" text
timestamp = datetime.datetime.now().strftime("%Y-%m-%d %H:%M:%S")
with open(LOG_FILE, 'a') as f:
- f.write(f"{timestamp} - huntarr-web - INFO - Changed theme from {'Dark' if old_value else 'Light'} to {'Dark' if data['dark_mode'] else 'Light'} Mode\n")
+ new_mode = 'Dark' if data['dark_mode'] else 'Light'
+ f.write(f"{timestamp} - huntarr-web - INFO - Changed theme to {new_mode} Mode\n")
return jsonify({"success": True})
except Exception as e: