danvics/soulsync
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Merge pull request #276 from kettui/feat/misc-cleanup

Browse source 
Reduce redundant logging during watchlist scan, initialize db once at startup
This commit is contained in:
BoulderBadgeDad 2026-04-11 11:10:38 -07:00 committed by GitHub
commit 2ecc434c7a
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 27 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
core/watchlist_scanner.py
View file

@ -353,6 +353,7 @@ class WatchlistScanner:
self._database = None
self._wishlist_service = None
self._matching_engine = None
self._rescan_cutoff_log_marker = None
if metadata_service:
self._metadata_service = metadata_service
@ -932,7 +933,9 @@ class WatchlistScanner:
# Check if a lookback period change requires a one-time wider window
rescan_cutoff = self._get_rescan_cutoff()
if rescan_cutoff == 'all':
logger.info(f"Lookback period changed to 'all' — returning full discography")
if self._rescan_cutoff_log_marker != 'all':
logger.info(f"Lookback period changed to 'all' — returning full discography")
self._rescan_cutoff_log_marker = 'all'
cutoff_timestamp = None
needs_full_discog = True
elif rescan_cutoff is not None:
@ -942,7 +945,10 @@ class WatchlistScanner:
if rescan_cutoff.tzinfo is None:
rescan_cutoff = rescan_cutoff.replace(tzinfo=timezone.utc)
if rescan_cutoff < scan_ts:
logger.info(f"Lookback period change detected — expanding cutoff from {cutoff_timestamp} to {rescan_cutoff}")
marker = rescan_cutoff.isoformat()
if self._rescan_cutoff_log_marker != marker:
logger.info(f"Lookback period change detected — expanding cutoff from {cutoff_timestamp} to {rescan_cutoff}")
self._rescan_cutoff_log_marker = marker
cutoff_timestamp = rescan_cutoff
else:
# No scan timestamp — first scan, use lookback period
@ -1248,6 +1254,7 @@ class WatchlistScanner:
cursor.execute("DELETE FROM metadata WHERE key = 'watchlist_rescan_cutoff'")
conn.commit()
logger.info("Cleared watchlist rescan cutoff flag")
self._rescan_cutoff_log_marker = None
except Exception as e:
logger.debug(f"Error clearing rescan cutoff: {e}")
@ -3266,4 +3273,4 @@ def get_watchlist_scanner(spotify_client: SpotifyClient) -> WatchlistScanner:
global _watchlist_scanner_instance
if _watchlist_scanner_instance is None:
_watchlist_scanner_instance = WatchlistScanner(spotify_client)
return _watchlist_scanner_instance
return _watchlist_scanner_instance

20
database/music_database.py
View file

@ -15,6 +15,9 @@ from utils.logging_config import get_logger
logger = get_logger("music_database")
_database_initialized_paths = set()
_database_initialization_lock = threading.Lock()
# Import matching engine for enhanced similarity logic
try:
from core.matching_engine import MusicMatchingEngine
@ -168,8 +171,19 @@ class MusicDatabase:
self.database_path = Path(database_path)
self.database_path.parent.mkdir(parents=True, exist_ok=True)
# Initialize database
self._initialize_database()
# Initialize database once per process for this path
self._initialize_database_once()
def _initialize_database_once(self):
"""Run schema setup and migrations once per database path per process."""
db_key = str(self.database_path.resolve())
with _database_initialization_lock:
if db_key in _database_initialized_paths:
return
self._initialize_database()
_database_initialized_paths.add(db_key)
def _get_connection(self) -> sqlite3.Connection:
"""Get a NEW database connection for each operation (thread-safe)"""
@ -10796,4 +10810,4 @@ def close_database():
except Exception as e:
# Ignore threading errors during shutdown
pass
_database_instances.clear()
_database_instances.clear()