NY db struktur
This commit is contained in:
@@ -1,17 +1,11 @@
|
||||
"""
|
||||
scanner.py — Scanning af musikbiblioteker i baggrunden.
|
||||
scanner.py — Scanning af musikbiblioteker i baggrunden. v0.9
|
||||
|
||||
Kører som en separat subprocess der scanner ét bibliotek ad gangen
|
||||
og rapporterer fremgang via stdout JSON-linjer.
|
||||
|
||||
Kan også importeres direkte og bruges via ScanWorker QThread.
|
||||
Skriver til files-tabellen og finder/opretter sange i songs-tabellen.
|
||||
"""
|
||||
import os
|
||||
import sys
|
||||
import json
|
||||
import sqlite3
|
||||
import uuid
|
||||
import logging
|
||||
import time
|
||||
from pathlib import Path
|
||||
|
||||
logger = logging.getLogger(__name__)
|
||||
@@ -19,8 +13,8 @@ logger = logging.getLogger(__name__)
|
||||
SUPPORTED = {'.mp3', '.flac', '.m4a', '.ogg', '.wav', '.aiff', '.wma'}
|
||||
|
||||
|
||||
def is_supported(path: Path) -> bool:
|
||||
return path.suffix.lower() in SUPPORTED
|
||||
def is_supported(path) -> bool:
|
||||
return Path(path).suffix.lower() in SUPPORTED
|
||||
|
||||
|
||||
def get_file_mtime(path: Path) -> str:
|
||||
@@ -32,30 +26,29 @@ def get_file_mtime(path: Path) -> str:
|
||||
|
||||
def scan_library(library_id: int, library_path: str, db_path: str,
|
||||
overwrite_bpm: bool = False,
|
||||
progress_callback=None):
|
||||
progress_callback=None) -> int:
|
||||
"""
|
||||
Scan ét bibliotek og upsert sange til SQLite.
|
||||
progress_callback(done, total, current_file) kaldes løbende.
|
||||
Scan ét bibliotek og upsert til files + songs tabellerne.
|
||||
Returnerer antal scannede filer.
|
||||
"""
|
||||
import sqlite3
|
||||
from local.tag_reader import read_tags
|
||||
|
||||
conn = sqlite3.connect(db_path)
|
||||
conn.row_factory = sqlite3.Row
|
||||
from local.local_db import find_or_create_song, upsert_file
|
||||
|
||||
base = Path(library_path)
|
||||
if not base.exists():
|
||||
conn.close()
|
||||
return 0
|
||||
|
||||
# Byg indeks over kendte filer
|
||||
# Byg indeks over kendte filer (path → mtime)
|
||||
conn = sqlite3.connect(db_path, timeout=10)
|
||||
conn.row_factory = sqlite3.Row
|
||||
conn.execute("PRAGMA journal_mode=WAL")
|
||||
|
||||
known = {}
|
||||
for row in conn.execute(
|
||||
"SELECT local_path, file_modified_at, file_missing FROM songs WHERE library_id=?",
|
||||
(library_id,)
|
||||
"SELECT local_path, file_modified_at FROM files WHERE file_missing=0"
|
||||
).fetchall():
|
||||
# Sange markeret som manglende medtages ikke i known — de skal altid genscanes
|
||||
if not row["file_missing"]:
|
||||
known[row["local_path"]] = row["file_modified_at"]
|
||||
known[row["local_path"]] = row["file_modified_at"]
|
||||
|
||||
# Find alle musikfiler
|
||||
all_files = []
|
||||
@@ -68,8 +61,6 @@ def scan_library(library_id: int, library_path: str, db_path: str,
|
||||
total = len(all_files)
|
||||
done = 0
|
||||
|
||||
import time
|
||||
|
||||
for fp in all_files:
|
||||
path_str = str(fp)
|
||||
mtime = get_file_mtime(fp)
|
||||
@@ -77,108 +68,55 @@ def scan_library(library_id: int, library_path: str, db_path: str,
|
||||
if progress_callback:
|
||||
progress_callback(done, total, fp.name)
|
||||
|
||||
# Spring over hvis ikke ændret
|
||||
# Spring over uændrede filer
|
||||
if path_str in known and known[path_str] == mtime:
|
||||
done += 1
|
||||
# Yield hvert 100. fil så andre tråde kan køre
|
||||
if done % 100 == 0:
|
||||
time.sleep(0.005)
|
||||
time.sleep(0.005)
|
||||
continue
|
||||
|
||||
try:
|
||||
tags = read_tags(fp)
|
||||
extra = json.dumps(tags.get("extra_tags", {}), ensure_ascii=False)
|
||||
tags = read_tags(str(fp))
|
||||
title = tags.get("title", "") or fp.stem
|
||||
artist = tags.get("artist", "")
|
||||
album = tags.get("album", "")
|
||||
bpm = tags.get("bpm", 0)
|
||||
mbid = tags.get("mbid", "")
|
||||
acoustid = tags.get("acoustid", "")
|
||||
duration_sec = tags.get("duration_sec", 0)
|
||||
file_format = tags.get("file_format", fp.suffix.lstrip(".").lower())
|
||||
extra_tags = tags.get("extra_tags", "{}")
|
||||
|
||||
# Match 0: MBID-match — sikrest mulige match
|
||||
existing = None
|
||||
mbid_from_file = tags.get("mbid", "")
|
||||
if mbid_from_file:
|
||||
existing = conn.execute(
|
||||
"SELECT id, bpm FROM songs WHERE mbid=? LIMIT 1",
|
||||
(mbid_from_file,)
|
||||
).fetchone()
|
||||
if existing:
|
||||
conn.execute(
|
||||
"UPDATE songs SET local_path=? WHERE id=?",
|
||||
(path_str, existing["id"])
|
||||
)
|
||||
# Find eller opret sang i global katalog
|
||||
song_id = find_or_create_song(
|
||||
title=title, artist=artist, album=album,
|
||||
bpm=bpm, duration_sec=duration_sec,
|
||||
mbid=mbid, acoustid=acoustid,
|
||||
)
|
||||
|
||||
# Match 1: præcis sti-match
|
||||
if not existing:
|
||||
existing = conn.execute(
|
||||
"SELECT id, bpm FROM songs WHERE local_path=?", (path_str,)
|
||||
).fetchone()
|
||||
# Opdater BPM på sangen hvis vi har bedre data
|
||||
if bpm and bpm > 0:
|
||||
conn.execute(
|
||||
"UPDATE songs SET bpm=? WHERE id=? AND (bpm=0 OR bpm IS NULL)",
|
||||
(bpm, song_id)
|
||||
)
|
||||
|
||||
# Match 2: titel+artist match — fil er flyttet eller var missing
|
||||
if not existing:
|
||||
title = tags.get("title", "")
|
||||
artist = tags.get("artist", "")
|
||||
if title:
|
||||
# Prioritér file_missing=1 sange, men tag også sange med ugyldig sti
|
||||
existing = conn.execute("""
|
||||
SELECT id, bpm FROM songs
|
||||
WHERE title=? AND artist=? AND file_missing=1
|
||||
LIMIT 1
|
||||
""", (title, artist)).fetchone()
|
||||
if not existing:
|
||||
# Tjek om der er en sang med samme titel+artist men ugyldig sti
|
||||
existing = conn.execute("""
|
||||
SELECT id, bpm, local_path FROM songs
|
||||
WHERE title=? AND artist=? AND file_missing=0
|
||||
LIMIT 1
|
||||
""", (title, artist)).fetchone()
|
||||
if existing:
|
||||
from pathlib import Path as _Path
|
||||
old_path = existing["local_path"] or ""
|
||||
if old_path and not _Path(old_path).exists():
|
||||
pass # Sti er ugyldig — brug dette match
|
||||
else:
|
||||
existing = None # Sti er valid — det er en anden fil
|
||||
# Opret eller opdater fil-post
|
||||
upsert_file(
|
||||
song_id=song_id,
|
||||
local_path=path_str,
|
||||
file_format=file_format,
|
||||
file_modified_at=mtime,
|
||||
extra_tags=extra_tags,
|
||||
)
|
||||
|
||||
if existing:
|
||||
# Opdater stien så den peger på den nye placering
|
||||
conn.execute(
|
||||
"UPDATE songs SET local_path=? WHERE id=?",
|
||||
(path_str, existing["id"])
|
||||
)
|
||||
|
||||
if existing:
|
||||
bpm = tags.get("bpm", 0)
|
||||
if not overwrite_bpm and existing["bpm"] and existing["bpm"] > 0:
|
||||
bpm = existing["bpm"] # behold eksisterende BPM
|
||||
mbid = tags.get("mbid", "")
|
||||
conn.execute("""
|
||||
UPDATE songs SET
|
||||
library_id=?, title=?, artist=?, album=?,
|
||||
bpm=?, duration_sec=?, file_format=?,
|
||||
file_modified_at=?, file_missing=0, extra_tags=?,
|
||||
mbid=CASE WHEN ? != '' THEN ? ELSE mbid END
|
||||
WHERE id=?
|
||||
""", (library_id, tags.get("title",""), tags.get("artist",""),
|
||||
tags.get("album",""), bpm, tags.get("duration_sec",0),
|
||||
tags.get("file_format",""), mtime, extra,
|
||||
mbid, mbid, existing["id"]))
|
||||
song_id = existing["id"]
|
||||
else:
|
||||
song_id = str(uuid.uuid4())
|
||||
conn.execute("""
|
||||
INSERT OR IGNORE INTO songs
|
||||
(id, library_id, local_path, title, artist, album,
|
||||
bpm, duration_sec, file_format, file_modified_at, extra_tags, mbid)
|
||||
VALUES (?,?,?,?,?,?,?,?,?,?,?,?)
|
||||
""", (song_id, library_id, path_str,
|
||||
tags.get("title",""), tags.get("artist",""),
|
||||
tags.get("album",""), tags.get("bpm",0),
|
||||
tags.get("duration_sec",0), tags.get("file_format",""),
|
||||
mtime, extra, tags.get("mbid","")))
|
||||
|
||||
# Importer dans-tags fra filen hvis de ikke allerede er i DB
|
||||
# Dans-tags fra fil
|
||||
file_dances = tags.get("dances", [])
|
||||
if file_dances:
|
||||
existing_dances = conn.execute(
|
||||
existing_count = conn.execute(
|
||||
"SELECT COUNT(*) FROM song_dances WHERE song_id=?", (song_id,)
|
||||
).fetchone()[0]
|
||||
if existing_dances == 0:
|
||||
if existing_count == 0:
|
||||
import uuid
|
||||
for order, dance_name in enumerate(file_dances, start=1):
|
||||
dance_row = conn.execute(
|
||||
"SELECT id FROM dances WHERE name=? COLLATE NOCASE LIMIT 1",
|
||||
@@ -192,64 +130,25 @@ def scan_library(library_id: int, library_path: str, db_path: str,
|
||||
else:
|
||||
dance_id = dance_row["id"]
|
||||
conn.execute(
|
||||
"INSERT OR IGNORE INTO song_dances (song_id, dance_id, dance_order) VALUES (?,?,?)",
|
||||
(song_id, dance_id, order)
|
||||
"INSERT OR IGNORE INTO song_dances (id, song_id, dance_id, dance_order) VALUES (?,?,?,?)",
|
||||
(str(uuid.uuid4()), song_id, dance_id, order)
|
||||
)
|
||||
|
||||
conn.commit()
|
||||
|
||||
except Exception as e:
|
||||
# UNIQUE constraint er forventet og ufarlig — sang findes allerede
|
||||
if "UNIQUE constraint" in str(e):
|
||||
logger.debug(f"Sang allerede i DB: {fp.name}")
|
||||
else:
|
||||
logger.warning(f"Scan fejl {fp.name}: {e}")
|
||||
logger.warning(f"Scan fejl {fp.name}: {e}")
|
||||
|
||||
done += 1
|
||||
# Lille pause efter hver scannet fil så GUI ikke hænger
|
||||
time.sleep(0.02)
|
||||
|
||||
# Marker manglende filer
|
||||
for path_str in known:
|
||||
if not Path(path_str).exists():
|
||||
conn.execute(
|
||||
"UPDATE songs SET file_missing=1 WHERE local_path=?", (path_str,)
|
||||
"UPDATE files SET file_missing=1 WHERE local_path=?", (path_str,)
|
||||
)
|
||||
conn.commit()
|
||||
|
||||
conn.execute(
|
||||
"UPDATE libraries SET last_full_scan=datetime('now') WHERE id=?",
|
||||
(library_id,)
|
||||
)
|
||||
conn.commit()
|
||||
conn.close()
|
||||
return done
|
||||
|
||||
|
||||
# ── Subprocess entry point ─────────────────────────────────────────────────────
|
||||
|
||||
if __name__ == "__main__":
|
||||
"""
|
||||
Kørsel som subprocess:
|
||||
python scanner.py <library_id> <library_path> <db_path>
|
||||
Rapporterer JSON-linjer til stdout: {"done":N,"total":M,"file":"..."}
|
||||
"""
|
||||
if len(sys.argv) < 4:
|
||||
sys.exit(1)
|
||||
|
||||
lib_id = int(sys.argv[1])
|
||||
lib_path = sys.argv[2]
|
||||
db_path = sys.argv[3]
|
||||
|
||||
# Tilføj app-mappen til path så local.tag_reader kan importeres
|
||||
app_dir = str(Path(__file__).parent.parent)
|
||||
if app_dir not in sys.path:
|
||||
sys.path.insert(0, app_dir)
|
||||
|
||||
def report(done, total, filename):
|
||||
print(json.dumps({"done": done, "total": total, "file": filename}),
|
||||
flush=True)
|
||||
|
||||
count = scan_library(lib_id, lib_path, db_path,
|
||||
progress_callback=report)
|
||||
print(json.dumps({"done": count, "total": count, "finished": True}),
|
||||
flush=True)
|
||||
logger.info(f"Scan færdig: {done} filer i {library_path}")
|
||||
return done
|
||||
Reference in New Issue
Block a user