mirror of
https://github.com/MrSleeps/jellyfin-scene-search.git
synced 2026-11-16 23:11:27 +00:00
Prune deselected libraries only on posted index selection
This commit is contained in:
+52
-30
@@ -9,7 +9,7 @@ from .database import connect, init_db
|
||||
from .jellyfin_index import (
|
||||
build_jellyfin_client,
|
||||
index_libraries,
|
||||
reconcile_removed_libraries,
|
||||
reconcile_selected_libraries,
|
||||
resolve_library_ids,
|
||||
)
|
||||
from .search_service import SearchService
|
||||
@@ -82,36 +82,27 @@ class IndexJobManager:
|
||||
)
|
||||
return result
|
||||
|
||||
def reconcile_removed_libraries(self) -> dict[str, object]:
|
||||
if self.running:
|
||||
return {
|
||||
"removed_library_ids": [],
|
||||
"removed_libraries": 0,
|
||||
"removed_media": 0,
|
||||
"skipped": True,
|
||||
}
|
||||
|
||||
result = reconcile_removed_libraries(build_jellyfin_client())
|
||||
removed_ids = [
|
||||
str(value)
|
||||
for value in (result.get("removed_library_ids") or [])
|
||||
]
|
||||
if removed_ids:
|
||||
self.search_service.meili.delete_jellyfin_libraries(removed_ids)
|
||||
print(
|
||||
"Removed orphaned Jellyfin libraries: "
|
||||
+ ", ".join(removed_ids)
|
||||
+ f" ({int(result.get('removed_media') or 0)} media item(s))"
|
||||
)
|
||||
return result
|
||||
|
||||
def start(self, library_ids: list[str], *, force: bool = False) -> dict[str, Any]:
|
||||
with self._state_lock:
|
||||
if self._state.get("running"):
|
||||
raise RuntimeError("A Jellyfin indexing job is already running.")
|
||||
|
||||
requested_ids = [
|
||||
str(value).strip()
|
||||
for value in library_ids
|
||||
if str(value).strip()
|
||||
]
|
||||
client = build_jellyfin_client()
|
||||
libraries = resolve_library_ids(client, library_ids)
|
||||
libraries = (
|
||||
resolve_library_ids(client, requested_ids)
|
||||
if requested_ids
|
||||
else []
|
||||
)
|
||||
selected_ids = {
|
||||
str(item.get("Id") or "")
|
||||
for item in libraries
|
||||
if str(item.get("Id") or "")
|
||||
}
|
||||
library_item_totals = [
|
||||
client.item_count(str(item.get("Id") or ""))
|
||||
for item in libraries
|
||||
@@ -126,7 +117,7 @@ class IndexJobManager:
|
||||
"finished_at": None,
|
||||
"error": None,
|
||||
"library_total": len(libraries),
|
||||
"library_ids": [str(item.get("Id") or "") for item in libraries],
|
||||
"library_ids": sorted(selected_ids),
|
||||
"library_item_totals": library_item_totals,
|
||||
"overall_items_total": overall_items_total,
|
||||
"overall_items_completed": 0,
|
||||
@@ -135,7 +126,7 @@ class IndexJobManager:
|
||||
|
||||
self._thread = threading.Thread(
|
||||
target=self._run,
|
||||
args=(libraries, force),
|
||||
args=(libraries, selected_ids, force),
|
||||
name="scene-search-index",
|
||||
daemon=True,
|
||||
)
|
||||
@@ -187,16 +178,47 @@ class IndexJobManager:
|
||||
else 0.0
|
||||
)
|
||||
|
||||
def _run(self, libraries: list[dict], force: bool) -> None:
|
||||
def _run(
|
||||
self,
|
||||
libraries: list[dict],
|
||||
selected_ids: set[str],
|
||||
force: bool,
|
||||
) -> None:
|
||||
try:
|
||||
removed = reconcile_removed_libraries(build_jellyfin_client())
|
||||
if int(removed.get("removed_libraries") or 0):
|
||||
removed = reconcile_selected_libraries(selected_ids)
|
||||
removed_ids = [
|
||||
str(value)
|
||||
for value in (removed.get("removed_library_ids") or [])
|
||||
]
|
||||
if removed_ids:
|
||||
self.search_service.meili.delete_jellyfin_libraries(removed_ids)
|
||||
self._progress(
|
||||
{
|
||||
"removed_libraries": int(removed["removed_libraries"]),
|
||||
"removed_library_media": int(removed["removed_media"]),
|
||||
}
|
||||
)
|
||||
print(
|
||||
"Removed deselected Jellyfin libraries: "
|
||||
+ ", ".join(removed_ids)
|
||||
+ f" ({int(removed.get('removed_media') or 0)} media item(s))"
|
||||
)
|
||||
|
||||
if not libraries:
|
||||
self._progress(
|
||||
{
|
||||
"running": False,
|
||||
"stage": "complete",
|
||||
"finished_at": datetime.now(timezone.utc).isoformat(),
|
||||
"documents_processed": 0,
|
||||
"library_total": 0,
|
||||
"indexed": 0,
|
||||
"skipped": 0,
|
||||
"failed": 0,
|
||||
"pruned": int(removed.get("removed_media") or 0),
|
||||
}
|
||||
)
|
||||
return
|
||||
|
||||
# Search and indexing share one model instance and never use it concurrently.
|
||||
with self.search_service.model_lock:
|
||||
|
||||
Reference in New Issue
Block a user