"),
- ):
- coordinator.on_network_diagnostics_requested({"area_url": "https://example.com/sprites"})
-
- self.assertTrue(window.web_sources_panel.status_messages)
- self.assertIn("Network diagnostics failed", window.web_sources_panel.status_messages[-1])
- self.assertIn("WinError 10013", window.web_sources_panel.status_messages[-1])
-
- def test_registry_changed_allows_empty_list_and_clears_sources(self) -> None:
- window = _FakeWindow()
- coordinator = WebSourcesCoordinator(window)
-
- coordinator.on_registry_changed([])
-
- self.assertEqual([], window.web_sources_panel.sources)
- self.assertFalse(
- any("empty after validation" in msg.lower() for msg in window.web_sources_panel.status_messages)
- )
-
-
-if __name__ == "__main__":
- unittest.main()
-
-
+ coordinator.on_scan_requested({"urls": ["https://example.com"]})
+ coordinator.on_discover_links_requested(self._scan_request("https://example.com"))
+ coordinator.on_download_requested(WebDiagnosticsRequest(url="https://example.com"))
+ self.assertEqual([], window.controller.scanned_urls)
+ self.assertEqual("", window.controller.discovery_url)
+ self.assertEqual(3, len(window.web_sources_panel.status_messages))
+
+
+if __name__ == "__main__":
+ unittest.main()
diff --git a/image_engine_app/tests/test_web_sources_panel.py b/image_engine_app/tests/test_web_sources_panel.py
index c527338..3d5d3f3 100644
--- a/image_engine_app/tests/test_web_sources_panel.py
+++ b/image_engine_app/tests/test_web_sources_panel.py
@@ -1,23 +1,32 @@
-"""Web Sources panel behavior tests."""
+"""Web Sources panel workflow tests."""
from __future__ import annotations
import os
-from pathlib import Path
-import sys
import unittest
-
+from unittest.mock import patch
try:
from PySide6.QtCore import Qt
from PySide6.QtWidgets import QApplication, QMessageBox
-except Exception: # pragma: no cover - optional dependency in some environments
+except Exception: # pragma: no cover - optional UI dependency
Qt = None # type: ignore[assignment]
QApplication = None # type: ignore[assignment]
QMessageBox = None # type: ignore[assignment]
-from image_engine_app.app.web_sources_models import Confidence, ImportTarget, ScanResults, WebIndexLink, WebItem # noqa: E402
-from image_engine_app.ui.main_window.web_sources_panel import WebSourcesPanel # noqa: E402
+from image_engine_app.app.web_sources_models import (
+ Confidence,
+ ScanOrigin,
+ ScanResults,
+ SmartOptions,
+ WebDiagnosticsRequest,
+ WebDownloadRequest,
+ WebIndexLink,
+ WebItem,
+ WebLinkDiscoveryRequest,
+ WebScanRequest,
+)
+from image_engine_app.ui.main_window.web_sources_panel import WebSourcesPanel
@unittest.skipIf(QApplication is None, "PySide6 not installed")
@@ -28,984 +37,385 @@ def _setup_panel(self) -> tuple[QApplication, bool, WebSourcesPanel]:
owns_app = app is None
if app is None:
app = QApplication([])
-
- panel = WebSourcesPanel()
- return app, owns_app, panel
-
- def test_menu_only_actions_do_not_leave_floating_button_widgets(self) -> None:
- app, owns_app, panel = self._setup_panel()
- try:
- self.assertFalse(hasattr(panel, "_scan_selected_pages_btn"))
- self.assertFalse(hasattr(panel, "_clear_manual_links_btn"))
- finally:
- panel.close()
- if owns_app and app is not None:
- app.quit()
-
- def test_add_custom_website_url_saves_exact_page_and_dedupes(self) -> None:
- app, owns_app, panel = self._setup_panel()
- panel.set_sources(
- websites=[
- {
- "id": "pokemon_db",
- "name": "PokemonDB",
- "areas": [
- {
- "id": "sprites_root",
- "label": "Sprites (All Pokemon)",
- "url": "https://pokemondb.net/sprites",
- }
- ],
- }
- ]
+ return app, owns_app, WebSourcesPanel()
+
+ @staticmethod
+ def _close(app: QApplication, owns_app: bool, panel: WebSourcesPanel) -> None:
+ panel.close()
+ if owns_app:
+ app.quit()
+
+ @staticmethod
+ def _item(name: str, *, source: str = "https://example.com/page") -> WebItem:
+ return WebItem(
+ url=f"https://cdn.example.com/{name}",
+ name=name,
+ ext="." + name.rsplit(".", 1)[-1].lower(),
+ confidence=Confidence.DIRECT,
+ source_page=source,
)
- changes: list[list[dict]] = []
- panel.registry_changed.connect(lambda payload: changes.append(payload if isinstance(payload, list) else []))
-
- try:
- panel._custom_url.setText("https://example.com/sprites/pokemon/gen1?form=alt")
- panel._add_custom_website()
-
- registry = panel.sources_registry()
- example = next((entry for entry in registry if entry.get("name") == "example.com"), None)
- self.assertIsNotNone(example)
- areas = example.get("areas") if isinstance(example, dict) else []
- self.assertEqual(1, len(areas))
-
- area_urls = [str(area.get("url", "")) for area in areas if isinstance(area, dict)]
- self.assertEqual(["https://example.com/sprites/pokemon/gen1?form=alt"], area_urls)
-
- panel._custom_url.setText("https://example.com/sprites/pokemon/gen1?form=alt")
- panel._add_custom_website()
-
- registry_after = panel.sources_registry()
- example_after = next((entry for entry in registry_after if entry.get("name") == "example.com"), None)
- self.assertIsNotNone(example_after)
- areas_after = example_after.get("areas") if isinstance(example_after, dict) else []
- self.assertEqual(1, len(areas_after))
- self.assertGreaterEqual(len(changes), 2)
- finally:
- panel.close()
- if owns_app and app is not None:
- app.quit()
-
- def test_area_dropdown_uses_compact_decoded_labels_and_tooltips(self) -> None:
- app, owns_app, panel = self._setup_panel()
- try:
- panel.set_sources(
- websites=[
- {
- "id": "project_pokemon",
- "name": "Project Pokemon",
- "areas": [
- {
- "id": "gen1",
- "label": "Home / Docs / Spriteindex 148 / 3d Models Generation 1 Pok%C3%A9mon R90",
- "url": "https://example.com/home/docs/spriteindex_148/3d-models-generation-1-pok%C3%A9mon-r90",
- }
- ],
- }
- ]
- )
-
- self.assertEqual("... / Docs / Spriteindex 148 / 3d Models Generation 1 Pokemon R90", panel._area.itemText(0))
- self.assertEqual(
- "https://example.com/home/docs/spriteindex_148/3d-models-generation-1-pok%C3%A9mon-r90",
- panel._area.itemData(0, Qt.ItemDataRole.ToolTipRole),
- )
- finally:
- panel.close()
- if owns_app and app is not None:
- app.quit()
-
- def test_added_website_page_uses_generic_url_path_label(self) -> None:
- app, owns_app, panel = self._setup_panel()
- try:
- panel._custom_url.setText("https://example.com/sprites/pokemon/gen1?form=alt")
- panel._add_custom_website()
-
- labels = [panel._area.itemText(index) for index in range(panel._area.count())]
- self.assertEqual(["Sprites / Pokemon / Gen1 (Query)"], labels)
- self.assertIn("Selected page:", panel._selected_page_hint.text())
- self.assertIn("https://example.com/sprites/pokemon/gen1?form=alt", panel._selected_page_hint.text())
- finally:
- panel.close()
- if owns_app and app is not None:
- app.quit()
-
- def test_scan_all_saved_pages_emits_multi_scan_for_every_saved_page(self) -> None:
- app, owns_app, panel = self._setup_panel()
- scans: list[object] = []
- panel.multi_scan_requested.connect(scans.append)
-
- try:
- panel.set_sources(
- websites=[
- {
- "id": "example_com",
- "name": "example.com",
- "areas": [
- {"id": "root", "label": "Root", "url": "https://example.com/"},
- {"id": "sprites", "label": "Sprites", "url": "https://example.com/sprites"},
- ],
- },
- {
- "id": "other_com",
- "name": "other.com",
- "areas": [
- {"id": "free", "label": "Freebies", "url": "https://other.com/freebies"},
- ],
- },
- ]
- )
-
- panel._emit_saved_pages_scan()
-
- self.assertEqual(1, len(scans))
- payload = scans[0]
- self.assertIsInstance(payload, dict)
- pages = payload.get("pages") if isinstance(payload, dict) else []
- self.assertEqual(
- ["https://example.com/", "https://example.com/sprites", "https://other.com/freebies"],
- [page.get("url") for page in pages],
- )
- finally:
- panel.close()
- if owns_app and app is not None:
- app.quit()
+ @staticmethod
+ def _registry() -> list[dict]:
+ return [
+ {
+ "id": "site_a",
+ "name": "site-a.example",
+ "areas": [
+ {"id": "page_a", "label": "Sprites A", "url": "https://site-a.example/sprites"},
+ {"id": "page_b", "label": "Sprites B", "url": "https://site-a.example/other"},
+ ],
+ },
+ {
+ "id": "site_b",
+ "name": "site-b.example",
+ "areas": [
+ {"id": "page_c", "label": "Sprites C", "url": "https://site-b.example/sprites"},
+ ],
+ },
+ ]
- def test_saved_page_picker_selects_and_scans_saved_area(self) -> None:
+ def test_rebuild_has_no_retired_hidden_controls_or_scan_signals(self) -> None:
app, owns_app, panel = self._setup_panel()
- scans: list[object] = []
- panel.scan_requested.connect(scans.append)
-
try:
- panel.set_sources(
- websites=[
- {
- "id": "example_com",
- "name": "example.com",
- "areas": [
- {
- "id": "root",
- "label": "Root",
- "url": "https://example.com/",
- },
- {
- "id": "sprites_gen1",
- "label": "Sprites / Gen1",
- "url": "https://example.com/sprites/gen1",
- },
- ],
- },
- {
- "id": "archive_org",
- "name": "archive.example",
- "areas": [
- {
- "id": "animated",
- "label": "Animated",
- "url": "https://archive.example/animated",
- }
- ],
- },
- ]
- )
-
- for index in range(panel._saved_page.count()):
- if panel._saved_page.itemData(index, Qt.ItemDataRole.ToolTipRole) == "https://archive.example/animated":
- panel._saved_page.setCurrentIndex(index)
- break
-
- panel._scan_saved_btn.click()
-
- self.assertEqual(1, len(scans))
- payload = scans[0]
- self.assertIsInstance(payload, dict)
- if isinstance(payload, dict):
- self.assertEqual("https://archive.example/animated", payload.get("area_url"))
- self.assertEqual("archive_org", payload.get("website_id"))
- self.assertEqual("animated", payload.get("area_id"))
- self.assertIn("archive.example", panel._saved_page.currentText())
+ for name in ("_website", "_area", "_saved_page", "_manual_links"):
+ self.assertFalse(hasattr(panel, name))
+ for name in ("multi_scan_requested", "index_scan_all_requested", "index_links_requested"):
+ self.assertFalse(hasattr(panel, name))
+ self.assertIsNotNone(panel._saved_tree)
+ self.assertIsNotNone(panel._results)
finally:
- panel.close()
- if owns_app and app is not None:
- app.quit()
+ self._close(app, owns_app, panel)
- def test_network_diagnostics_emits_payload_for_custom_url(self) -> None:
+ def test_each_more_menu_owns_only_its_section_actions(self) -> None:
app, owns_app, panel = self._setup_panel()
- diagnostics: list[object] = []
- panel.network_diagnostics_requested.connect(diagnostics.append)
-
try:
- panel._custom_url.setText("example.com/sprites")
- panel._emit_custom_url_network_diagnostics()
-
- self.assertEqual(1, len(diagnostics))
- payload = diagnostics[0]
- self.assertIsInstance(payload, dict)
- if isinstance(payload, dict):
- self.assertEqual("https://example.com/sprites", payload.get("area_url"))
- self.assertIsNone(payload.get("website_id"))
- self.assertIsNone(payload.get("area_id"))
- self.assertIn("Running network diagnostics", panel._status.text())
- finally:
- panel.close()
- if owns_app and app is not None:
- app.quit()
+ entered = [action.text() for action in panel._entered_more_btn.menu().actions() if action.text()]
+ saved = [action.text() for action in panel._saved_more_btn.menu().actions() if action.text()]
+ linked = [action.text() for action in panel._links_more_btn.menu().actions() if action.text()]
+ found = [action.text() for action in panel._results_more_btn.menu().actions() if action.text()]
- def test_more_menus_have_section_specific_actions(self) -> None:
- app, owns_app, panel = self._setup_panel()
-
- def action_labels(button) -> list[str]:
- menu = button.menu()
- self.assertIsNotNone(menu)
- if menu is None:
- return []
- return [action.text() for action in menu.actions() if not action.isSeparator()]
-
- try:
- self.assertEqual(
- ["Save URL as Page", "Clear URL", "Clear Page List", "Check Pasted URL"],
- action_labels(panel._url_more_btn),
- )
self.assertEqual(
- ["Scan All Saved", "Remove Saved Page", "Remove Website", "Check Saved Page"],
- action_labels(panel._source_more_btn),
+ ["Save Entered Pages", "Check First URL", "Include uncertain image links", "Clear Entered URLs"],
+ entered,
)
self.assertEqual(
[
- "Scan Selected Links",
- "Find and Scan First 100",
- "Select Visible Links",
- "Clear Link Selection",
- "Clear Linked Pages",
+ "Check Current Page",
+ "Clear Checked Pages",
+ "Check Current Page Connection",
+ "Remove Current Page",
+ "Remove Current Website",
],
- action_labels(panel._index_more_btn),
+ saved,
)
self.assertEqual(
- ["Select All Results", "Clear Result Selection", "Clear Found Files"],
- action_labels(panel._download_more_btn),
+ ["Select Visible Pages", "Clear Page Selection", "Clear Linked Pages"],
+ linked,
)
- finally:
- panel.close()
- if owns_app and app is not None:
- app.quit()
-
- def test_saved_page_network_diagnostics_ignores_pasted_url(self) -> None:
- app, owns_app, panel = self._setup_panel()
- diagnostics: list[object] = []
- panel.network_diagnostics_requested.connect(diagnostics.append)
-
- try:
- panel.set_sources(
- websites=[
- {
- "id": "example_com",
- "name": "example.com",
- "areas": [
- {
- "id": "sprites",
- "label": "Sprites",
- "url": "https://example.com/sprites",
- }
- ],
- }
- ],
- selected_website_id="example_com",
- selected_area_id="sprites",
- )
- panel._custom_url.setText("https://other.example/manual")
- panel._emit_saved_page_network_diagnostics()
-
- self.assertEqual(1, len(diagnostics))
- payload = diagnostics[0]
- self.assertIsInstance(payload, dict)
- if isinstance(payload, dict):
- self.assertEqual("https://example.com/sprites", payload.get("area_url"))
- self.assertEqual("example_com", payload.get("website_id"))
- self.assertEqual("sprites", payload.get("area_id"))
- self.assertIn("saved page", panel._status.text())
- finally:
- panel.close()
- if owns_app and app is not None:
- app.quit()
-
- def test_jpg_filter_is_available_and_enabled_by_default(self) -> None:
- app, owns_app, panel = self._setup_panel()
- try:
- self.assertEqual("JPG", panel._filter_jpg.text())
- self.assertTrue(panel._filter_jpg.isChecked())
- finally:
- panel.close()
- if owns_app and app is not None:
- app.quit()
-
- def test_index_keyword_filter_limits_scan_selected_pages_payload(self) -> None:
- app, owns_app, panel = self._setup_panel()
- scans: list[object] = []
- panel.multi_scan_requested.connect(scans.append)
-
- try:
- panel.set_index_links(
- [
- WebIndexLink(
- label="HOME Sprites: Gen 1",
- url="https://example.com/home-gen-1",
- source_page="https://example.com/index",
- ),
- WebIndexLink(
- label="HOME Sprites: Gen 2",
- url="https://example.com/home-gen-2",
- source_page="https://example.com/index",
- ),
- ]
- )
- panel._index_keyword.setText("gen 1")
- panel._select_visible_index_links()
- panel._emit_multi_page_scan()
-
- self.assertEqual(1, len(scans))
- payload = scans[0]
- self.assertIsInstance(payload, dict)
- if isinstance(payload, dict):
- pages = payload.get("pages")
- self.assertIsInstance(pages, list)
- if isinstance(pages, list):
- self.assertEqual(1, len(pages))
- self.assertEqual("HOME Sprites: Gen 1", pages[0].get("label"))
- finally:
- panel.close()
- if owns_app and app is not None:
- app.quit()
-
- def test_found_index_links_are_selected_by_default_for_scanning(self) -> None:
- app, owns_app, panel = self._setup_panel()
- scans: list[object] = []
- panel.multi_scan_requested.connect(scans.append)
-
- try:
- panel.set_index_links(
- [
- WebIndexLink(
- label="HOME Sprites: Gen 1",
- url="https://example.com/home-gen-1",
- source_page="https://example.com/index",
- ),
- WebIndexLink(
- label="Animations",
- url="https://example.com/animations",
- source_page="https://example.com/index",
- ),
- ]
+ self.assertEqual(
+ ["Select All Visible Files", "Clear File Selection", "Clear Found Files"],
+ found,
)
- panel._emit_multi_page_scan()
-
- self.assertEqual(1, len(scans))
- payload = scans[0]
- self.assertIsInstance(payload, dict)
- if isinstance(payload, dict):
- pages = payload.get("pages")
- self.assertIsInstance(pages, list)
- if isinstance(pages, list):
- self.assertEqual(2, len(pages))
finally:
- panel.close()
- if owns_app and app is not None:
- app.quit()
+ self._close(app, owns_app, panel)
- def test_scan_selected_uses_visible_links_when_selection_was_cleared(self) -> None:
+ def test_entered_pages_accept_multiple_domains_and_emit_one_scan_request(self) -> None:
app, owns_app, panel = self._setup_panel()
- scans: list[object] = []
- panel.multi_scan_requested.connect(scans.append)
-
+ requests: list[object] = []
+ panel.scan_requested.connect(requests.append)
try:
- panel.set_index_links(
- [
- WebIndexLink(
- label="HOME Sprites: Gen 1",
- url="https://example.com/home-gen-1",
- source_page="https://example.com/index",
- ),
- WebIndexLink(
- label="HOME Sprites: Gen 2",
- url="https://example.com/home-gen-2",
- source_page="https://example.com/index",
- ),
- ]
+ panel._entered_urls.setPlainText(
+ "example.com/sprites\nhttps://other.example/art\nhttps://other.example/art#duplicate\nnot a url"
)
- panel._index_keyword.setText("gen 2")
- panel._index_links.clearSelection()
- panel._emit_multi_page_scan()
-
- self.assertEqual(1, len(scans))
- payload = scans[0]
- self.assertIsInstance(payload, dict)
- if isinstance(payload, dict):
- pages = payload.get("pages")
- self.assertIsInstance(pages, list)
- if isinstance(pages, list):
- self.assertEqual(1, len(pages))
- self.assertEqual("HOME Sprites: Gen 2", pages[0].get("label"))
- finally:
- panel.close()
- if owns_app and app is not None:
- app.quit()
-
- def test_large_selected_page_scan_warns_and_caps_payload(self) -> None:
- app, owns_app, panel = self._setup_panel()
- scans: list[object] = []
- panel.multi_scan_requested.connect(scans.append)
+ panel._emit_entered_scan()
- try:
- panel.set_index_links(
- [
- WebIndexLink(
- label=f"Page {index}",
- url=f"https://example.com/page-{index}",
- source_page="https://example.com/index",
- )
- for index in range(panel.LINKED_PAGE_SCAN_CAP + 5)
- ]
- )
- panel._select_visible_index_links()
-
- original_confirm = panel.confirm_large_linked_page_scan
- confirm_calls: list[tuple[int, int]] = []
-
- def confirm(page_count: int, *, cap: int | None = None) -> bool:
- confirm_calls.append((page_count, int(cap or 0)))
- return True
-
- panel.confirm_large_linked_page_scan = confirm # type: ignore[method-assign]
- try:
- panel._emit_multi_page_scan()
- finally:
- panel.confirm_large_linked_page_scan = original_confirm # type: ignore[method-assign]
-
- self.assertEqual([(panel.LINKED_PAGE_SCAN_CAP + 5, panel.LINKED_PAGE_SCAN_CAP)], confirm_calls)
- self.assertEqual(1, len(scans))
- payload = scans[0]
- self.assertIsInstance(payload, dict)
- if isinstance(payload, dict):
- pages = payload.get("pages")
- self.assertIsInstance(pages, list)
- if isinstance(pages, list):
- self.assertEqual(panel.LINKED_PAGE_SCAN_CAP, len(pages))
+ self.assertEqual(1, len(requests))
+ request = requests[0]
+ self.assertIsInstance(request, WebScanRequest)
+ if isinstance(request, WebScanRequest):
+ self.assertEqual(ScanOrigin.ENTERED, request.origin)
+ self.assertEqual(
+ ("https://example.com/sprites", "https://other.example/art"),
+ request.urls,
+ )
+ self.assertIn("2 valid URLs", panel._entered_count.text())
+ self.assertIn("1 invalid", panel._entered_count.text())
+ self.assertIn("1 duplicate", panel._entered_count.text())
finally:
- panel.close()
- if owns_app and app is not None:
- app.quit()
+ self._close(app, owns_app, panel)
- def test_large_selected_page_scan_can_be_cancelled_before_emit(self) -> None:
+ def test_save_entered_pages_groups_by_host_and_dedupes(self) -> None:
app, owns_app, panel = self._setup_panel()
- scans: list[object] = []
- panel.multi_scan_requested.connect(scans.append)
-
+ changes: list[object] = []
+ panel.registry_changed.connect(changes.append)
try:
- panel.set_index_links(
- [
- WebIndexLink(label=f"Page {index}", url=f"https://example.com/page-{index}")
- for index in range(panel.LINKED_PAGE_SCAN_CAP + 1)
- ]
+ panel._entered_urls.setPlainText(
+ "https://one.example/sprites/gen-1\nhttps://two.example/art\nhttps://one.example/sprites/gen-1"
)
- panel._select_visible_index_links()
- panel.confirm_large_linked_page_scan = lambda *_args, **_kwargs: False # type: ignore[method-assign]
- panel._emit_multi_page_scan()
-
- self.assertEqual([], scans)
- self.assertIn("cancelled", panel._status.text().lower())
- finally:
- panel.close()
- if owns_app and app is not None:
- app.quit()
-
- def test_manual_page_urls_emit_multi_scan_payload_with_dedupe(self) -> None:
- app, owns_app, panel = self._setup_panel()
- scans: list[object] = []
- panel.multi_scan_requested.connect(scans.append)
+ panel._save_entered_pages()
+ panel._save_entered_pages()
- try:
- panel._manual_links.setPlainText(
- "\n".join(
- [
- "example.com/sprites/gen-1",
- "https://example.com/sprites/gen-1",
- "ftp://example.com/bad",
- "https://example.com/sprites/gen-2",
- ]
- )
- )
- panel._scan_manual_links_btn.click()
-
- self.assertEqual(1, len(scans))
- payload = scans[0]
- self.assertIsInstance(payload, dict)
- if isinstance(payload, dict):
- pages = payload.get("pages")
- self.assertIsInstance(pages, list)
- if isinstance(pages, list):
- self.assertEqual(2, len(pages))
- self.assertEqual("https://example.com/sprites/gen-1", pages[0].get("url"))
- self.assertEqual("https://example.com/sprites/gen-2", pages[1].get("url"))
- self.assertIn("skipped", panel._status.text().lower())
- self.assertIn("invalid", panel._status.text().lower())
- self.assertIn("duplicate", panel._status.text().lower())
+ registry = panel.sources_registry()
+ self.assertEqual(2, len(registry))
+ self.assertEqual(2, sum(len(site["areas"]) for site in registry))
+ self.assertEqual(2, len(changes))
+ self.assertIn("skipped 2 already saved", panel._status.text())
finally:
- panel.close()
- if owns_app and app is not None:
- app.quit()
+ self._close(app, owns_app, panel)
- def test_large_manual_page_scan_warns_and_caps_payload(self) -> None:
+ def test_saved_tree_scans_checked_pages_across_websites_through_same_call(self) -> None:
app, owns_app, panel = self._setup_panel()
- scans: list[object] = []
- panel.multi_scan_requested.connect(scans.append)
-
+ requests: list[object] = []
+ panel.scan_requested.connect(requests.append)
try:
- panel._manual_links.setPlainText(
- "\n".join(
- f"https://example.com/page-{index}"
- for index in range(panel.LINKED_PAGE_SCAN_CAP + 3)
+ panel.set_sources(websites=self._registry())
+ panel._saved_tree.topLevelItem(0).child(0).setCheckState(0, Qt.CheckState.Checked)
+ panel._saved_tree.topLevelItem(1).child(0).setCheckState(0, Qt.CheckState.Checked)
+ panel._emit_saved_scan()
+
+ request = requests[0]
+ self.assertIsInstance(request, WebScanRequest)
+ if isinstance(request, WebScanRequest):
+ self.assertEqual(ScanOrigin.SAVED, request.origin)
+ self.assertEqual(
+ ("https://site-a.example/sprites", "https://site-b.example/sprites"),
+ request.urls,
)
- )
- confirm_calls: list[tuple[int, int]] = []
-
- def confirm(page_count: int, *, cap: int | None = None) -> bool:
- confirm_calls.append((page_count, int(cap or 0)))
- return True
-
- panel.confirm_large_linked_page_scan = confirm # type: ignore[method-assign]
- panel._scan_manual_links_btn.click()
-
- self.assertEqual([(panel.LINKED_PAGE_SCAN_CAP + 3, panel.LINKED_PAGE_SCAN_CAP)], confirm_calls)
- self.assertEqual(1, len(scans))
- payload = scans[0]
- self.assertIsInstance(payload, dict)
- if isinstance(payload, dict):
- pages = payload.get("pages")
- self.assertIsInstance(pages, list)
- if isinstance(pages, list):
- self.assertEqual(panel.LINKED_PAGE_SCAN_CAP, len(pages))
+ self.assertIsNone(request.website_id)
+ self.assertIsNone(request.area_id)
finally:
- panel.close()
- if owns_app and app is not None:
- app.quit()
+ self._close(app, owns_app, panel)
- def test_find_linked_pages_emits_custom_index_url_payload(self) -> None:
+ def test_saved_tree_falls_back_to_current_page_when_none_are_checked(self) -> None:
app, owns_app, panel = self._setup_panel()
requests: list[object] = []
- panel.index_links_requested.connect(requests.append)
-
+ panel.scan_requested.connect(requests.append)
try:
- panel._custom_url.setText("example.com/sprite-index")
- panel._find_index_links_btn.click()
-
- self.assertEqual(1, len(requests))
- payload = requests[0]
- self.assertIsInstance(payload, dict)
- if isinstance(payload, dict):
- self.assertEqual("https://example.com/sprite-index", payload.get("index_url"))
+ panel.set_sources(websites=self._registry(), selected_website_id="site_a", selected_area_id="page_b")
+ panel._emit_saved_scan()
+ request = requests[0]
+ self.assertIsInstance(request, WebScanRequest)
+ if isinstance(request, WebScanRequest):
+ self.assertEqual(("https://site-a.example/other",), request.urls)
+ self.assertEqual("site_a", request.website_id)
+ self.assertEqual("page_b", request.area_id)
finally:
- panel.close()
- if owns_app and app is not None:
- app.quit()
+ self._close(app, owns_app, panel)
- def test_find_and_scan_all_emits_custom_index_url_payload(self) -> None:
+ def test_discover_from_dropdown_exposes_entered_and_saved_pages(self) -> None:
app, owns_app, panel = self._setup_panel()
requests: list[object] = []
- panel.index_scan_all_requested.connect(requests.append)
-
+ panel.discover_links_requested.connect(requests.append)
try:
- panel._custom_url.setText("example.com/sprite-index")
- panel._emit_index_scan_all()
-
- self.assertEqual(1, len(requests))
- payload = requests[0]
- self.assertIsInstance(payload, dict)
- if isinstance(payload, dict):
- self.assertEqual("https://example.com/sprite-index", payload.get("index_url"))
+ panel.set_sources(websites=self._registry())
+ panel._entered_urls.setPlainText("https://entered.example/index")
+
+ self.assertEqual(4, panel._link_source.count())
+ self.assertTrue(panel._link_source.itemText(0).startswith("Entered:"))
+ self.assertTrue(panel._link_source.itemText(1).startswith("Saved:"))
+
+ panel._link_source.setCurrentIndex(2)
+ panel._emit_discover_links()
+ request = requests[0]
+ self.assertIsInstance(request, WebLinkDiscoveryRequest)
+ if isinstance(request, WebLinkDiscoveryRequest):
+ self.assertEqual("https://site-a.example/other", request.url)
+ self.assertEqual("site_a", request.website_id)
+ self.assertEqual("page_b", request.area_id)
finally:
- panel.close()
- if owns_app and app is not None:
- app.quit()
+ self._close(app, owns_app, panel)
- def test_result_search_matches_url_and_source_page(self) -> None:
+ def test_linked_pages_filter_and_selection_emit_unified_scan_request(self) -> None:
app, owns_app, panel = self._setup_panel()
+ requests: list[object] = []
+ panel.scan_requested.connect(requests.append)
try:
- panel.set_results(
- ScanResults(
- items=(
- WebItem(
- url="https://cdn.example.com/bulbasaur.png",
- name="001.png",
- ext=".png",
- confidence=Confidence.DIRECT,
- source_page="https://example.com/home-gen-1",
- ),
- WebItem(
- url="https://cdn.example.com/charmander.png",
- name="004.png",
- ext=".png",
- confidence=Confidence.DIRECT,
- source_page="https://example.com/home-gen-1",
- ),
- ),
- filtered_count=0,
+ panel._entered_urls.setPlainText("https://example.com/index")
+ panel.set_index_links(
+ (
+ WebIndexLink("Generation 1", "https://example.com/gen-1"),
+ WebIndexLink("Generation 2", "https://example.com/gen-2"),
)
)
- panel._search.setText("bulbasaur")
- self.assertEqual(1, panel._results.count())
- panel._search.setText("home-gen-1")
- self.assertEqual(2, panel._results.count())
+ panel._clear_link_selection()
+ panel._links_search.setText("gen-2")
+ panel._select_visible_links()
+ panel._emit_linked_scan()
+
+ request = requests[0]
+ self.assertIsInstance(request, WebScanRequest)
+ if isinstance(request, WebScanRequest):
+ self.assertEqual(ScanOrigin.LINKED, request.origin)
+ self.assertEqual(("https://example.com/gen-2",), request.urls)
finally:
- panel.close()
- if owns_app and app is not None:
- app.quit()
+ self._close(app, owns_app, panel)
- def test_result_exclude_keywords_hide_matching_names_urls_and_source_pages(self) -> None:
+ def test_linked_scan_requires_real_selection_instead_of_hidden_fallback(self) -> None:
app, owns_app, panel = self._setup_panel()
+ requests: list[object] = []
+ panel.scan_requested.connect(requests.append)
try:
- panel.set_results(
- ScanResults(
- items=(
- WebItem(
- url="https://cdn.example.com/bulbasaur.png",
- name="bulbasaur.png",
- ext=".png",
- confidence=Confidence.DIRECT,
- source_page="https://example.com/home-gen-1",
- ),
- WebItem(
- url="https://cdn.example.com/bulbasaur_shiny.png",
- name="bulbasaur_shiny.png",
- ext=".png",
- confidence=Confidence.DIRECT,
- source_page="https://example.com/home-gen-1",
- ),
- WebItem(
- url="https://cdn.example.com/charmander.png",
- name="charmander.png",
- ext=".png",
- confidence=Confidence.DIRECT,
- source_page="https://example.com/shiny-index",
- ),
- ),
- filtered_count=0,
- )
- )
-
- panel._exclude_keywords.setText("shiny")
-
- self.assertEqual(1, panel._results.count())
- self.assertIn("bulbasaur.png", panel._results.item(0).text())
+ panel.set_index_links((WebIndexLink("Page", "https://example.com/page"),))
+ panel._clear_link_selection()
+ panel._emit_linked_scan()
+ self.assertEqual([], requests)
+ self.assertIn("Select one or more linked pages", panel._status.text())
finally:
- panel.close()
- if owns_app and app is not None:
- app.quit()
+ self._close(app, owns_app, panel)
- def test_set_results_explains_when_search_filters_hide_all_items(self) -> None:
+ def test_results_accumulate_dedupe_and_keep_selection(self) -> None:
app, owns_app, panel = self._setup_panel()
+ first = self._item("a.png")
+ second = self._item("b.png")
try:
- panel._search.setText("missing")
- panel.set_results(
+ panel.set_results(ScanResults(items=(first,)))
+ panel._results.topLevelItem(0).setSelected(True)
+ panel._on_result_selection_changed()
+ panel.add_results(
ScanResults(
items=(
WebItem(
- url="https://cdn.example.com/bulbasaur.png",
- name="bulbasaur.png",
+ url="HTTPS://CDN.EXAMPLE.COM/a.png#preview",
+ name="duplicate.png",
ext=".png",
confidence=Confidence.DIRECT,
- source_page="https://example.com/home-gen-1",
),
- ),
- filtered_count=0,
+ second,
+ )
)
)
- self.assertEqual(0, panel._results.count())
- self.assertIn("hide", panel._status.text().lower())
+ self.assertEqual((first, second), panel.found_items())
+ self.assertEqual([first], panel._selected_result_items())
+ self.assertIn("Added 1 new item", panel._status.text())
+ self.assertIn("ignored 1 duplicate", panel._status.text())
finally:
- panel.close()
- if owns_app and app is not None:
- app.quit()
+ self._close(app, owns_app, panel)
- def test_set_results_reports_failed_pages_from_multi_page_scan(self) -> None:
+ def test_failed_scan_keeps_previous_results_and_reports_details(self) -> None:
app, owns_app, panel = self._setup_panel()
+ first = self._item("a.png")
try:
- panel.set_results(
- ScanResults(
- items=(
- WebItem(
- url="https://cdn.example.com/bulbasaur.png",
- name="bulbasaur.png",
- ext=".png",
- confidence=Confidence.DIRECT,
- source_page="https://example.com/good",
- ),
- ),
- filtered_count=0,
- failed_pages=("https://example.com/slow: timed out",),
- )
+ panel.add_results(ScanResults(items=(first,)))
+ panel.add_results(
+ ScanResults(items=(), failed_pages=("https://example.com/slow: Network timeout",))
)
-
- self.assertEqual(1, panel._results.count())
+ self.assertEqual((first,), panel.found_items())
self.assertIn("1 page failed", panel._status.text())
- self.assertIn("Hover for details", panel._status.text())
- self.assertIn("https://example.com/slow", panel._status.toolTip())
+ self.assertIn("example.com/slow", panel._status.toolTip())
finally:
- panel.close()
- if owns_app and app is not None:
- app.quit()
+ self._close(app, owns_app, panel)
- def test_set_results_reports_when_all_pages_failed(self) -> None:
+ def test_result_search_exclusion_and_file_type_filters_are_independent(self) -> None:
app, owns_app, panel = self._setup_panel()
try:
panel.set_results(
ScanResults(
- items=(),
- filtered_count=0,
- failed_pages=("https://example.com/slow: timed out",),
+ items=(
+ self._item("bulbasaur.png", source="https://example.com/gen-1"),
+ self._item("bulbasaur_shiny.gif", source="https://example.com/gen-1"),
+ self._item("charmander.png", source="https://example.com/gen-2"),
+ )
)
)
-
- self.assertEqual(0, panel._results.count())
- self.assertIn("Found 0 item", panel._status.text())
- self.assertIn("1 page failed", panel._status.text())
- self.assertIn("https://example.com/slow", panel._status.toolTip())
+ panel._results_search.setText("gen-1")
+ self.assertEqual(2, panel._results.topLevelItemCount())
+ panel._exclude_words.setText("shiny")
+ self.assertEqual(1, panel._results.topLevelItemCount())
+ panel._format_actions[".png"].setChecked(False)
+ self.assertEqual(0, panel._results.topLevelItemCount())
+ self.assertIn("hide all stored results", panel._status.text())
finally:
- panel.close()
- if owns_app and app is not None:
- app.quit()
+ self._close(app, owns_app, panel)
- def test_download_area_uses_auto_destination_hint_and_forces_smart_routing(self) -> None:
+ def test_download_emits_typed_request_with_download_options(self) -> None:
app, owns_app, panel = self._setup_panel()
- downloads: list[object] = []
- panel.download_requested.connect(downloads.append)
- panel.set_sources(
- websites=[
- {
- "id": "pokemon_fandom_com",
- "name": "pokemon.fandom.com",
- "areas": [
- {
- "id": "item_sprites",
- "label": "Wiki / Category:item Sprites (Query)",
- "url": "https://pokemon.fandom.com/wiki/Category:Item_sprites",
- }
- ],
- }
- ],
- selected_website_id="pokemon_fandom_com",
- selected_area_id="item_sprites",
- )
- panel.set_results(
- ScanResults(
- items=(
- WebItem(
- url="https://example.com/a.png",
- name="a.png",
- ext=".png",
- confidence=Confidence.DIRECT,
- source_page="https://pokemon.fandom.com/wiki/Category:Item_sprites",
- ),
- ),
- filtered_count=0,
- )
- )
- panel._select_all_visible()
-
+ requests: list[object] = []
+ panel.download_requested.connect(requests.append)
try:
- self.assertFalse(hasattr(panel, "_target"))
- self.assertIn("Sprite Factory routes downloads", panel._destination_hint.text())
- self.assertTrue(panel.smart_options().auto_sort)
-
+ panel.set_results(ScanResults(items=(self._item("a.png"),)))
+ panel._results.topLevelItem(0).setSelected(True)
+ panel._skip_downloaded_action.setChecked(False)
+ panel._allow_zip_action.setChecked(False)
panel._emit_download()
- self.assertEqual(1, len(downloads))
- payload = downloads[0]
- self.assertIsInstance(payload, dict)
- if isinstance(payload, dict):
- self.assertEqual(ImportTarget.NORMAL.value, payload.get("target"))
- self.assertEqual("https://pokemon.fandom.com/wiki/Category:Item_sprites", payload.get("area_url"))
- self.assertEqual("Wiki / Category:item Sprites (Query)", payload.get("area_label"))
- smart = payload.get("smart")
- self.assertIsInstance(smart, dict)
- if isinstance(smart, dict):
- self.assertTrue(smart.get("auto_sort"))
+
+ request = requests[0]
+ self.assertIsInstance(request, WebDownloadRequest)
+ if isinstance(request, WebDownloadRequest):
+ self.assertEqual(1, len(request.items))
+ self.assertFalse(request.smart.skip_duplicates)
+ self.assertFalse(request.smart.allow_zip)
finally:
- panel.close()
- if owns_app and app is not None:
- app.quit()
+ self._close(app, owns_app, panel)
- def test_scan_emits_payload_for_custom_url_without_adding_site(self) -> None:
+ def test_diagnostics_calls_are_specific_to_entered_or_saved_section(self) -> None:
app, owns_app, panel = self._setup_panel()
- scans: list[object] = []
- panel.scan_requested.connect(scans.append)
-
+ requests: list[object] = []
+ panel.diagnostics_requested.connect(requests.append)
try:
- panel._custom_url.setText("example.com/sprites")
- panel._scan_btn.click()
-
- self.assertEqual(1, len(scans))
- payload = scans[0]
- self.assertIsInstance(payload, dict)
- if isinstance(payload, dict):
- self.assertEqual("https://example.com/sprites", payload.get("area_url"))
- self.assertIsNone(payload.get("website_id"))
- self.assertIsNone(payload.get("area_id"))
- self.assertIn("Scanning URL", panel._status.text())
+ panel._entered_urls.setPlainText("https://entered.example/page")
+ panel._diagnose_first_entered_url()
+ panel.set_sources(websites=self._registry(), selected_website_id="site_b", selected_area_id="page_c")
+ panel._diagnose_current_saved_page()
+
+ self.assertEqual(2, len(requests))
+ self.assertEqual("https://entered.example/page", requests[0].url)
+ self.assertEqual("https://site-b.example/sprites", requests[1].url)
+ self.assertTrue(all(isinstance(request, WebDiagnosticsRequest) for request in requests))
finally:
- panel.close()
- if owns_app and app is not None:
- app.quit()
+ self._close(app, owns_app, panel)
- def test_scan_rejects_invalid_custom_url(self) -> None:
+ def test_removing_saved_data_does_not_clear_found_files(self) -> None:
app, owns_app, panel = self._setup_panel()
- scans: list[object] = []
- panel.scan_requested.connect(scans.append)
-
try:
- panel._custom_url.setText("ftp://example.com/sprites")
- panel._scan_btn.click()
-
- self.assertEqual(0, len(scans))
- self.assertEqual("Invalid URL. Use http(s)://domain/path.", panel._status.text())
+ panel.set_sources(websites=self._registry(), selected_website_id="site_a", selected_area_id="page_a")
+ panel.set_results(ScanResults(items=(self._item("a.png"),)))
+ panel._remove_current_saved_page()
+ self.assertEqual(1, len(panel.found_items()))
+ self.assertIn("Found Files were kept", panel._status.text())
finally:
- panel.close()
- if owns_app and app is not None:
- app.quit()
-
+ self._close(app, owns_app, panel)
-
- def test_remove_selected_custom_area_updates_registry_and_emits_change(self) -> None:
+ def test_clear_found_files_is_the_only_result_reset(self) -> None:
app, owns_app, panel = self._setup_panel()
- panel.set_sources(
- websites=[
- {
- "id": "project_pokemon",
- "name": "Project Pokemon",
- "areas": [
- {
- "id": "spriteindex_root",
- "label": "Sprite Index (root)",
- "url": "https://projectpokemon.org/home/docs/spriteindex_148/",
- },
- {
- "id": "custom_docs",
- "label": "Custom Docs",
- "url": "https://projectpokemon.org/home/docs/spriteindex_148/3d-models",
- },
- ],
- }
- ],
- selected_website_id="project_pokemon",
- selected_area_id="custom_docs",
- )
-
- changes: list[list[dict]] = []
- panel.registry_changed.connect(lambda payload: changes.append(payload if isinstance(payload, list) else []))
-
try:
- panel._remove_selected_area()
-
- registry = panel.sources_registry()
- self.assertEqual(1, len(registry))
- areas = registry[0].get("areas") if isinstance(registry[0], dict) else []
- urls = [str(area.get("url", "")) for area in areas if isinstance(area, dict)]
- self.assertIn("https://projectpokemon.org/home/docs/spriteindex_148/", urls)
- self.assertNotIn("https://projectpokemon.org/home/docs/spriteindex_148/3d-models", urls)
- self.assertTrue(changes)
- self.assertIn("Removed URL:", panel._status.text())
+ panel.add_results(ScanResults(items=(self._item("a.png"),)))
+ panel._clear_entered_urls()
+ panel._clear_linked_pages()
+ self.assertEqual(1, len(panel.found_items()))
+ panel._clear_found_files()
+ self.assertEqual((), panel.found_items())
finally:
- panel.close()
- if owns_app and app is not None:
- app.quit()
+ self._close(app, owns_app, panel)
- def test_remove_selected_area_is_allowed_without_builtins(self) -> None:
+ def test_smart_option_actions_emit_preferences_without_hidden_widgets(self) -> None:
app, owns_app, panel = self._setup_panel()
- panel.set_sources(
- websites=[
- {
- "id": "pokemon_db",
- "name": "PokemonDB",
- "areas": [
- {
- "id": "sprites_root",
- "label": "Sprites (All Pokemon)",
- "url": "https://pokemondb.net/sprites",
- }
- ],
- }
- ],
- selected_website_id="pokemon_db",
- selected_area_id="sprites_root",
- )
-
+ changes: list[object] = []
+ panel.preferences_changed.connect(changes.append)
try:
- panel._remove_selected_area()
- registry = panel.sources_registry()
-
- self.assertEqual([], registry)
- self.assertIn("Removed URL:", panel._status.text())
+ panel.set_smart_options(
+ SmartOptions(show_likely=False, skip_duplicates=True, allow_zip=True)
+ )
+ self.assertEqual([], changes)
+ panel._include_likely_action.setChecked(True)
+ self.assertEqual(1, len(changes))
+ self.assertIsInstance(changes[0], SmartOptions)
+ self.assertTrue(changes[0].show_likely)
finally:
- panel.close()
- if owns_app and app is not None:
- app.quit()
+ self._close(app, owns_app, panel)
- def test_remove_selected_custom_website_updates_registry(self) -> None:
+ def test_large_scan_confirmation_is_capped_and_can_be_cancelled(self) -> None:
app, owns_app, panel = self._setup_panel()
- panel.set_sources(
- websites=[
- {
- "id": "pokemon_db",
- "name": "PokemonDB",
- "areas": [
- {
- "id": "sprites_root",
- "label": "Sprites (All Pokemon)",
- "url": "https://pokemondb.net/sprites",
- }
- ],
- },
- {
- "id": "example_com",
- "name": "example.com",
- "areas": [
- {
- "id": "root",
- "label": "Root",
- "url": "https://example.com/",
- }
- ],
- },
- ],
- selected_website_id="example_com",
- selected_area_id="root",
- )
-
- changes: list[list[dict]] = []
- panel.registry_changed.connect(lambda payload: changes.append(payload if isinstance(payload, list) else []))
-
try:
- panel._remove_selected_website()
-
- registry = panel.sources_registry()
- ids = [str(entry.get("id", "")) for entry in registry if isinstance(entry, dict)]
- self.assertIn("pokemon_db", ids)
- self.assertNotIn("example_com", ids)
- self.assertTrue(changes)
- self.assertIn("Removed website:", panel._status.text())
+ with patch.object(QMessageBox, "question", return_value=QMessageBox.StandardButton.No):
+ self.assertFalse(panel.confirm_large_page_scan(200, cap=100))
+ with patch.object(QMessageBox, "question", return_value=QMessageBox.StandardButton.Yes):
+ self.assertTrue(panel.confirm_large_page_scan(200, cap=100))
+ self.assertTrue(panel.confirm_large_page_scan(100, cap=100))
finally:
- panel.close()
- if owns_app and app is not None:
- app.quit()
-if __name__ == "__main__":
- unittest.main()
+ self._close(app, owns_app, panel)
-
-
-
-
-
-
+if __name__ == "__main__":
+ unittest.main()
diff --git a/image_engine_app/tests/test_web_sources_service.py b/image_engine_app/tests/test_web_sources_service.py
index d9e9e90..23723b6 100644
--- a/image_engine_app/tests/test_web_sources_service.py
+++ b/image_engine_app/tests/test_web_sources_service.py
@@ -266,8 +266,62 @@ def import_url_source(url, **kwargs): # noqa: ANN001
headers["Referer"],
)
+ def test_download_items_keeps_going_when_media_resolution_fails(self) -> None:
+ imported_urls: list[str] = []
+
+ def import_url_source(url, **_kwargs): # noqa: ANN001
+ imported_urls.append(url)
+ return SimpleNamespace(
+ asset=AssetRecord(
+ source_type=SourceType.WEBPAGE_ITEM,
+ source_uri=url,
+ cache_path="good.png",
+ original_name="good.png",
+ format=AssetFormat.PNG,
+ )
+ )
+
+ service = WebSourcesService(
+ app_paths=None,
+ scan_webpage_images=lambda *_args, **_kwargs: None,
+ import_url_source=import_url_source,
+ build_web_asset_from_file=lambda **_kwargs: None,
+ )
+
+ def resolve_download_url(*, item, canonical_url, **_kwargs): # noqa: ANN001
+ if item.name == "bad.png":
+ raise TimeoutError("media lookup timed out")
+ return canonical_url
+
+ service.resolve_download_url = resolve_download_url # type: ignore[method-assign]
+ items = [
+ WebItem(
+ url="https://example.com/bad.png",
+ name="bad.png",
+ ext=".png",
+ confidence=Confidence.DIRECT,
+ ),
+ WebItem(
+ url="https://example.com/good.png",
+ name="good.png",
+ ext=".png",
+ confidence=Confidence.DIRECT,
+ ),
+ ]
+
+ report = service.download_items(
+ items,
+ ImportTarget.NORMAL,
+ smart=SmartOptions(show_likely=False, auto_sort=True, skip_duplicates=False, allow_zip=True),
+ )
+
+ self.assertEqual(["https://example.com/good.png"], imported_urls)
+ self.assertEqual(1, len(report.assets))
+ self.assertEqual(1, len(report.failed))
+ self.assertIn("bad.png: media lookup timed out", report.failed[0])
+
if __name__ == "__main__":
unittest.main()
-
-
+
+
diff --git a/image_engine_app/ui/common/shell_theme.py b/image_engine_app/ui/common/shell_theme.py
index 32d36a6..ff25e28 100644
--- a/image_engine_app/ui/common/shell_theme.py
+++ b/image_engine_app/ui/common/shell_theme.py
@@ -530,9 +530,19 @@ def build_app_stylesheet() -> str:
color: #285d5b;
font-weight: 800;
}
+ QLabel#webSourcesCountBadge {
+ border: 1px solid #d2d9d3;
+ border-radius: 8px;
+ background: #f5f3ed;
+ color: #5a6d72;
+ padding: 3px 7px;
+ font-size: 9px;
+ font-weight: 700;
+ }
QListWidget#webSourcesIndexList,
- QListWidget#webSourcesResultsList,
- QPlainTextEdit#webSourcesManualList {
+ QTreeWidget#webSourcesSavedTree,
+ QTreeWidget#webSourcesResultsTree,
+ QPlainTextEdit#webSourcesUrlList {
border: 1px solid #d2d9d3;
border-radius: 9px;
background: #fffdfa;
@@ -540,6 +550,28 @@ def build_app_stylesheet() -> str:
color: #243940;
font-size: 10px;
}
+ QListWidget#webSourcesIndexList::item,
+ QTreeWidget#webSourcesSavedTree::item,
+ QTreeWidget#webSourcesResultsTree::item {
+ min-height: 20px;
+ border-radius: 5px;
+ padding: 2px 5px;
+ }
+ QListWidget#webSourcesIndexList::item:selected,
+ QTreeWidget#webSourcesSavedTree::item:selected,
+ QTreeWidget#webSourcesResultsTree::item:selected {
+ background: #e8f2ee;
+ color: #254b4d;
+ }
+ QTreeWidget#webSourcesResultsTree QHeaderView::section {
+ background: #f2f0ea;
+ color: #465b61;
+ border: none;
+ border-bottom: 1px solid #d3dad4;
+ padding: 4px 6px;
+ font-size: 9px;
+ font-weight: 700;
+ }
QFrame#previewPanelFrame {
border: 1px solid #cfd8d4;
border-radius: 14px;
diff --git a/image_engine_app/ui/common/state_bindings.py b/image_engine_app/ui/common/state_bindings.py
index 60f264b..7e9d0d3 100644
--- a/image_engine_app/ui/common/state_bindings.py
+++ b/image_engine_app/ui/common/state_bindings.py
@@ -1,4 +1,4 @@
-"""Lightweight Qt state bindings for engine state -> UI integration (Prompt 16)."""
+"""Qt signals and state shared by the Sprite Factory workspace controls."""
from __future__ import annotations
@@ -8,7 +8,6 @@
from PySide6.QtCore import QObject, Signal
from image_engine_app.engine.models import (
- ApplyTarget,
AssetRecord,
BackgroundRemovalMode,
EditMode,
@@ -17,6 +16,7 @@
normalize_background_removal_mode,
normalize_edit_mode,
)
+from image_engine_app.engine.export.profiles import get_profile_rule
@dataclass(frozen=True)
@@ -28,20 +28,11 @@ class HeavyQueueState:
class EngineUIState(QObject):
- """
- Lightweight UI binding store.
-
- This intentionally does not implement the processing engine. It tracks active session/asset,
- UI selections, and emits signals so the Prompt 16 UI shell can stay decoupled from later engine
- wiring.
- """
+ """Track active UI state without taking ownership of engine processing."""
session_changed = Signal(object)
active_asset_changed = Signal(object)
mode_changed = Signal(str)
- apply_target_changed = Signal(str)
- sync_changed = Signal(bool)
- auto_apply_light_changed = Signal(bool)
background_removal_mode_changed = Signal(str)
heavy_queue_state_changed = Signal(object)
export_prediction_changed = Signal(str)
@@ -50,8 +41,6 @@ class EngineUIState(QObject):
apply_requested = Signal()
light_preview_requested = Signal()
export_requested = Signal()
- undo_requested = Signal()
- redo_requested = Signal()
global_reset_requested = Signal()
reset_view_requested = Signal()
@@ -87,9 +76,6 @@ def set_active_asset(self, asset: AssetRecord | None) -> None:
self.active_asset_changed.emit(asset)
if asset is None:
self.mode_changed.emit(EditMode.ADVANCED.value)
- self.apply_target_changed.emit(ApplyTarget.BOTH.value)
- self.sync_changed.emit(True)
- self.auto_apply_light_changed.emit(True)
self.background_removal_mode_changed.emit(BackgroundRemovalMode.OFF.value)
self.set_heavy_queue_counts(queued_count=0, running_count=0)
return
@@ -104,25 +90,6 @@ def set_mode(self, mode: EditMode | str) -> None:
asset.edit_state.mode = mode_enum
self.mode_changed.emit(mode_enum.value)
- def set_apply_target(self, target: ApplyTarget | str) -> None:
- asset = self._active_asset
- target_enum = target if isinstance(target, ApplyTarget) else ApplyTarget(str(target))
- if asset is not None:
- asset.edit_state.apply_target = target_enum
- self.apply_target_changed.emit(target_enum.value)
-
- def set_sync_current_final(self, enabled: bool) -> None:
- asset = self._active_asset
- if asset is not None:
- asset.edit_state.sync_current_final = bool(enabled)
- self.sync_changed.emit(bool(enabled))
-
- def set_auto_apply_light(self, enabled: bool) -> None:
- asset = self._active_asset
- if asset is not None:
- asset.edit_state.auto_apply_light = bool(enabled)
- self.auto_apply_light_changed.emit(bool(enabled))
-
def set_background_removal_mode(self, mode: BackgroundRemovalMode | str) -> None:
asset = self._active_asset
mode_value = normalize_background_removal_mode(mode).value
@@ -139,7 +106,13 @@ def set_export_profile(self, profile: ExportProfile | str) -> None:
if asset is None:
return
profile_enum = profile if isinstance(profile, ExportProfile) else ExportProfile(str(profile))
- asset.edit_state.settings.export.export_profile = profile_enum
+ export = asset.edit_state.settings.export
+ rule = get_profile_rule(profile_enum)
+ export.export_profile = profile_enum
+ export.format = rule.default_format
+ export.quality = rule.default_quality
+ export.compression_level = rule.default_compression_level
+ export.strip_metadata = rule.strip_metadata
self.export_profile_changed.emit(profile_enum.value)
self.status_message_changed.emit(f"Export profile set to {profile_enum.value}")
@@ -153,7 +126,7 @@ def set_heavy_queue_counts(self, *, queued_count: int, running_count: int) -> No
def request_apply(self) -> None:
self.apply_requested.emit()
- self.status_message_changed.emit("Apply requested.")
+ self.status_message_changed.emit("Heavy processing requested.")
def request_light_preview(self) -> None:
"""Request a light-only preview refresh without running heavy queues."""
@@ -163,14 +136,6 @@ def request_export(self) -> None:
self.export_requested.emit()
self.status_message_changed.emit("Export requested.")
- def request_undo(self) -> None:
- self.undo_requested.emit()
- self.status_message_changed.emit("Undo requested.")
-
- def request_redo(self) -> None:
- self.redo_requested.emit()
- self.status_message_changed.emit("Redo requested.")
-
def request_global_reset(self) -> None:
self.global_reset_requested.emit()
self.status_message_changed.emit("Global reset requested.")
@@ -184,15 +149,8 @@ def _emit_asset_mode_and_controls(self) -> None:
if asset is None:
return
self.mode_changed.emit(asset.edit_state.mode.value)
- self.apply_target_changed.emit(asset.edit_state.apply_target.value)
- self.sync_changed.emit(asset.edit_state.sync_current_final)
- self.auto_apply_light_changed.emit(asset.edit_state.auto_apply_light)
mode_value = normalize_background_removal_mode(
getattr(asset.edit_state.settings.alpha, "background_removal_mode", None),
remove_white_bg=bool(getattr(asset.edit_state.settings.alpha, "remove_white_bg", False)),
).value
self.background_removal_mode_changed.emit(mode_value)
-
-
-
-
diff --git a/image_engine_app/ui/main_window/__init__.py b/image_engine_app/ui/main_window/__init__.py
index 22f02b3..078b985 100644
--- a/image_engine_app/ui/main_window/__init__.py
+++ b/image_engine_app/ui/main_window/__init__.py
@@ -9,7 +9,6 @@
"ApplyCoordinator",
"BatchCoordinator",
"ControlStrip",
- "EncodingCoordinator",
"ExportBar",
"ExportCoordinator",
"ImageEngineMainWindow",
@@ -29,7 +28,6 @@
"WorkspaceAssetTabs": "asset_tabs",
"BatchCoordinator": "batch_coordinator",
"ControlStrip": "control_strip",
- "EncodingCoordinator": "encoding_coordinator",
"ExportBar": "export_bar",
"ExportCoordinator": "export_coordinator",
"ImageEngineMainWindow": "main_window",
@@ -59,7 +57,6 @@ def __getattr__(name: str) -> object:
from .asset_tabs import WorkspaceAssetTabs
from .batch_coordinator import BatchCoordinator
from .control_strip import ControlStrip
- from .encoding_coordinator import EncodingCoordinator
from .export_bar import ExportBar
from .export_coordinator import ExportCoordinator
from .local_import_coordinator import LocalImportCoordinator
@@ -70,4 +67,4 @@ def __getattr__(name: str) -> object:
from .shell_coordinator import ShellCoordinator
from .workspace_coordinator import WorkspaceCoordinator
from .web_sources_coordinator import WebSourcesCoordinator
- from .web_sources_panel import WebSourcesPanel
+ from .web_sources_panel import WebSourcesPanel
diff --git a/image_engine_app/ui/main_window/apply_coordinator.py b/image_engine_app/ui/main_window/apply_coordinator.py
index af62de2..93a4b11 100644
--- a/image_engine_app/ui/main_window/apply_coordinator.py
+++ b/image_engine_app/ui/main_window/apply_coordinator.py
@@ -82,7 +82,6 @@ def on_preset_requested(self, preset_name: str) -> None:
return
try:
- self._window.controller.reset_asset_settings_to_defaults(asset)
summary = self._window.controller.apply_named_preset(asset, preset_name)
except PresetApplyError as exc:
self._window._status(f"Preset skipped: {exc}")
@@ -123,7 +122,7 @@ def on_global_reset_requested(self) -> None:
return
try:
- self._window.controller.reset_asset_settings_to_defaults(asset)
+ self._window.controller.restore_asset_detected_settings(asset)
self._window.controller.apply_light_pipeline(asset)
self._window.ui_state.set_active_asset(asset)
self._window.ui_state.set_heavy_queue_counts(
@@ -131,7 +130,7 @@ def on_global_reset_requested(self) -> None:
running_count=0,
)
self._window._refresh_export_prediction()
- self._window._status("Reset active asset edits to defaults")
+ self._window._status("Reset active asset edits to detected controls")
except Exception as exc:
self._window._status(f"Reset failed: {exc}")
-
+
diff --git a/image_engine_app/ui/main_window/batch_coordinator.py b/image_engine_app/ui/main_window/batch_coordinator.py
index 53a74ef..912e47a 100644
--- a/image_engine_app/ui/main_window/batch_coordinator.py
+++ b/image_engine_app/ui/main_window/batch_coordinator.py
@@ -6,7 +6,7 @@
from typing import Any
from image_engine_app.app.ui_controller import ImageEngineUIController
-from image_engine_app.engine.models import AssetRecord, normalize_background_removal_mode
+from image_engine_app.engine.models import AssetRecord, BatchEditSource, normalize_background_removal_mode
from image_engine_app.ui.main_window.batch_run_prep import prepare_batch_assets
from PySide6.QtCore import QObject, Qt, QThread, Signal, Slot
@@ -131,13 +131,21 @@ def on_run_requested(self, options_obj: object) -> None:
self._window._status("Batch run already in progress")
return
- auto_preset = bool(getattr(options_obj, "auto_preset", True))
+ raw_edit_source = getattr(options_obj, "edit_source", BatchEditSource.KEEP_EACH)
+ try:
+ edit_source = (
+ raw_edit_source
+ if isinstance(raw_edit_source, BatchEditSource)
+ else BatchEditSource(str(raw_edit_source))
+ )
+ except ValueError:
+ self._window._status("Batch run skipped: choose a valid edit source")
+ return
+ auto_preset = edit_source is BatchEditSource.SMART_MATCH
auto_export = bool(getattr(options_obj, "auto_export", True))
preview_skip = bool(getattr(options_obj, "preview_skip_mode", True))
export_name_template = str(getattr(options_obj, "export_name_template", "{stem}"))
avoid_overwrite = bool(getattr(options_obj, "avoid_overwrite", True))
- apply_active_edits = bool(getattr(options_obj, "apply_active_edits", False))
- apply_selected_preset = bool(getattr(options_obj, "apply_selected_preset", False))
selected_preset_name = str(getattr(options_obj, "selected_preset_name", "") or "").strip()
background_override_raw = getattr(options_obj, "background_removal_override", None)
background_override = (
@@ -161,9 +169,7 @@ def on_run_requested(self, options_obj: object) -> None:
selected_assets=selected_assets,
active_asset=self._window.ui_state.active_asset,
controller=self._window.controller,
- auto_export=auto_export,
- apply_active_edits=apply_active_edits,
- apply_selected_preset=apply_selected_preset,
+ edit_source=edit_source,
selected_preset_name=selected_preset_name,
background_override=background_override,
)
@@ -181,15 +187,13 @@ def on_run_requested(self, options_obj: object) -> None:
)
LOGGER.info(
- "Batch run requested: selected=%s auto_export=%s auto_preset=%s preview_skip=%s export_dir=%s template=%s apply_active_edits=%s apply_selected_preset=%s preset=%s bg_override=%s",
+ "Batch run requested: selected=%s edit_source=%s auto_export=%s preview_skip=%s export_dir=%s template=%s preset=%s bg_override=%s",
len(batch_assets),
+ edit_source.value,
auto_export,
- auto_preset,
preview_skip,
export_dir,
export_name_template,
- apply_active_edits,
- apply_selected_preset,
selected_preset_name,
background_override,
)
@@ -317,7 +321,7 @@ def _resolve_export_directory(self, candidate: object) -> str | None:
if isinstance(fallback, str) and fallback.strip():
return fallback.strip()
return None
-
-
-
-
+
+
+
+
diff --git a/image_engine_app/ui/main_window/batch_run_prep.py b/image_engine_app/ui/main_window/batch_run_prep.py
index 099a4df..ae00754 100644
--- a/image_engine_app/ui/main_window/batch_run_prep.py
+++ b/image_engine_app/ui/main_window/batch_run_prep.py
@@ -6,7 +6,12 @@
from dataclasses import dataclass
from typing import Any
-from image_engine_app.engine.models import AssetRecord, BackgroundRemovalMode, normalize_background_removal_mode
+from image_engine_app.engine.models import (
+ AssetRecord,
+ BackgroundRemovalMode,
+ BatchEditSource,
+ normalize_background_removal_mode,
+)
from image_engine_app.engine.process.presets_apply import PresetApplyError
@@ -22,26 +27,23 @@ def prepare_batch_assets(
selected_assets: list[AssetRecord],
active_asset: AssetRecord | None,
controller: Any,
- auto_export: bool,
- apply_active_edits: bool,
- apply_selected_preset: bool,
+ edit_source: BatchEditSource,
selected_preset_name: str,
background_override: str | None,
) -> BatchPreparationResult:
assets = [deepcopy(asset) for asset in selected_assets]
_clear_derived_outputs(assets)
- if auto_export and active_asset is not None:
- _apply_active_export_settings(active_asset, assets)
-
- if apply_active_edits and active_asset is not None:
+ if edit_source is BatchEditSource.COPY_ACTIVE:
+ if active_asset is None:
+ raise ValueError("select an active asset before copying its controls")
_apply_active_edit_settings(active_asset, assets)
applied_preset_count = 0
skipped_preset_count = 0
- if apply_selected_preset:
+ if edit_source is BatchEditSource.CHOSEN_PRESET:
if not selected_preset_name:
- raise ValueError("choose a preset or disable preset apply")
+ raise ValueError("choose a preset for this batch")
applied_preset_count, skipped_preset_count = _apply_named_preset_to_assets(
controller,
assets,
@@ -58,23 +60,13 @@ def prepare_batch_assets(
)
-def _apply_active_export_settings(active_asset: AssetRecord, assets: list[AssetRecord]) -> None:
- template = deepcopy(active_asset.edit_state.settings.export)
- for asset in assets:
- asset.edit_state.settings.export = deepcopy(template)
-
-
def _apply_active_edit_settings(active_asset: AssetRecord, assets: list[AssetRecord]) -> None:
template_mode = deepcopy(active_asset.edit_state.mode)
- template_apply_target = deepcopy(active_asset.edit_state.apply_target)
- template_sync = bool(active_asset.edit_state.sync_current_final)
template_heavy_jobs = deepcopy(active_asset.edit_state.queued_heavy_jobs)
template_settings = deepcopy(active_asset.edit_state.settings)
for asset in assets:
asset.edit_state.mode = deepcopy(template_mode)
- asset.edit_state.apply_target = deepcopy(template_apply_target)
- asset.edit_state.sync_current_final = template_sync
asset.edit_state.queued_heavy_jobs = deepcopy(template_heavy_jobs)
asset.edit_state.settings = deepcopy(template_settings)
diff --git a/image_engine_app/ui/main_window/control_strip.py b/image_engine_app/ui/main_window/control_strip.py
index df75c41..e019a1f 100644
--- a/image_engine_app/ui/main_window/control_strip.py
+++ b/image_engine_app/ui/main_window/control_strip.py
@@ -1,13 +1,10 @@
-"""Preview control strip for apply targets, live behavior, and workspace actions."""
+"""Preview controls for presets, background handling, and processing actions."""
from __future__ import annotations
-from functools import partial
-
from PySide6.QtCore import Qt, Signal
from PySide6.QtGui import QAction, QActionGroup
from PySide6.QtWidgets import (
- QButtonGroup,
QFrame,
QHBoxLayout,
QLabel,
@@ -18,7 +15,7 @@
QWidget,
)
-from image_engine_app.engine.models import ApplyTarget, BackgroundRemovalMode
+from image_engine_app.engine.models import BackgroundRemovalMode
from image_engine_app.ui.common.icons import icon
from image_engine_app.ui.common.state_bindings import EngineUIState
from image_engine_app.ui.main_window.control_strip_state import ControlStripViewState, build_control_strip_view_state
@@ -33,21 +30,15 @@ class ControlStrip(QFrame):
def __init__(self, parent: QWidget | None = None) -> None:
super().__init__(parent)
self._ui_state: EngineUIState | None = None
- self._apply_target_buttons: dict[str, QToolButton] = {}
- self._scope_group: QFrame | None = None
- self._behavior_group: QFrame | None = None
self._actions_group: QFrame | None = None
self._header_summary = QLabel(self)
self._queue_badge = QLabel(self)
- self._target_badge = QLabel(self)
self._preset_button = QToolButton(self)
self._preset_menu = QMenu(self._preset_button)
self._background_button = QToolButton(self)
self._background_mode_actions: dict[str, QAction] = {}
- self._sync_button = QToolButton(self)
- self._auto_apply_button = QToolButton(self)
- self._preview_button = QPushButton(self)
- self._apply_button = QPushButton(self)
+ self._run_button = QPushButton(self)
+ self._run_heavy = False
self._options_button = QToolButton(self)
self._reset_settings_action = QAction(icon("reset"), "Reset Edits", self)
self._reset_view_action = QAction(icon("reset"), "Reset View", self)
@@ -94,9 +85,6 @@ def set_preset_entries(self, entries: list[object], *, has_asset: bool) -> None:
def bind_state(self, ui_state: EngineUIState) -> None:
self._ui_state = ui_state
- ui_state.apply_target_changed.connect(self._on_apply_target_changed)
- ui_state.sync_changed.connect(self._on_sync_changed)
- ui_state.auto_apply_light_changed.connect(self._on_auto_apply_light_changed)
ui_state.background_removal_mode_changed.connect(self._on_background_mode_changed)
ui_state.active_asset_changed.connect(self._on_active_asset_changed)
ui_state.heavy_queue_state_changed.connect(self._on_heavy_queue_state_changed)
@@ -151,11 +139,6 @@ def _build_ui(self) -> None:
self._background_button.setFixedSize(88, 26)
header.addWidget(self._background_button, 0)
- self._target_badge.setObjectName("controlStripHeaderBadge")
- self._target_badge.setFixedSize(88, 26)
- self._target_badge.setAlignment(Qt.AlignmentFlag.AlignCenter)
- header.addWidget(self._target_badge, 0)
-
self._queue_badge.setObjectName("controlStripHeaderBadge")
self._queue_badge.setFixedSize(84, 26)
self._queue_badge.setAlignment(Qt.AlignmentFlag.AlignCenter)
@@ -166,54 +149,11 @@ def _build_ui(self) -> None:
body = QHBoxLayout()
body.setSpacing(8)
- self._scope_group, scope_layout = self._create_group("TARGET")
- apply_group = QButtonGroup(self)
- apply_group.setExclusive(True)
- for value, label_text in (
- (ApplyTarget.CURRENT.value, "Current"),
- (ApplyTarget.FINAL.value, "Final"),
- (ApplyTarget.BOTH.value, "Both"),
- ):
- btn = QToolButton(self)
- btn.setObjectName("controlStripChip")
- btn.setText(label_text)
- btn.setCheckable(True)
- btn.setToolTip(f"Apply to {value}")
- btn.clicked.connect(partial(self._emit_apply_target, value))
- apply_group.addButton(btn)
- self._apply_target_buttons[value] = btn
- scope_layout.addWidget(btn)
- scope_layout.addStretch(1)
- body.addWidget(self._scope_group, 1)
-
- self._behavior_group, behavior_layout = self._create_group("LIVE")
- self._sync_button.setObjectName("controlStripToggle")
- self._sync_button.setText("Link")
- self._sync_button.setToolTip("Keep current and final previews linked")
- self._sync_button.setCheckable(True)
- self._sync_button.clicked.connect(self._emit_sync_change)
- behavior_layout.addWidget(self._sync_button)
-
- self._auto_apply_button.setObjectName("controlStripToggle")
- self._auto_apply_button.setText("Auto")
- self._auto_apply_button.setToolTip("Auto-run light preview while editing")
- self._auto_apply_button.setCheckable(True)
- self._auto_apply_button.clicked.connect(self._emit_auto_apply_change)
- behavior_layout.addWidget(self._auto_apply_button)
- behavior_layout.addStretch(1)
- body.addWidget(self._behavior_group, 1)
-
- self._actions_group, action_layout = self._create_group("RUN")
- self._preview_button.setObjectName("controlStripSecondaryAction")
- self._preview_button.setText("Preview")
- self._preview_button.setIcon(icon("apply"))
- self._preview_button.clicked.connect(self._emit_light_preview_requested)
- action_layout.addWidget(self._preview_button, 0)
-
- self._apply_button.setObjectName("controlStripPrimaryAction")
- self._apply_button.setIcon(icon("apply"))
- self._apply_button.clicked.connect(self._emit_apply_requested)
- action_layout.addWidget(self._apply_button, 0)
+ self._actions_group, action_layout = self._create_group("FINAL")
+ self._run_button.setObjectName("controlStripPrimaryAction")
+ self._run_button.setIcon(icon("apply"))
+ self._run_button.clicked.connect(self._emit_run_requested)
+ action_layout.addWidget(self._run_button, 0)
options_menu = QMenu(self._options_button)
self._reset_settings_action.triggered.connect(self._emit_reset_settings)
@@ -227,7 +167,8 @@ def _build_ui(self) -> None:
self._options_button.setMenu(options_menu)
self._options_button.setMinimumWidth(72)
action_layout.addWidget(self._options_button, 0)
- body.addWidget(self._actions_group, 0)
+ action_layout.addStretch(1)
+ body.addWidget(self._actions_group, 1)
root.addLayout(body)
@@ -248,29 +189,16 @@ def _create_group(self, title: str) -> tuple[QFrame, QHBoxLayout]:
layout.addLayout(content)
return frame, content
- def _emit_apply_target(self, target_value: str) -> None:
- if self._ui_state is not None:
- self._ui_state.set_apply_target(target_value)
-
- def _emit_sync_change(self) -> None:
- if self._ui_state is not None:
- self._ui_state.set_sync_current_final(self._sync_button.isChecked())
-
- def _emit_auto_apply_change(self) -> None:
- if self._ui_state is not None:
- self._ui_state.set_auto_apply_light(self._auto_apply_button.isChecked())
-
def _emit_background_mode(self, mode_value: str) -> None:
if self._ui_state is not None:
self._ui_state.set_background_removal_mode(mode_value)
- def _emit_light_preview_requested(self) -> None:
+ def _emit_run_requested(self) -> None:
if self._ui_state is not None:
- self._ui_state.request_light_preview()
-
- def _emit_apply_requested(self) -> None:
- if self._ui_state is not None:
- self._ui_state.request_apply()
+ if self._run_heavy:
+ self._ui_state.request_apply()
+ else:
+ self._ui_state.request_light_preview()
def _emit_reset_view(self) -> None:
if self._ui_state is not None:
@@ -280,15 +208,6 @@ def _emit_reset_settings(self) -> None:
if self._ui_state is not None:
self._ui_state.request_global_reset()
- def _on_apply_target_changed(self, _target_value: str) -> None:
- self._sync_from_ui_state()
-
- def _on_sync_changed(self, _enabled: bool) -> None:
- self._sync_from_ui_state()
-
- def _on_auto_apply_light_changed(self, _enabled: bool) -> None:
- self._sync_from_ui_state()
-
def _on_background_mode_changed(self, _mode_value: str) -> None:
self._sync_from_ui_state()
@@ -310,11 +229,8 @@ def _sync_from_ui_state(self) -> None:
)
def _apply_view_state(self, state: ControlStripViewState) -> None:
- self._set_group_enabled(self._scope_group, state.has_asset)
- self._set_group_enabled(self._behavior_group, state.has_asset)
self._set_group_enabled(self._actions_group, state.has_asset)
- self._preview_button.setEnabled(state.has_asset)
- self._apply_button.setEnabled(state.has_asset)
+ self._run_button.setEnabled(state.has_asset and state.running_heavy_jobs == 0)
self._options_button.setEnabled(state.has_asset)
self._background_button.setEnabled(state.has_asset)
self._reset_settings_action.setEnabled(state.has_asset)
@@ -323,33 +239,15 @@ def _apply_view_state(self, state: ControlStripViewState) -> None:
self._header_summary.setText(state.summary_text)
self._background_button.setText(state.background_button_text)
self._background_button.setToolTip(state.background_button_tooltip)
- self._set_badge_text(self._target_badge, state.target_badge_text, tone="neutral")
self._set_badge_text(self._queue_badge, state.queue_badge_text, tone=state.queue_badge_tone)
for mode_value, action in self._background_mode_actions.items():
action.blockSignals(True)
action.setChecked(mode_value == state.background_mode)
action.blockSignals(False)
- button = self._apply_target_buttons.get(state.apply_target)
- if button is not None:
- for candidate in self._apply_target_buttons.values():
- candidate.blockSignals(True)
- button.setChecked(True)
- for candidate in self._apply_target_buttons.values():
- candidate.blockSignals(False)
-
- self._sync_button.blockSignals(True)
- self._sync_button.setChecked(state.sync_current_final)
- self._sync_button.blockSignals(False)
-
- self._auto_apply_button.blockSignals(True)
- self._auto_apply_button.setChecked(state.auto_apply_light)
- self._auto_apply_button.blockSignals(False)
-
- self._preview_button.setText(state.preview_button_text)
- self._preview_button.setToolTip(state.preview_button_tooltip)
- self._apply_button.setText(state.apply_button_text)
- self._apply_button.setToolTip(state.apply_button_tooltip)
+ self._run_heavy = state.run_heavy
+ self._run_button.setText(state.run_button_text)
+ self._run_button.setToolTip(state.run_button_tooltip)
@staticmethod
def _set_group_enabled(group: QFrame | None, enabled: bool) -> None:
diff --git a/image_engine_app/ui/main_window/control_strip_state.py b/image_engine_app/ui/main_window/control_strip_state.py
index d92af35..2ff92a7 100644
--- a/image_engine_app/ui/main_window/control_strip_state.py
+++ b/image_engine_app/ui/main_window/control_strip_state.py
@@ -4,7 +4,7 @@
from dataclasses import dataclass
-from image_engine_app.engine.models import ApplyTarget, BackgroundRemovalMode, normalize_background_removal_mode
+from image_engine_app.engine.models import BackgroundRemovalMode, normalize_background_removal_mode
@dataclass(frozen=True)
@@ -12,22 +12,17 @@ class ControlStripViewState:
"""Normalized control-strip state derived from the active asset."""
has_asset: bool
- apply_target: str = ApplyTarget.BOTH.value
- sync_current_final: bool = True
- auto_apply_light: bool = True
queued_heavy_jobs: int = 0
running_heavy_jobs: int = 0
summary_text: str = "Select an asset to start editing."
queue_badge_text: str = "No asset"
queue_badge_tone: str = "disabled"
- target_badge_text: str = "Target: --"
background_mode: str = BackgroundRemovalMode.OFF.value
background_button_text: str = "Keep BG"
background_button_tooltip: str = "Keep the current background settings for the active asset."
- apply_button_text: str = "Apply"
- apply_button_tooltip: str = "Select an asset before applying changes."
- preview_button_text: str = "Preview"
- preview_button_tooltip: str = "Render a light-only preview for the active asset."
+ run_button_text: str = "Refresh Final"
+ run_button_tooltip: str = "Select an asset before refreshing Final."
+ run_heavy: bool = False
def build_control_strip_view_state(asset: object | None, heavy_queue_state: object | None = None) -> ControlStripViewState:
@@ -35,14 +30,6 @@ def build_control_strip_view_state(asset: object | None, heavy_queue_state: obje
if edit_state is None:
return ControlStripViewState(has_asset=False)
- apply_target = getattr(getattr(edit_state, "apply_target", None), "value", ApplyTarget.BOTH.value)
- if apply_target not in {
- ApplyTarget.CURRENT.value,
- ApplyTarget.FINAL.value,
- ApplyTarget.BOTH.value,
- }:
- apply_target = ApplyTarget.BOTH.value
-
queued_heavy_jobs = _int_attr(
heavy_queue_state,
"queued_count",
@@ -51,14 +38,11 @@ def build_control_strip_view_state(asset: object | None, heavy_queue_state: obje
running_heavy_jobs = _int_attr(heavy_queue_state, "running_count", default=0)
alpha_settings = getattr(getattr(edit_state, "settings", None), "alpha", None)
- target_label = _TARGET_LABELS.get(apply_target, "Both")
- sync_text = "Views linked" if bool(getattr(edit_state, "sync_current_final", True)) else "Views split"
- preview_text = "Auto preview on" if bool(getattr(edit_state, "auto_apply_light", True)) else "Auto preview off"
-
queue_badge_text = "Ready"
queue_badge_tone = "ready"
- apply_button_text = "Apply"
- apply_button_tooltip = "Commit the light pipeline for the active asset."
+ run_button_text = "Refresh Final"
+ run_button_tooltip = "Rebuild the Final pane using the current edit settings."
+ run_heavy = False
background_mode = normalize_background_removal_mode(
getattr(alpha_settings, "background_removal_mode", None),
remove_white_bg=bool(getattr(alpha_settings, "remove_white_bg", False)),
@@ -67,39 +51,31 @@ def build_control_strip_view_state(asset: object | None, heavy_queue_state: obje
if running_heavy_jobs > 0:
queue_badge_text = f"Running: {running_heavy_jobs}"
queue_badge_tone = "running"
- apply_button_text = "Run Heavy"
- apply_button_tooltip = "Run the queued heavy steps for the active asset."
+ run_button_text = "Heavy Steps Running"
+ run_button_tooltip = "Heavy processing is currently running."
+ run_heavy = True
elif queued_heavy_jobs > 0:
queue_badge_text = f"Queued: {queued_heavy_jobs}"
queue_badge_tone = "queued"
- apply_button_text = f"Run {queued_heavy_jobs} Heavy"
- apply_button_tooltip = "Run the queued heavy steps for the active asset."
+ run_button_text = f"Run {queued_heavy_jobs} Heavy"
+ run_button_tooltip = "Run the queued heavy steps and refresh the Final pane."
+ run_heavy = True
return ControlStripViewState(
has_asset=True,
- apply_target=apply_target,
- sync_current_final=bool(getattr(edit_state, "sync_current_final", True)),
- auto_apply_light=bool(getattr(edit_state, "auto_apply_light", True)),
queued_heavy_jobs=max(0, queued_heavy_jobs),
running_heavy_jobs=max(0, running_heavy_jobs),
- summary_text=f"{sync_text} | {preview_text}",
+ summary_text="Current is the source | Final updates automatically",
queue_badge_text=queue_badge_text,
queue_badge_tone=queue_badge_tone,
- target_badge_text=f"Target: {target_label}",
background_mode=background_mode,
background_button_text=_BACKGROUND_BUTTON_TEXT[background_mode],
background_button_tooltip=_BACKGROUND_BUTTON_TOOLTIPS[background_mode],
- apply_button_text=apply_button_text,
- apply_button_tooltip=apply_button_tooltip,
+ run_button_text=run_button_text,
+ run_button_tooltip=run_button_tooltip,
+ run_heavy=run_heavy,
)
-
-_TARGET_LABELS: dict[str, str] = {
- ApplyTarget.CURRENT.value: "Current",
- ApplyTarget.FINAL.value: "Final",
- ApplyTarget.BOTH.value: "Both",
-}
-
_BACKGROUND_BUTTON_TEXT: dict[str, str] = {
BackgroundRemovalMode.OFF.value: "Keep BG",
BackgroundRemovalMode.WHITE.value: "Remove White",
@@ -120,4 +96,4 @@ def _int_attr(source: object | None, name: str, *, default: int) -> int:
return max(0, int(getattr(source, name, default)))
except Exception:
return max(0, int(default))
-
+
diff --git a/image_engine_app/ui/main_window/encoding_coordinator.py b/image_engine_app/ui/main_window/encoding_coordinator.py
deleted file mode 100644
index b7b45cb..0000000
--- a/image_engine_app/ui/main_window/encoding_coordinator.py
+++ /dev/null
@@ -1,67 +0,0 @@
-"""Encoding workflow coordinator for the main window."""
-
-from __future__ import annotations
-
-from typing import Any
-
-from image_engine_app.engine.models import ChromaSubsampling, ExportFormat
-
-
-class EncodingCoordinator:
- """Owns encoding dialog show/apply actions for the main window."""
-
- def __init__(self, window: Any) -> None:
- self._window = window
-
- def show_export_encoding_window(self) -> None:
- asset = self._window.ui_state.active_asset
- if asset is not None:
- self._window.export_encoding_dialog.load_from_asset(asset)
- self._window.export_encoding_dialog.show()
- self._window.export_encoding_dialog.raise_()
- self._window.export_encoding_dialog.activateWindow()
-
- def on_export_encoding_apply_requested(self, options_obj: object) -> None:
- asset = self._window.ui_state.active_asset
- if asset is None:
- self._window._status("Encoding apply skipped: no active asset")
- return
-
- export_settings = getattr(getattr(getattr(asset, "edit_state", None), "settings", None), "export", None)
- if export_settings is None:
- self._window._status("Encoding apply skipped: export settings unavailable")
- return
-
- try:
- fmt_raw = str(
- getattr(
- options_obj,
- "format",
- getattr(export_settings.format, "value", ExportFormat.AUTO.value),
- )
- ).lower()
- export_settings.format = ExportFormat(fmt_raw)
-
- quality = int(getattr(options_obj, "quality", export_settings.quality))
- export_settings.quality = max(1, min(100, quality))
-
- compression = int(getattr(options_obj, "compression_level", export_settings.compression_level))
- export_settings.compression_level = max(0, min(9, compression))
-
- chroma_raw = str(
- getattr(
- options_obj,
- "chroma_subsampling",
- getattr(export_settings.chroma_subsampling, "value", ChromaSubsampling.AUTO.value),
- )
- ).lower()
- export_settings.chroma_subsampling = ChromaSubsampling(chroma_raw)
-
- export_settings.strip_metadata = bool(getattr(options_obj, "strip_metadata", export_settings.strip_metadata))
-
- self._window.ui_state.set_active_asset(asset)
- self._window._refresh_export_prediction()
- self._window._status("Applied encoding settings to current asset")
- except Exception as exc:
- self._window._status(f"Encoding apply failed: {exc}")
-
diff --git a/image_engine_app/ui/main_window/export_bar.py b/image_engine_app/ui/main_window/export_bar.py
index 46da3bb..a52c373 100644
--- a/image_engine_app/ui/main_window/export_bar.py
+++ b/image_engine_app/ui/main_window/export_bar.py
@@ -165,6 +165,6 @@ def _on_active_asset_changed(self, asset: object) -> None:
self._profile_combo.blockSignals(True)
self._profile_combo.setCurrentIndex(idx)
self._profile_combo.blockSignals(False)
- break
-
-
+ break
+
+
diff --git a/image_engine_app/ui/main_window/local_import_coordinator.py b/image_engine_app/ui/main_window/local_import_coordinator.py
index 0066dd5..b17db2a 100644
--- a/image_engine_app/ui/main_window/local_import_coordinator.py
+++ b/image_engine_app/ui/main_window/local_import_coordinator.py
@@ -1,4 +1,4 @@
-"""Local file/folder/ZIP import coordinator for the main window."""
+"""Local file and folder import coordinator for the main window."""
from __future__ import annotations
@@ -12,7 +12,7 @@
class LocalImportCoordinator:
- """Owns local import actions exposed from the top toolbar."""
+ """Owns the File menu's two distinct add workflows."""
def __init__(self, window: Any) -> None:
self._window = window
@@ -23,18 +23,25 @@ def import_files(self) -> None:
paths, _selected = QFileDialog.getOpenFileNames(
self._window,
- "Import Image Files",
+ "Add Files to Workspace",
self._default_import_directory(),
- self._window._local_file_dialog_filter(),
+ self._window._local_import_dialog_filter(),
)
if not paths:
return
+ sources, issues = self._expand_selected_files(paths)
+ if issues:
+ self._window._show_error("Some Files Could Not Be Added", "\n".join(issues))
+ if not sources:
+ self._window._status("Add files failed: no supported images were found")
+ return
+
self._import_sources(
- paths,
+ sources,
recursive=False,
preserve_structure=False,
- source_label="Imported files",
+ source_label="Added files",
)
def import_folder(self) -> None:
@@ -56,38 +63,6 @@ def import_folder(self) -> None:
source_label="Imported folder",
)
- def import_zip_archive(self) -> None:
- if not self._has_controller():
- return
-
- path, _selected = QFileDialog.getOpenFileName(
- self._window,
- "Import ZIP Archive",
- self._default_import_directory(),
- "ZIP Files (*.zip);;All Files (*)",
- )
- if not path:
- return
-
- zip_path = Path(path)
- try:
- extracted = self._extract_zip_images(zip_path)
- except (ZipExtractError, OSError, ValueError) as exc:
- self._window._show_error("ZIP Import Failed", str(exc))
- self._window._status(f"ZIP import failed: {exc}")
- return
-
- if not extracted:
- self._window._status(f"ZIP import skipped: no supported images in {zip_path.name}")
- return
-
- self._import_sources(
- extracted,
- recursive=False,
- preserve_structure=False,
- source_label=f"Imported ZIP: {zip_path.name}",
- )
-
def _has_controller(self) -> bool:
if self._window.controller is not None:
return True
@@ -140,6 +115,25 @@ def _extract_zip_images(self, zip_path: Path) -> list[str]:
extract_dir = extract_root / f"{zip_path.stem}_{uuid4().hex[:8]}"
return extract_images_only(str(zip_path), str(extract_dir), allowed_exts=allowed_exts)
+ def _expand_selected_files(self, paths: list[str]) -> tuple[list[str], list[str]]:
+ sources: list[str] = []
+ issues: list[str] = []
+ for raw_path in paths:
+ path = Path(raw_path)
+ if path.suffix.lower() != ".zip":
+ sources.append(raw_path)
+ continue
+ try:
+ extracted = self._extract_zip_images(path)
+ except (ZipExtractError, OSError, ValueError) as exc:
+ issues.append(f"{path.name}: {exc}")
+ continue
+ if not extracted:
+ issues.append(f"{path.name}: no supported images found")
+ continue
+ sources.extend(extracted)
+ return sources, issues
+
def _zip_extract_root(self) -> Path:
controller = self._window.controller
app_paths = getattr(controller, "app_paths", None) if controller is not None else None
diff --git a/image_engine_app/ui/main_window/main_window.py b/image_engine_app/ui/main_window/main_window.py
index cc088bc..88d936e 100644
--- a/image_engine_app/ui/main_window/main_window.py
+++ b/image_engine_app/ui/main_window/main_window.py
@@ -2,8 +2,6 @@
from __future__ import annotations
-from pathlib import Path
-
from image_engine_app.app.settings_store import SessionStore
from image_engine_app.app.ui_controller import ImageEngineUIController
from image_engine_app.engine.models import AssetRecord, SessionState
@@ -37,7 +35,6 @@
from image_engine_app.ui.main_window.control_strip import ControlStrip
from image_engine_app.ui.main_window.export_bar import ExportBar
from image_engine_app.ui.main_window.export_coordinator import ExportCoordinator
-from image_engine_app.ui.main_window.encoding_coordinator import EncodingCoordinator
from image_engine_app.ui.main_window.preview_panel import PreviewPanel
from image_engine_app.ui.main_window.settings_panel import SettingsPanel
from image_engine_app.ui.main_window.shell_coordinator import ShellCoordinator
@@ -47,16 +44,13 @@
from image_engine_app.ui.main_window.web_sources_panel import WebSourcesPanel
from image_engine_app.ui.main_window.web_sources_coordinator import WebSourcesCoordinator
from image_engine_app.ui.windows.batch_manager import BatchManagerDialog
-from image_engine_app.ui.windows.export_encoding import ExportEncodingDialog
from image_engine_app.ui.windows.preset_manager import PresetManagerDialog
class ImageEngineMainWindow(QMainWindow):
- """Prompt 16 main window shell for the Sprite Factory app."""
+ """Main Sprite Factory window and coordinator wiring."""
MAX_RENDERED_WORKSPACE_TABS = 100
- DEFAULT_WORKSPACE_RAIL_WIDTH = 248
- DEFAULT_WORKSPACE_INSPECTOR_WIDTH = 398
MOCK_PAGE_RAIL_WIDTH = 86
MOCK_WORKSPACE_PANEL_WIDTH = 276
MOCK_INSPECTOR_PANEL_WIDTH = 398
@@ -117,9 +111,15 @@ def __init__(
self._session_coordinator = SessionCoordinator(self)
self._local_import_coordinator = LocalImportCoordinator(self)
self._export_coordinator = ExportCoordinator(self)
- self.export_encoding_dialog = ExportEncodingDialog(self)
- self._encoding_coordinator = EncodingCoordinator(self)
- self.preset_manager_dialog = PresetManagerDialog(self.controller, self) if self.controller is not None else None
+ self.preset_manager_dialog = (
+ PresetManagerDialog(
+ self.controller,
+ self,
+ active_asset_provider=lambda: self.ui_state.active_asset,
+ )
+ if self.controller is not None
+ else None
+ )
self._build_ui()
self._bind_state()
@@ -199,18 +199,12 @@ def _build_top_toolbar(self) -> None:
self._add_toolbar_brand_lockup(toolbar)
toolbar.addSeparator()
- # Session/import menus
- self._add_toolbar_menu_button(
- toolbar,
- text="Session",
- icon_name=None,
- actions=self._build_session_menu_actions(),
- )
- self._add_toolbar_menu_button(
+ # Workspace files and local imports share one conventional File menu.
+ self._add_toolbar_popup_menu_button(
toolbar,
- text="Import",
- icon_name=None,
- actions=self._build_import_menu_actions(),
+ text="File",
+ menu=self._build_file_menu(),
+ tooltip="Workspace and local file actions",
)
toolbar.addSeparator()
@@ -223,13 +217,6 @@ def _build_top_toolbar(self) -> None:
toolbar.addSeparator()
self._add_toolbar_command_button(toolbar, text="Batch", callback=self._show_batch_manager)
- self._add_toolbar_command_button(
- toolbar,
- text="Presets",
- callback=(self._show_preset_manager if self.preset_manager_dialog is not None else None),
- tooltip="Open preset manager",
- width=76,
- )
toolbar.addSeparator()
self._compact_ui_action = QAction("Compact UI", self, checkable=True)
@@ -299,37 +286,6 @@ def _add_toolbar_brand_lockup(self, toolbar: QToolBar) -> None:
toolbar.addWidget(brand)
- def _add_toolbar_menu_button(
- self,
- toolbar: QToolBar,
- *,
- text: str,
- icon_name: str | None,
- actions: list[QAction],
- tooltip: str | None = None,
- ) -> None:
- menu = QMenu(self)
- for action in actions:
- menu.addAction(action)
-
- button = QToolButton(toolbar)
- button.setObjectName("toolbarMenuButton")
- button.setText(text)
- if icon_name:
- button.setIcon(icon(icon_name))
- button.setToolButtonStyle(
- Qt.ToolButtonStyle.ToolButtonIconOnly
- if not text
- else Qt.ToolButtonStyle.ToolButtonTextBesideIcon
- )
- else:
- button.setToolButtonStyle(Qt.ToolButtonStyle.ToolButtonTextOnly)
- button.setPopupMode(QToolButton.ToolButtonPopupMode.InstantPopup)
- button.setMenu(menu)
- button.setToolTip(tooltip or text)
- button.setFixedSize(72, 30)
- toolbar.addWidget(button)
-
def _add_toolbar_popup_menu_button(
self,
toolbar: QToolBar,
@@ -368,35 +324,27 @@ def _add_toolbar_command_button(
button.clicked.connect(callback)
toolbar.addWidget(button)
- def _build_session_menu_actions(self) -> list[QAction]:
- new_action = QAction(icon("new"), "New Session", self)
- new_action.triggered.connect(self._new_session)
-
- open_action = QAction(icon("open"), "Open Session", self)
- open_action.triggered.connect(self._open_session_file)
-
- save_action = QAction(icon("save"), "Save Session", self)
- save_action.triggered.connect(self._save_session_file)
+ def _build_file_menu(self) -> QMenu:
+ menu = QMenu(self)
- clear_action = QAction("Clear Session", self)
- clear_action.triggered.connect(self._clear_session)
+ new_action = menu.addAction(icon("new"), "New Workspace")
+ new_action.triggered.connect(self._new_workspace)
- sessions_folder_action = QAction("Sessions Folder", self)
- sessions_folder_action.triggered.connect(self._open_sessions_folder)
+ open_action = menu.addAction(icon("open"), "Open Workspace...")
+ open_action.triggered.connect(self._open_workspace_file)
- return [new_action, open_action, save_action, clear_action, sessions_folder_action]
+ save_action = menu.addAction(icon("save"), "Save Workspace...")
+ save_action.triggered.connect(self._save_workspace_file)
- def _build_import_menu_actions(self) -> list[QAction]:
- import_files_action = QAction("Import File(s)...", self)
- import_files_action.triggered.connect(self._import_files)
+ menu.addSeparator()
- import_folder_action = QAction("Import Folder...", self)
- import_folder_action.triggered.connect(self._import_folder)
+ add_files_action = menu.addAction("Add Files...")
+ add_files_action.triggered.connect(self._import_files)
- import_zip_action = QAction("Import ZIP...", self)
- import_zip_action.triggered.connect(self._import_zip_archive)
+ add_folder_action = menu.addAction("Add Folder...")
+ add_folder_action.triggered.connect(self._import_folder)
- return [import_files_action, import_folder_action, import_zip_action]
+ return menu
def _build_center_shell(self) -> None:
central = QWidget(self)
@@ -544,13 +492,6 @@ def _set_page_index(self, index: int) -> None:
button.setChecked(button_index == index)
button.blockSignals(False)
- def _default_workspace_splitter_sizes(self) -> list[int]:
- return [
- int(self.DEFAULT_WORKSPACE_RAIL_WIDTH),
- 1180,
- int(self.DEFAULT_WORKSPACE_INSPECTOR_WIDTH),
- ]
-
def _build_helper_tab_page(self, parent: QWidget) -> QWidget:
page = QWidget(parent)
page.setObjectName("shellHelperPage")
@@ -577,78 +518,113 @@ def _build_helper_tab_page(self, parent: QWidget) -> QWidget:
guide.setHtml(
"Quick Start
"
""
- "- Start: use Session for New, Open, Save, Clear, or Sessions Folder.
"
- "- Add assets: use the top Import menu for files/folders/ZIPs, or Web Sources for website scans.
"
+ "- Start: open File to create, open, or save a workspace.
"
+ "- Add assets: use File for images, folders, or ZIPs, or Web Sources for website scans.
"
f"- Supported formats: {self._local_extensions_label()}.
"
"- Edit: use the center previews, bottom tools, and right-side edit settings.
"
- "- Finish: Preview, Apply, Skip, Export, or send selected assets through Batch.
"
+ "- Finish: review the automatically updated Final pane, then Export, Skip, or send selected assets through Batch.
"
"
"
"Studio Shell
"
""
"- Left rail: Workspace, Web Sources, and Helper.
"
"- Workspace panel: asset list, empty state, and 100-item queue paging.
"
"- Preview Studio: Current and Final stay central; use per-pane Reset to refit either side.
"
- "- Tools shelf: quick Preset, Target, Live, Run, BG handling, reset, and export workflow controls.
"
- "- Edit Settings: right-side tiles jump to Pixel, Color, Detail, Cleanup, Edges, Alpha, GIF, Export, and Encoding.
"
+ "- Tools shelf: compatible Presets, background handling, Final refresh, processing, and reset actions.
"
+ "- Edit Settings: right-side tiles jump to Pixel, Color, Detail, Cleanup, Edges, Alpha, GIF, and Export.
"
"
"
"Top Toolbar
"
""
- "- Session: New Session, Open Session, Save Session, Clear Session, and Sessions Folder.
"
- "- Import: the only local import control; use it for files, folders, or ZIPs.
"
+ "- File: New Workspace, Open Workspace, Save Workspace, Add Files, and Add Folder.
"
+ "- Add Files: choose one or more supported images or ZIP archives. ZIP images are safely extracted and added through the same import workflow.
"
+ "- New / Open Workspace: if the current workspace contains work, Sprite Factory asks whether to save, discard, or cancel before replacing it.
"
"- Format / Alpha / Frames: quick readout for the selected asset.
"
- "- Batch / Presets: open the queue manager and advanced preset editor directly.
"
+ "- Batch: open the queue manager for multi-asset editing and export.
"
"- View: Compare View, Current Only, Final Only, Compact UI, and Reset Shell live here.
"
"
"
"Workspace Flow
"
""
"- Import or download assets, then choose one from Workspace.
"
- "- Use Target to choose Current, Final, or Both for the next apply.
"
- "- Use Live to link views or turn Auto on/off for preview updates.
"
- "- Use BG for background handling: keep, remove white, or remove black.
"
- "- More keeps reset actions separate: Reset Edits changes image edits; Reset View changes zoom/pan.
"
+ "- Current always shows the untouched source; Final shows your active edits.
"
+ "- Visual control changes refresh Final automatically. Use Refresh Final to rebuild it manually whenever needed.
"
+ "- When a preset queues heavier processing, the same Run button changes to Run Heavy.
"
+ "- Use the background menu to keep the image background, remove white, or remove black.
"
+ "- Reset Edits restores the controls detected for that asset at import. Reset View changes zoom only.
"
"- The export footer has Profile, Export, Skip, folder output, Auto-next, and Estimate.
"
"
"
"Settings Groups
"
""
- "- Pixel and Resolution: resize %, DPI metadata, target width/height, scale method.
"
+ "- Pixel and Resolution: Output size offers 2x/3x/4x/8x sprite scaling and 240p-2160p output heights. Standard heights keep width on Auto to preserve proportions.
"
+ "- Resize % / target dimensions: these change real pixel dimensions. DPI changes print metadata only and does not create extra image detail.
"
"- Color and Light, Detail, Cleanup, Edges: core visual tuning controls.
"
"- Transparency: keep/remove backgrounds, refine alpha, and check matte handling.
"
- "- GIF Controls: only enabled for animated assets.
"
- "- Export: format/quality/metadata options.
"
- "- Export Encoding: compression, chroma, palette tuning, and Encoding Window launch.
"
+ "- GIF Controls: timing, looping, palette, dithering, and frame optimization for animated GIFs.
"
+ "- Export: profile, format, quality, metadata, PNG compression, JPEG chroma, and ICO sizes in one place.
"
"- Choose what to edit: tiles jump directly to the matching settings card.
"
"
"
"Presets
"
""
- "- Preset in the Tools shelf applies a compatible preset to the active asset for quick polish.
"
- "- Presets in the top toolbar opens the advanced manager where you can duplicate a system template, set compatible formats/tags, edit the JSON delta, then save a user preset.
"
- "- Presets are compatibility-aware; GIF-safe presets avoid breaking animated assets.
"
- "- Batch can copy current edits, apply a preset, apply background overrides, process, then export.
"
+ "- Each imported asset keeps its own detected control baseline. A preset starts from that baseline rather than blank defaults.
"
+ "- Preset in the Tools shelf applies one compatible preset to the active asset and refreshes Final.
"
+ "- Manage Presets... at the bottom of the Tools preset menu opens Preset Studio. Choose New from Active or Use Active Controls; only controls changed from the detected baseline are saved.
"
+ "- The Tools menu, Preset Studio, and Batch all use the same preset library. Bundled presets and your saved presets are merged once, then filtered for the active asset.
"
+ "- Format and asset-type scopes are filled from the active asset. The JSON editor is optional under Advanced.
"
+ "- User presets appear in Workspace and Batch immediately. Compatibility checks protect animated GIFs and format-specific assets. Reset Edits restores the detected controls from before the preset was chosen.
"
"
"
"Web Sources
"
- ""
- "- Use 1. Scan Pages to paste one page URL, or paste a list of page URLs and scan them together.
"
- "- Use Save URL as Page when you want to keep one page as a saved shortcut.
"
- "- Use 2. Saved Shortcuts only when you want to scan a saved shortcut again.
"
- "- Use 3. Find Linked Pages only when a page is an index/category page and you need to discover linked pages first.
"
- "- Large linked-page scans are capped at 100 pages unless you confirm, which helps avoid freezing on huge sites.
"
- "- Use 4. Found Files to filter by PNG/GIF/WEBP/JPG/ZIP, search names/URLs, and select files.
"
- "- Select files and click Download Selected; Sprite Factory routes them into the workspace automatically.
"
- "- Use More for Network Check or saved-page cleanup.
"
- "
"
+ "Web Sources uses one scan system for entered URLs, saved pages, and linked pages. Every successful scan adds unique files to the same Found Files list instead of replacing earlier results.
"
+ "1. Scan Pages
"
+ ""
+ "- Paste one full page URL per line. The list can contain pages from several different websites.
"
+ "- Scan Pages validates the list, removes repeated URLs, applies the safety limit, and sends the remaining pages through the same scan call.
"
+ "- More contains only entered-URL actions: Save Entered Pages, Check First URL, Include uncertain image links, and Clear Entered URLs.
"
+ "- Include uncertain image links is optional. Enable it when a website hides useful image links behind URLs that do not end with a normal file extension.
"
+ "
"
+ "2. Saved Pages
"
+ ""
+ "- Save Entered Pages groups entered URLs by website and stores each exact page once.
"
+ "- Expand a website and check individual pages, or check the website row to choose all of its pages. Pages from different websites can be checked together.
"
+ "- Scan Selected sends every checked page through the normal scan call. If nothing is checked, the currently highlighted page is used.
"
+ "- More contains saved-page actions only: check the current page, clear checked pages, check the current page connection, remove the current page, or remove the current website.
"
+ "- Changing or removing a saved shortcut never clears Found Files.
"
+ "
"
+ "3. Find Linked Pages
"
+ ""
+ "- This optional section is for index, category, or directory pages that link to many separate sprite pages.
"
+ "- Use Discover from to choose exactly which entered or saved page will be inspected, then click Find Pages.
"
+ "- Search the discovered page list, select the pages you need, then click Scan Selected. Finding pages does not download or scan files by itself.
"
+ "- More contains linked-page actions only: select visible pages, clear page selection, and clear linked pages.
"
+ "- Any scan above 100 pages asks for confirmation and scans only the first 100, reducing the chance of a freeze or website rate limit.
"
+ "
"
+ "4. Found Files and Download
"
+ ""
+ "- Found Files is a persistent basket. New scans add unique file URLs; repeated URLs and failed pages do not erase earlier results.
"
+ "- Search matches filenames, URLs, and source pages. Hide words excludes matching results. File Types controls PNG, GIF, WEBP, JPG/JPEG, and ZIP visibility.
"
+ "- More contains result actions only: select all visible files, clear file selection, and Clear Found Files.
"
+ "- Download Options controls skipping files already downloaded and whether ZIP extraction is allowed.
"
+ "- Download Selected imports selected files and automatically routes them into Main, Shiny, Animated, or Items in the workspace.
"
+ "- Only Clear Found Files empties the result basket. Search filters, URL clearing, saved-page changes, linked-page clearing, cancellation, and failed scans keep it intact.
"
+ "
"
+ "Web Source Status and Errors
"
+ ""
+ "- The status line reports new files, total stored files, duplicates, filtered links, and failed pages. Hover a failure message for page details.
"
+ "- A connection check tests the selected page but never starts a scan. HTTP 403/429 usually means the website blocked or limited automated requests; HTTP 5xx means the website server failed.
"
+ "
"
"Batch
"
""
- "- Select queue items, choose optional rules, then click Run Batch.
"
+ "- Select queue items, choose one edit source, then click Run Selected.
"
"- Use Queue for Select all, Select failed, and Clear selection.
"
- "- Use Options for Smart presets, Export after processing, and Fast run.
"
- "- Run order: copy current edits, apply chosen preset, apply background override, process, export.
"
+ "- Keep each asset's controls uses every file exactly as it is currently configured.
"
+ "- Apply one preset starts from each asset's detected baseline and applies the same compatible saved preset.
"
+ "- Copy active asset controls deliberately copies the selected Workspace asset's controls to the batch.
"
+ "- Smart match each asset chooses at most one compatible system preset per asset; it never stacks hidden presets.
"
+ "- Background override is applied after the chosen edit source. Use Options only for Export after processing and Fast run.
"
"- Use naming/output options for clean filenames and a consistent export folder.
"
"- Failed items can be selected again after the run.
"
"
"
"Troubleshooting
"
""
"- If Web Sources returns blocked errors such as WinError 10013, check firewall/VPN/proxy/antivirus web shield.
"
- "- If a site blocks scan requests (HTTP 403/429), try Network Check or use direct image URLs.
"
+ "- If a site blocks scan requests (HTTP 403/429), try the section's connection check or use direct image URLs.
"
"- Some settings groups lock automatically when the active asset does not support that feature.
"
"
"
)
@@ -664,16 +640,19 @@ def _local_extensions_label(cls) -> str:
return ", ".join(labels)
@classmethod
- def _local_file_dialog_filter(cls) -> str:
+ def _local_import_dialog_filter(cls) -> str:
patterns = " ".join(f"*{ext}" for ext in cls._supported_local_extensions())
- return f"Supported Images ({patterns});;All Files (*)"
+ return (
+ f"Supported Images and ZIPs ({patterns} *.zip);;"
+ f"Supported Images ({patterns});;"
+ "ZIP Archives (*.zip);;All Files (*)"
+ )
def _bind_state(self) -> None:
self.preview_panel.bind_state(self.ui_state)
self.control_strip.bind_state(self.ui_state)
self.export_bar.bind_state(self.ui_state)
self.settings_panel.bind_state(self.ui_state)
- self.settings_panel.open_encoding_window_requested.connect(self._show_export_encoding_window)
self.ui_state.status_message_changed.connect(self._status)
self.ui_state.active_asset_changed.connect(self._on_active_asset_changed)
@@ -695,20 +674,15 @@ def _bind_state(self) -> None:
self.asset_tabs.window_section_requested.connect(self._on_workspace_window_section_requested)
self.batch_manager_dialog.run_requested.connect(self._on_batch_run_requested)
self.batch_manager_dialog.cancel_run_requested.connect(self._on_batch_cancel_requested)
- self.export_encoding_dialog.apply_requested.connect(self._on_export_encoding_apply_requested)
self.web_sources_panel.registry_changed.connect(self._on_web_sources_registry_changed)
self.web_sources_panel.scan_requested.connect(self._on_web_sources_scan_requested)
- self.web_sources_panel.index_links_requested.connect(self._on_web_sources_index_links_requested)
- self.web_sources_panel.index_scan_all_requested.connect(self._on_web_sources_index_scan_all_requested)
- self.web_sources_panel.multi_scan_requested.connect(self._on_web_sources_multi_scan_requested)
+ self.web_sources_panel.discover_links_requested.connect(self._on_web_sources_discover_links_requested)
self.web_sources_panel.download_requested.connect(self._on_web_sources_download_requested)
- self.web_sources_panel.network_diagnostics_requested.connect(self._on_web_sources_network_diagnostics_requested)
+ self.web_sources_panel.diagnostics_requested.connect(self._on_web_sources_diagnostics_requested)
+ self.web_sources_panel.preferences_changed.connect(self._on_web_sources_preferences_changed)
if self.preset_manager_dialog is not None and self.controller is not None:
- # Keep batch preset choices fresh after saves/deletes in the manager.
- self.preset_manager_dialog.finished.connect(
- lambda _code=0: self._refresh_preset_surfaces()
- )
+ self.preset_manager_dialog.presets_changed.connect(self._refresh_preset_surfaces)
self._init_web_sources_panel()
self._refresh_preset_surfaces()
@@ -819,20 +793,14 @@ def _on_export_directory_browse_requested(self) -> None:
def _on_export_directory_open_requested(self) -> None:
self._export_coordinator.on_export_directory_open_requested()
- def _new_session(self) -> None:
- self._session_coordinator.new_session()
+ def _new_workspace(self) -> None:
+ self._session_coordinator.new_workspace()
- def _save_session_file(self) -> None:
- self._session_coordinator.save_session_file()
+ def _save_workspace_file(self) -> None:
+ self._session_coordinator.save_workspace_file()
- def _open_session_file(self) -> None:
- self._session_coordinator.open_session_file()
-
- def _open_sessions_folder(self) -> None:
- self._session_coordinator.open_sessions_folder()
-
- def _clear_session(self) -> None:
- self._session_coordinator.clear_session()
+ def _open_workspace_file(self) -> None:
+ self._session_coordinator.open_workspace_file()
def _import_files(self) -> None:
self._local_import_coordinator.import_files()
@@ -840,12 +808,6 @@ def _import_files(self) -> None:
def _import_folder(self) -> None:
self._local_import_coordinator.import_folder()
- def _import_zip_archive(self) -> None:
- self._local_import_coordinator.import_zip_archive()
-
- def _load_workspace_from_file(self, path: Path, *, source_label: str) -> None:
- self._session_coordinator.load_workspace_from_file(path, source_label=source_label)
-
def _show_batch_manager(self) -> None:
self._batch_coordinator.show_manager()
@@ -858,12 +820,6 @@ def _show_preset_manager(self) -> None:
self.preset_manager_dialog.raise_()
self.preset_manager_dialog.activateWindow()
- def _show_export_encoding_window(self) -> None:
- self._encoding_coordinator.show_export_encoding_window()
-
- def _on_export_encoding_apply_requested(self, options_obj: object) -> None:
- self._encoding_coordinator.on_export_encoding_apply_requested(options_obj)
-
def compact_ui_enabled(self) -> bool:
return self._shell_coordinator.compact_ui_enabled()
@@ -882,20 +838,17 @@ def _on_web_sources_registry_changed(self, payload: object) -> None:
def _on_web_sources_scan_requested(self, payload: object) -> None:
self._web_sources_coordinator.on_scan_requested(payload)
- def _on_web_sources_index_links_requested(self, payload: object) -> None:
- self._web_sources_coordinator.on_index_links_requested(payload)
-
- def _on_web_sources_index_scan_all_requested(self, payload: object) -> None:
- self._web_sources_coordinator.on_index_scan_all_requested(payload)
-
- def _on_web_sources_multi_scan_requested(self, payload: object) -> None:
- self._web_sources_coordinator.on_multi_scan_requested(payload)
+ def _on_web_sources_discover_links_requested(self, payload: object) -> None:
+ self._web_sources_coordinator.on_discover_links_requested(payload)
def _on_web_sources_download_requested(self, payload: object) -> None:
self._web_sources_coordinator.on_download_requested(payload)
- def _on_web_sources_network_diagnostics_requested(self, payload: object) -> None:
- self._web_sources_coordinator.on_network_diagnostics_requested(payload)
+ def _on_web_sources_diagnostics_requested(self, payload: object) -> None:
+ self._web_sources_coordinator.on_diagnostics_requested(payload)
+
+ def _on_web_sources_preferences_changed(self, payload: object) -> None:
+ self._web_sources_coordinator.on_preferences_changed(payload)
def _on_batch_run_requested(self, options_obj: object) -> None:
self._batch_coordinator.on_run_requested(options_obj)
@@ -1030,4 +983,4 @@ def _find_workspace_asset(self, asset_id: str) -> AssetRecord | None:
-
+
diff --git a/image_engine_app/ui/main_window/preview_panel.py b/image_engine_app/ui/main_window/preview_panel.py
index 5e6daa0..a8af8ff 100644
--- a/image_engine_app/ui/main_window/preview_panel.py
+++ b/image_engine_app/ui/main_window/preview_panel.py
@@ -93,9 +93,7 @@ def bind_state(self, ui_state: EngineUIState) -> None:
self._ui_state = ui_state
ui_state.active_asset_changed.connect(self._on_active_asset_changed)
- ui_state.sync_changed.connect(self._on_sync_changed)
ui_state.reset_view_requested.connect(self._on_reset_view_requested)
- self._on_sync_changed(ui_state.active_asset.edit_state.sync_current_final if ui_state.active_asset else True)
self._on_active_asset_changed(ui_state.active_asset)
def _build_ui(self) -> None:
@@ -259,11 +257,6 @@ def _update_pane_dividers(self, order: tuple[str, ...]) -> None:
f"QFrame#previewPaneContainer {{ border-right: {border}; }}"
)
- def _on_sync_changed(self, enabled: bool) -> None:
- _ = enabled
- # Sync still matters to edit behavior, but the preview layout is now fixed to Current + Final.
- self._layout_panes()
-
def _on_zoom_snap_toggled(self, enabled: bool) -> None:
self._zoom_snap_enabled = bool(enabled)
self._zoom_snap_button.setText("Crisp On" if self._zoom_snap_enabled else "Crisp Off")
@@ -685,15 +678,10 @@ def _resolve_preview_path_for_view(self, asset: object, view_key: str) -> Path |
source_path = self._resolve_preview_path(asset)
if view_key == "current":
- candidates = (
- getattr(asset, "derived_current_path", None),
- source_path,
- getattr(asset, "derived_final_path", None),
- )
+ candidates = (source_path,)
else:
candidates = (
getattr(asset, "derived_final_path", None),
- getattr(asset, "derived_current_path", None),
source_path,
)
@@ -734,4 +722,4 @@ def _empty_canvas_text() -> str:
-
+
diff --git a/image_engine_app/ui/main_window/session_coordinator.py b/image_engine_app/ui/main_window/session_coordinator.py
index cc871a8..53352ab 100644
--- a/image_engine_app/ui/main_window/session_coordinator.py
+++ b/image_engine_app/ui/main_window/session_coordinator.py
@@ -10,40 +10,46 @@
from image_engine_app.app.settings_store import load_path_preferences, save_path_preferences
from image_engine_app.engine.models import SessionState
-from PySide6.QtCore import QUrl
-from PySide6.QtGui import QDesktopServices
from PySide6.QtWidgets import QFileDialog, QMessageBox
class SessionCoordinator:
- """Owns new/open/save/clear session workflows for the main window."""
+ """Owns safe new/open/save workspace workflows for the main window."""
def __init__(self, window: Any) -> None:
self._window = window
- def new_session(self) -> None:
- """Start a fresh empty session and clear the workspace."""
+ def new_workspace(self) -> bool:
+ """Start an empty workspace without silently discarding current work."""
+
+ if not self._confirm_workspace_replacement(
+ title="New Workspace",
+ prompt="Save your current workspace before starting a new one?",
+ ):
+ self._window._status("New workspace canceled")
+ return False
self._window.load_workspace_state(self._create_empty_session(), [])
- self._window._status("New session created")
+ self._window._status("New workspace created")
+ return True
- def save_session_file(self) -> bool:
+ def save_workspace_file(self) -> bool:
"""Save the current workspace session + assets to a chosen JSON file."""
if self._window.session_store is None:
- self._window._status("Save session unavailable: session store not configured")
+ self._window._status("Save workspace unavailable: workspace store not configured")
return False
session = self._window.ui_state.session
if session is None:
- self._window._status("Save session skipped: no active session")
+ self._window._status("Save workspace skipped: no active workspace")
return False
- default_dir = self._default_session_directory()
+ default_dir = self._default_workspace_directory()
default_base = Path(default_dir) if default_dir else Path.home()
- default_name = f"session_{session.session_id}.json"
+ default_name = f"workspace_{session.session_id}.json"
path_str, _selected = QFileDialog.getSaveFileName(
self._window,
- "Save Session",
+ "Save Workspace",
str(default_base / default_name),
"JSON Files (*.json);;All Files (*)",
)
@@ -60,24 +66,24 @@ def save_session_file(self) -> bool:
session,
self._window.workspace_assets,
)
- self._remember_session_directory(result.path.parent)
- self._window._status(f"Session saved: {result.path.name} | folder: {result.path.parent}")
+ self._remember_workspace_directory(result.path.parent)
+ self._window._status(f"Workspace saved: {result.path.name} | folder: {result.path.parent}")
return True
except Exception as exc:
- self._window._show_error("Save Session Failed", str(exc))
+ self._window._show_error("Save Workspace Failed", str(exc))
return False
- def open_session_file(self) -> None:
+ def open_workspace_file(self) -> None:
"""Open a saved session/workspace JSON file."""
if self._window.session_store is None:
- self._window._status("Open session unavailable: session store not configured")
+ self._window._status("Open workspace unavailable: workspace store not configured")
return
- start_dir = self._default_session_directory()
+ start_dir = self._default_workspace_directory()
path_str, _selected = QFileDialog.getOpenFileName(
self._window,
- "Open Session",
+ "Open Workspace",
start_dir,
"JSON Files (*.json);;All Files (*)",
)
@@ -85,31 +91,14 @@ def open_session_file(self) -> None:
return
target = Path(path_str)
- if self.load_workspace_from_file(target, source_label="Session"):
- self._remember_session_directory(target.parent)
-
- def clear_session(self) -> None:
- """Clear the active workspace, prompting to save before discarding work."""
-
- if self._has_workspace_content():
- answer = QMessageBox.question(
- self._window,
- "Clear Session",
- "Save your current work before clearing the session?",
- QMessageBox.StandardButton.Save
- | QMessageBox.StandardButton.Discard
- | QMessageBox.StandardButton.Cancel,
- QMessageBox.StandardButton.Save,
- )
- if answer == QMessageBox.StandardButton.Cancel:
- self._window._status("Clear session canceled")
- return
- if answer == QMessageBox.StandardButton.Save and not self.save_session_file():
- self._window._status("Clear session canceled")
- return
-
- self._window.load_workspace_state(self._create_empty_session(), [])
- self._window._status("Session cleared")
+ if not self._confirm_workspace_replacement(
+ title="Open Workspace",
+ prompt="Save your current workspace before opening another one?",
+ ):
+ self._window._status("Open workspace canceled")
+ return
+ if self.load_workspace_from_file(target, source_label="Workspace"):
+ self._remember_workspace_directory(target.parent)
def load_workspace_from_file(self, path: Path, *, source_label: str) -> bool:
"""Load a workspace/session JSON file and replace current workspace state."""
@@ -128,20 +117,24 @@ def load_workspace_from_file(self, path: Path, *, source_label: str) -> bool:
self._window._status(f"{source_label} loaded: {loaded.path.name} ({len(loaded.assets)} asset(s))")
return True
- def open_sessions_folder(self) -> None:
- """Open the sessions storage directory in the system file manager."""
-
- if self._window.session_store is None:
- self._window._status("Open sessions folder unavailable: session store not configured")
- return
+ def _confirm_workspace_replacement(self, *, title: str, prompt: str) -> bool:
+ if not self._has_workspace_content():
+ return True
- default_dir = self._default_session_directory()
- folder = Path(default_dir) if default_dir else self._window.session_store.paths.sessions
- folder.mkdir(parents=True, exist_ok=True)
- if not QDesktopServices.openUrl(QUrl.fromLocalFile(str(folder))):
- self._window._status(f"Open sessions folder failed: {folder}")
- return
- self._window._status(f"Opened sessions folder: {folder}")
+ answer = QMessageBox.question(
+ self._window,
+ title,
+ prompt,
+ QMessageBox.StandardButton.Save
+ | QMessageBox.StandardButton.Discard
+ | QMessageBox.StandardButton.Cancel,
+ QMessageBox.StandardButton.Save,
+ )
+ if answer == QMessageBox.StandardButton.Cancel:
+ return False
+ if answer == QMessageBox.StandardButton.Save:
+ return self.save_workspace_file()
+ return True
@staticmethod
def _create_empty_session() -> SessionState:
@@ -170,7 +163,7 @@ def _has_workspace_content(self) -> bool:
or session.macros
)
- def _default_session_directory(self) -> str:
+ def _default_workspace_directory(self) -> str:
if self._window.session_store is None:
return ""
try:
@@ -182,7 +175,7 @@ def _default_session_directory(self) -> str:
return preferred.strip()
return str(self._window.session_store.paths.sessions)
- def _remember_session_directory(self, path: Path) -> None:
+ def _remember_workspace_directory(self, path: Path) -> None:
if self._window.session_store is None:
return
try:
diff --git a/image_engine_app/ui/main_window/settings_group_builders.py b/image_engine_app/ui/main_window/settings_group_builders.py
index 0b0fa59..d667404 100644
--- a/image_engine_app/ui/main_window/settings_group_builders.py
+++ b/image_engine_app/ui/main_window/settings_group_builders.py
@@ -5,15 +5,15 @@
from functools import partial
from typing import Any, Callable
-from PySide6.QtWidgets import QCheckBox, QComboBox, QFormLayout, QLabel, QLineEdit, QPushButton, QSpinBox, QWidget
+from PySide6.QtWidgets import QCheckBox, QComboBox, QFormLayout, QLabel, QLineEdit, QSpinBox, QWidget
from image_engine_app.engine.models import (
BackgroundRemovalMode,
ChromaSubsampling,
ExportFormat,
- ExportProfile,
ScaleMethod,
)
+from image_engine_app.engine.process.output_size import CUSTOM_SIZE, OUTPUT_SIZE_CHOICES
def settings_group_builders(panel: Any) -> dict[str, Callable[[QFormLayout, QWidget], None]]:
@@ -24,14 +24,24 @@ def settings_group_builders(panel: Any) -> dict[str, Callable[[QFormLayout, QWid
"Cleanup": partial(build_cleanup_group, panel),
"Edges": partial(build_edges_group, panel),
"Transparency": partial(build_transparency_group, panel),
- "AI Enhance": partial(build_ai_enhance_group, panel),
"GIF Controls": partial(build_gif_controls_group, panel),
"Export": partial(build_export_group, panel),
- "Export Encoding": partial(build_export_encoding_group, panel),
}
def build_pixel_resolution_group(panel: Any, form: QFormLayout, page: QWidget) -> None:
+ output_size = QComboBox(page)
+ for choice in OUTPUT_SIZE_CHOICES:
+ output_size.addItem(choice.label, choice.key)
+ output_size.addItem("Custom dimensions", CUSTOM_SIZE)
+ output_size.setToolTip(
+ "Choose an integer scale for sprites or a standard output height. "
+ "Standard heights keep width on Auto so the image aspect ratio is preserved."
+ )
+ output_size.currentIndexChanged.connect(panel._on_output_size_changed)
+ panel._output_size = output_size
+ form.addRow("Output size", output_size)
+
resize = panel._new_float_spin(page, minimum=1.0, maximum=3200.0, step=10.0, default=100.0)
resize.setSuffix(" %")
resize.valueChanged.connect(panel._on_resize_percent_changed)
@@ -222,32 +232,11 @@ def build_transparency_group(panel: Any, form: QFormLayout, page: QWidget) -> No
form.addRow("Alpha threshold", threshold)
-def build_ai_enhance_group(panel: Any, form: QFormLayout, page: QWidget) -> None:
- upscale = panel._new_float_spin(page, minimum=1.0, maximum=16.0, step=0.5, default=1.0)
- panel._bind_float(upscale, "ai", "upscale_factor")
- panel._upscale_factor = upscale
- form.addRow("Upscale factor", upscale)
-
- deblur = panel._new_float_spin(page, minimum=0.0, maximum=2.0, step=0.05, default=0.0)
- panel._bind_float(deblur, "ai", "deblur_strength")
- panel._ai_deblur = deblur
- form.addRow("Deblur strength", deblur)
-
- reconstruct = panel._new_float_spin(page, minimum=0.0, maximum=2.0, step=0.05, default=0.0)
- panel._bind_float(reconstruct, "ai", "detail_reconstruct")
- panel._ai_detail_reconstruct = reconstruct
- form.addRow("Detail reconstruct", reconstruct)
-
- bg_remove = panel._new_float_spin(page, minimum=0.0, maximum=2.0, step=0.05, default=0.0)
- panel._bind_float(bg_remove, "ai", "bg_remove_strength")
- panel._ai_bg_remove = bg_remove
- form.addRow("BG remove strength", bg_remove)
-
-
def build_gif_controls_group(panel: Any, form: QFormLayout, page: QWidget) -> None:
frame_delay = QSpinBox(page)
- frame_delay.setRange(1, 5000)
- frame_delay.setValue(100)
+ frame_delay.setRange(0, 5000)
+ frame_delay.setValue(0)
+ frame_delay.setSpecialValueText("Keep original")
frame_delay.setSuffix(" ms")
panel._bind_int(frame_delay, "gif", "frame_delay_ms")
panel._frame_delay = frame_delay
@@ -283,14 +272,6 @@ def build_export_group(panel: Any, form: QFormLayout, page: QWidget) -> None:
panel._export_format_hint = format_hint
form.addRow("", format_hint)
- export_profile = QComboBox(page)
- export_profile.addItem("Web", ExportProfile.WEB)
- export_profile.addItem("App Asset", ExportProfile.APP_ASSET)
- export_profile.addItem("Print", ExportProfile.PRINT)
- export_profile.currentIndexChanged.connect(panel._on_export_profile_changed)
- panel._export_profile = export_profile
- form.addRow("Export profile", export_profile)
-
export_format = QComboBox(page)
export_format.addItem("Auto (profile/source)", ExportFormat.AUTO)
export_format.addItem("PNG", ExportFormat.PNG)
@@ -330,20 +311,12 @@ def build_export_group(panel: Any, form: QFormLayout, page: QWidget) -> None:
panel._strip_metadata = strip
form.addRow("", strip)
-
-def build_export_encoding_group(panel: Any, form: QFormLayout, page: QWidget) -> None:
- open_encoding = QPushButton("Open Encoding Window", page)
- open_encoding.setAutoDefault(False)
- open_encoding.clicked.connect(panel._emit_open_encoding_window)
- panel._open_encoding_window_btn = open_encoding
- form.addRow("", open_encoding)
-
compression = QSpinBox(page)
compression.setRange(0, 9)
compression.setValue(6)
panel._bind_int(compression, "export", "compression_level")
panel._compression_level = compression
- form.addRow("Compression level", compression)
+ form.addRow("PNG compression", compression)
chroma = QComboBox(page)
chroma.addItem("Auto", ChromaSubsampling.AUTO)
@@ -352,15 +325,7 @@ def build_export_encoding_group(panel: Any, form: QFormLayout, page: QWidget) ->
chroma.addItem("4:2:0", ChromaSubsampling.CS_420)
chroma.currentIndexChanged.connect(panel._on_chroma_subsampling_changed)
panel._chroma_subsampling = chroma
- form.addRow("Chroma subsampling", chroma)
-
- palette_limit = QSpinBox(page)
- palette_limit.setRange(0, 256)
- palette_limit.setValue(0)
- palette_limit.setSpecialValueText("Auto")
- palette_limit.valueChanged.connect(panel._on_palette_limit_changed)
- panel._palette_limit = palette_limit
- form.addRow("Palette Limit", palette_limit)
+ form.addRow("JPEG chroma", chroma)
ico_sizes = QLineEdit(page)
ico_sizes.setPlaceholderText("16, 32, 48, 64, 128, 256")
diff --git a/image_engine_app/ui/main_window/settings_panel.py b/image_engine_app/ui/main_window/settings_panel.py
index 81b0fd3..4b1461d 100644
--- a/image_engine_app/ui/main_window/settings_panel.py
+++ b/image_engine_app/ui/main_window/settings_panel.py
@@ -32,11 +32,15 @@
BackgroundRemovalMode,
ChromaSubsampling,
ExportFormat,
- ExportProfile,
ScaleMethod,
normalize_background_removal_mode,
)
from image_engine_app.engine.analyze.background_scan import BackgroundScanResult, inspect_background_state
+from image_engine_app.engine.process.output_size import (
+ CUSTOM_SIZE,
+ apply_output_size_choice,
+ output_size_choice_for,
+)
from image_engine_app.ui.common.icons import icon
from image_engine_app.ui.common.state_bindings import EngineUIState
from image_engine_app.ui.main_window.settings_group_builders import settings_group_builders
@@ -60,7 +64,6 @@ class _SettingsGroupNavigator(QFrame):
"Color and Light": "Color",
"Transparency": "Alpha",
"GIF Controls": "GIF",
- "Export Encoding": "Encoding",
}
TILE_ICONS = {
"Pixel": "settings-pixel",
@@ -71,7 +74,6 @@ class _SettingsGroupNavigator(QFrame):
"Alpha": "settings-alpha",
"GIF": "settings-gif",
"Export": "settings-export",
- "Encoding": "settings-encoding",
}
def __init__(self, parent: QWidget | None = None) -> None:
@@ -195,8 +197,6 @@ def widget(self, index: int) -> QWidget | None:
class SettingsPanel(QScrollArea):
"""Right-docked settings panel shell matching the spec layout."""
- open_encoding_window_requested = Signal()
-
GROUP_SPECS = [
_GroupSpec("Pixel and Resolution"),
_GroupSpec("Color and Light"),
@@ -206,7 +206,6 @@ class SettingsPanel(QScrollArea):
_GroupSpec("Transparency"),
_GroupSpec("GIF Controls", requires_gif=True),
_GroupSpec("Export"),
- _GroupSpec("Export Encoding"),
]
GROUP_HELP = {
"Pixel and Resolution": "Real output size, DPI, target width/height, and scale style.",
@@ -217,7 +216,6 @@ class SettingsPanel(QScrollArea):
"Transparency": "White/black cutout and alpha edge cleanup.",
"GIF Controls": "Animation timing, palette, and GIF output tuning.",
"Export": "Final output format, quality, and metadata settings.",
- "Export Encoding": "Compression, chroma, palette, and icon size tuning.",
}
_LOCK_THEME = {
@@ -240,11 +238,9 @@ def __init__(self, parent: QWidget | None = None) -> None:
self._background_scan = BackgroundScanResult()
self._visible_group_count = 0
self._suspend_setting_events = False
- self._syncing_resize_dpi = False
- self._last_resize_percent_for_dpi_sync = 100.0
- self._last_dpi_for_resize_sync = 72
# Pixel
+ self._output_size: QComboBox | None = None
self._resize_percent: QDoubleSpinBox | None = None
self._dpi: QSpinBox | None = None
self._pixel_snap: QCheckBox | None = None
@@ -286,12 +282,6 @@ def __init__(self, parent: QWidget | None = None) -> None:
self._matte_fix: QDoubleSpinBox | None = None
self._alpha_threshold: QSpinBox | None = None
- # AI
- self._upscale_factor: QDoubleSpinBox | None = None
- self._ai_deblur: QDoubleSpinBox | None = None
- self._ai_detail_reconstruct: QDoubleSpinBox | None = None
- self._ai_bg_remove: QDoubleSpinBox | None = None
-
# GIF
self._frame_delay: QSpinBox | None = None
self._gif_dither: QDoubleSpinBox | None = None
@@ -300,18 +290,14 @@ def __init__(self, parent: QWidget | None = None) -> None:
self._gif_frame_optimize: QCheckBox | None = None
# Export
- self._export_profile: QComboBox | None = None
self._export_format: QComboBox | None = None
self._export_quality: QSpinBox | None = None
self._strip_metadata: QCheckBox | None = None
self._export_format_hint: QLabel | None = None
self._export_quality_hint: QLabel | None = None
- # Expert encoding
- self._open_encoding_window_btn: QPushButton | None = None
self._compression_level: QSpinBox | None = None
self._chroma_subsampling: QComboBox | None = None
- self._palette_limit: QSpinBox | None = None
self._ico_sizes: QLineEdit | None = None
self._build_ui()
@@ -320,7 +306,7 @@ def bind_state(self, ui_state: EngineUIState) -> None:
self._ui_state = ui_state
ui_state.active_asset_changed.connect(self._on_active_asset_changed)
ui_state.background_removal_mode_changed.connect(self._on_background_removal_mode_changed)
- ui_state.export_profile_changed.connect(lambda _value: self._sync_controls_from_asset(ui_state.active_asset))
+ ui_state.export_profile_changed.connect(self._on_export_profile_applied)
self._on_active_asset_changed(ui_state.active_asset)
def _build_ui(self) -> None:
@@ -348,7 +334,7 @@ def _build_ui(self) -> None:
reset_current_btn = QPushButton("Reset All", header_card)
reset_current_btn.setObjectName("settingsResetButton")
reset_current_btn.setAutoDefault(False)
- reset_current_btn.setToolTip("Reset only the active asset edits back to the original default state.")
+ reset_current_btn.setToolTip("Restore the controls detected for the active asset when it was imported.")
reset_current_btn.clicked.connect(self._emit_reset_current_defaults)
self._reset_current_defaults_btn = reset_current_btn
title_row.addWidget(reset_current_btn, 0)
@@ -373,8 +359,6 @@ def _build_ui(self) -> None:
self._group_controls_by_index[idx] = controls_widget
self._group_lock_labels_by_index[idx] = lock_label
- self._build_hidden_compatibility_controls(container)
-
layout.addStretch(0)
self.setWidget(container)
self.setMinimumWidth(380)
@@ -382,16 +366,6 @@ def _build_ui(self) -> None:
self._set_bound_controls_enabled(False)
self._refresh_header_summary()
- def _build_hidden_compatibility_controls(self, parent: QWidget) -> None:
- """Build settings that remain supported but are not part of the locked mock shell."""
-
- hidden = QWidget(parent)
- hidden.setVisible(False)
- form = QFormLayout(hidden)
- builder = settings_group_builders(self).get("AI Enhance")
- if builder is not None:
- builder(form, hidden)
-
def _new_float_spin(
self,
parent: QWidget,
@@ -506,64 +480,27 @@ def _emit_reset_current_defaults(self) -> None:
if self._ui_state is not None:
self._ui_state.request_global_reset()
- def _emit_open_encoding_window(self) -> None:
- self.open_encoding_window_requested.emit()
-
- def _on_resize_percent_changed(self, value: float) -> None:
- value_f = float(value)
- self._update_setting("pixel", "resize_percent", value_f)
-
- if self._suspend_setting_events:
- self._last_resize_percent_for_dpi_sync = value_f
+ def _on_output_size_changed(self, _index: int) -> None:
+ if self._suspend_setting_events or self._output_size is None or self._ui_state is None:
return
-
- if self._syncing_resize_dpi or self._dpi is None:
- self._last_resize_percent_for_dpi_sync = value_f
+ asset = self._ui_state.active_asset
+ if asset is None:
return
- previous_resize = max(0.01, float(self._last_resize_percent_for_dpi_sync))
- current_dpi = int(self._dpi.value())
- scaled_dpi = int(round(current_dpi * (value_f / previous_resize)))
- self._last_resize_percent_for_dpi_sync = value_f
- scaled_dpi = max(1, min(int(self._dpi.maximum()), scaled_dpi))
- if scaled_dpi == current_dpi:
- self._last_dpi_for_resize_sync = current_dpi
+ choice_key = str(self._output_size.currentData() or CUSTOM_SIZE)
+ if choice_key == CUSTOM_SIZE:
return
-
- self._syncing_resize_dpi = True
- try:
- self._dpi.setValue(scaled_dpi)
- finally:
- self._syncing_resize_dpi = False
- self._last_dpi_for_resize_sync = int(self._dpi.value())
-
- def _on_dpi_changed(self, value: int) -> None:
- value_i = int(value)
- self._update_setting("pixel", "dpi", value_i)
-
- if self._suspend_setting_events:
- self._last_dpi_for_resize_sync = value_i
+ if not apply_output_size_choice(asset.edit_state.settings.pixel, choice_key):
return
- if self._syncing_resize_dpi or self._resize_percent is None:
- self._last_dpi_for_resize_sync = value_i
- return
+ self._sync_controls_from_asset(asset)
+ self._ui_state.request_light_preview()
- previous_dpi = max(1, int(self._last_dpi_for_resize_sync))
- current_resize = float(self._resize_percent.value())
- scaled_resize = current_resize * (value_i / previous_dpi)
- self._last_dpi_for_resize_sync = value_i
- scaled_resize = max(float(self._resize_percent.minimum()), min(float(self._resize_percent.maximum()), scaled_resize))
- if abs(scaled_resize - current_resize) < 0.01:
- self._last_resize_percent_for_dpi_sync = current_resize
- return
+ def _on_resize_percent_changed(self, value: float) -> None:
+ self._update_setting("pixel", "resize_percent", float(value))
- self._syncing_resize_dpi = True
- try:
- self._resize_percent.setValue(scaled_resize)
- finally:
- self._syncing_resize_dpi = False
- self._last_resize_percent_for_dpi_sync = float(self._resize_percent.value())
+ def _on_dpi_changed(self, value: int) -> None:
+ self._update_setting("pixel", "dpi", int(value))
def _on_active_asset_changed(self, asset: object) -> None:
if asset is None:
@@ -581,6 +518,7 @@ def _on_active_asset_changed(self, asset: object) -> None:
self._update_export_controls_hint(asset)
self._refresh_header_summary()
self._refresh_background_status(asset)
+ self._update_alpha_control_availability(asset)
def _apply_filters(self) -> None:
visible_count = 0
@@ -640,6 +578,9 @@ def _update_export_controls_hint(self, asset: object) -> None:
self._export_quality_hint.setText(
"Quality control is enabled after you select an asset."
)
+ for widget in (self._compression_level, self._chroma_subsampling, self._ico_sizes):
+ if widget is not None:
+ widget.setEnabled(False)
return
settings = getattr(getattr(asset, "edit_state", None), "settings", None)
@@ -668,6 +609,12 @@ def _update_export_controls_hint(self, asset: object) -> None:
if self._export_quality is not None:
self._export_quality.setEnabled(lossy)
+ if self._compression_level is not None:
+ self._compression_level.setEnabled(effective_fmt_value == "png")
+ if self._chroma_subsampling is not None:
+ self._chroma_subsampling.setEnabled(effective_fmt_value in {"jpg", "jpeg"})
+ if self._ico_sizes is not None:
+ self._ico_sizes.setEnabled(effective_fmt_value == "ico")
if self._export_quality_hint is not None:
if lossy:
@@ -692,6 +639,12 @@ def _sync_controls_from_asset(self, asset: object) -> None:
self._suspend_setting_events = True
try:
# Pixel
+ if self._output_size is not None:
+ choice_key = output_size_choice_for(settings.pixel)
+ for idx in range(self._output_size.count()):
+ if self._output_size.itemData(idx) == choice_key:
+ self._output_size.setCurrentIndex(idx)
+ break
if self._resize_percent is not None:
self._resize_percent.setValue(float(getattr(settings.pixel, "resize_percent", 100.0)))
if self._dpi is not None:
@@ -771,19 +724,9 @@ def _sync_controls_from_asset(self, asset: object) -> None:
if self._alpha_threshold is not None:
self._alpha_threshold.setValue(int(getattr(settings.alpha, "alpha_threshold", 0)))
- # AI
- if self._upscale_factor is not None:
- self._upscale_factor.setValue(float(getattr(settings.ai, "upscale_factor", 1.0)))
- if self._ai_deblur is not None:
- self._ai_deblur.setValue(float(getattr(settings.ai, "deblur_strength", 0.0)))
- if self._ai_detail_reconstruct is not None:
- self._ai_detail_reconstruct.setValue(float(getattr(settings.ai, "detail_reconstruct", 0.0)))
- if self._ai_bg_remove is not None:
- self._ai_bg_remove.setValue(float(getattr(settings.ai, "bg_remove_strength", 0.0)))
-
# GIF
if self._frame_delay is not None:
- self._frame_delay.setValue(int(getattr(settings.gif, "frame_delay_ms", 100)))
+ self._frame_delay.setValue(int(getattr(settings.gif, "frame_delay_ms", 0)))
if self._gif_dither is not None:
self._gif_dither.setValue(float(getattr(settings.gif, "dither_strength", 0.0)))
if self._gif_loop is not None:
@@ -794,12 +737,6 @@ def _sync_controls_from_asset(self, asset: object) -> None:
self._gif_frame_optimize.setChecked(bool(getattr(settings.gif, "frame_optimize", True)))
# Export + expert
- if self._export_profile is not None:
- current_profile = getattr(settings.export, "export_profile", ExportProfile.WEB)
- for idx in range(self._export_profile.count()):
- if self._export_profile.itemData(idx) == current_profile:
- self._export_profile.setCurrentIndex(idx)
- break
if self._export_format is not None:
current_format = getattr(settings.export, "format", ExportFormat.AUTO)
for idx in range(self._export_format.count()):
@@ -818,23 +755,17 @@ def _sync_controls_from_asset(self, asset: object) -> None:
if self._chroma_subsampling.itemData(idx) == current:
self._chroma_subsampling.setCurrentIndex(idx)
break
- if self._palette_limit is not None:
- palette_value = getattr(settings.export, "palette_limit", None)
- self._palette_limit.setValue(int(palette_value) if palette_value is not None else 0)
if self._ico_sizes is not None:
sizes = getattr(settings.export, "ico_sizes", None)
if not isinstance(sizes, list) or not sizes:
sizes = [16, 32, 48, 64, 128, 256]
self._ico_sizes.setText(", ".join(str(max(1, int(value))) for value in sizes))
- if self._resize_percent is not None:
- self._last_resize_percent_for_dpi_sync = float(self._resize_percent.value())
- if self._dpi is not None:
- self._last_dpi_for_resize_sync = int(self._dpi.value())
finally:
self._suspend_setting_events = False
def _set_bound_controls_enabled(self, enabled: bool) -> None:
for widget in (
+ self._output_size,
self._resize_percent,
self._dpi,
self._pixel_snap,
@@ -863,24 +794,17 @@ def _set_bound_controls_enabled(self, enabled: bool) -> None:
self._alpha_smooth,
self._matte_fix,
self._alpha_threshold,
- self._upscale_factor,
- self._ai_deblur,
- self._ai_detail_reconstruct,
- self._ai_bg_remove,
self._frame_delay,
self._gif_dither,
self._gif_loop,
self._gif_palette_size,
self._gif_frame_optimize,
- self._export_profile,
self._export_format,
self._export_quality,
self._strip_metadata,
self._compression_level,
self._chroma_subsampling,
- self._palette_limit,
self._ico_sizes,
- self._open_encoding_window_btn,
):
if widget is not None:
widget.setEnabled(bool(enabled))
@@ -907,9 +831,25 @@ def _update_setting(self, group_name: str, field_name: str, value: Any) -> None:
return
setattr(group, field_name, value)
- if bool(getattr(asset.edit_state, "auto_apply_light", False)):
+ if group_name == "pixel" and field_name in {"resize_percent", "width", "height"}:
+ self._sync_output_size_from_pixel(group)
+
+ if group_name != "export":
self._ui_state.request_light_preview()
+ def _sync_output_size_from_pixel(self, pixel_settings: object) -> None:
+ if self._output_size is None:
+ return
+ choice_key = output_size_choice_for(pixel_settings)
+ self._output_size.blockSignals(True)
+ try:
+ for idx in range(self._output_size.count()):
+ if self._output_size.itemData(idx) == choice_key:
+ self._output_size.setCurrentIndex(idx)
+ break
+ finally:
+ self._output_size.blockSignals(False)
+
def _on_white_bg_mode_changed(self, _index: int) -> None:
if self._suspend_setting_events or self._white_bg_mode is None:
return
@@ -923,8 +863,31 @@ def _on_white_bg_mode_changed(self, _index: int) -> None:
def _on_background_removal_mode_changed(self, _mode_value: str) -> None:
if self._ui_state is None:
return
- self._sync_controls_from_asset(self._ui_state.active_asset)
- self._refresh_background_status(self._ui_state.active_asset)
+ asset = self._ui_state.active_asset
+ self._sync_controls_from_asset(asset)
+ self._update_export_controls_hint(asset)
+ self._refresh_background_status(asset)
+ self._update_alpha_control_availability(asset)
+
+ def _update_alpha_control_availability(self, asset: object) -> None:
+ has_asset = asset is not None and getattr(asset, "edit_state", None) is not None
+ settings = getattr(getattr(asset, "edit_state", None), "settings", None)
+ mode = BackgroundRemovalMode.OFF
+ if settings is not None:
+ mode = normalize_background_removal_mode(
+ getattr(settings.alpha, "background_removal_mode", None),
+ remove_white_bg=bool(getattr(settings.alpha, "remove_white_bg", False)),
+ )
+ alpha_available = has_asset and (self._asset_has_alpha or mode is not BackgroundRemovalMode.OFF)
+ for widget in (
+ self._alpha_smooth,
+ self._matte_fix,
+ self._alpha_threshold,
+ self._edge_grow_shrink,
+ self._edge_feather,
+ ):
+ if widget is not None:
+ widget.setEnabled(alpha_available)
def _on_chroma_subsampling_changed(self, _index: int) -> None:
if self._chroma_subsampling is None:
@@ -933,13 +896,12 @@ def _on_chroma_subsampling_changed(self, _index: int) -> None:
if isinstance(value, ChromaSubsampling):
self._update_setting("export", "chroma_subsampling", value)
- def _on_export_profile_changed(self, _index: int) -> None:
- if self._suspend_setting_events or self._export_profile is None or self._ui_state is None:
+ def _on_export_profile_applied(self, _profile_value: str) -> None:
+ if self._ui_state is None:
return
- value = self._export_profile.currentData()
- if isinstance(value, ExportProfile):
- self._ui_state.set_export_profile(value)
- self._update_export_controls_hint(self._ui_state.active_asset)
+ asset = self._ui_state.active_asset
+ self._sync_controls_from_asset(asset)
+ self._update_export_controls_hint(asset)
def _on_export_format_changed(self, _index: int) -> None:
if self._export_format is None:
@@ -950,9 +912,6 @@ def _on_export_format_changed(self, _index: int) -> None:
if self._ui_state is not None:
self._update_export_controls_hint(self._ui_state.active_asset)
- def _on_palette_limit_changed(self, value: int) -> None:
- self._update_setting("export", "palette_limit", (None if int(value) <= 0 else int(value)))
-
def _on_ico_sizes_changed(self) -> None:
if self._ico_sizes is None:
return
@@ -1115,4 +1074,4 @@ def _build_background_status_text(
-
+
diff --git a/image_engine_app/ui/main_window/web_sources_coordinator.py b/image_engine_app/ui/main_window/web_sources_coordinator.py
index fb260ce..50ae0bc 100644
--- a/image_engine_app/ui/main_window/web_sources_coordinator.py
+++ b/image_engine_app/ui/main_window/web_sources_coordinator.py
@@ -1,4 +1,4 @@
-"""Web Sources coordinator for main-window UI event handling."""
+"""Coordinator for the Web Sources workspace."""
from __future__ import annotations
@@ -8,26 +8,26 @@
from urllib.parse import urlparse
from urllib.request import ProxyHandler, Request, build_opener, urlopen
+from PySide6.QtCore import Qt
+from PySide6.QtWidgets import QApplication, QProgressDialog, QWidget
+
from image_engine_app.app.services.web_sources_service import WebSourcesService
from image_engine_app.app.settings_store import load_web_sources_settings, save_web_sources_settings
from image_engine_app.app.web_sources_models import (
ScanResults,
SmartOptions,
- coerce_web_index_links,
- coerce_import_target,
- coerce_smart_options,
- coerce_web_items,
+ WebDiagnosticsRequest,
+ WebDownloadRequest,
+ WebLinkDiscoveryRequest,
+ WebScanRequest,
)
from image_engine_app.engine.ingest.url_ingest import DownloadGuards
from image_engine_app.engine.ingest.webpage_scan import WebpageScanCancelledError
from image_engine_app.engine.models import AssetRecord
-from PySide6.QtCore import Qt
-from PySide6.QtWidgets import QApplication, QProgressDialog, QWidget
-
class _ProgressSession:
- """Cancelable progress dialog wrapper used by web scan/download workflows."""
+ """Cancelable progress dialog shared by scan, discovery, and download work."""
def __init__(
self,
@@ -55,7 +55,6 @@ def __init__(
self.dialog.setAutoClose(False)
self.dialog.setAutoReset(False)
self.dialog.canceled.connect(self._on_cancel_requested)
-
self.dialog.show()
QApplication.processEvents()
@@ -68,7 +67,7 @@ def _on_cancel_requested(self) -> None:
QApplication.processEvents()
def is_cancel_requested(self) -> bool:
- return bool(self._cancel_requested)
+ return self._cancel_requested
def update(
self,
@@ -94,7 +93,6 @@ def close(self, *, complete: bool = False) -> None:
pass
if complete and not self._cancel_requested:
self.dialog.setValue(self.dialog.maximum())
- # Prefer hide/deleteLater over close(): some platforms can emit canceled on close.
try:
self.dialog.hide()
finally:
@@ -102,7 +100,7 @@ def close(self, *, complete: bool = False) -> None:
class WebSourcesCoordinator:
- """Encapsulates Web Sources panel initialization + scan/download actions."""
+ """Own Web Sources calls while keeping the panel free of network and file I/O."""
WINDOWS_BLOCKED_ACCESS_TEXT = (
"Windows blocked network access (WinError 10013). "
@@ -112,134 +110,6 @@ class WebSourcesCoordinator:
def __init__(self, window: Any) -> None:
self._window = window
- @classmethod
- def _normalize_network_error_message(cls, detail: str) -> str:
- raw = str(detail or "").strip()
- lowered = raw.lower()
- if "winerror 10013" in lowered or "forbidden by its access permissions" in lowered:
- return cls.WINDOWS_BLOCKED_ACCESS_TEXT
- if "timed out" in lowered or "timeout" in lowered:
- return "Network timeout: the website did not respond in time. Try again or scan fewer pages."
-
- http_match = re.search(r"http error\s+(\d{3})(?::\s*([^>]+))?", raw, flags=re.IGNORECASE)
- if http_match:
- code = int(http_match.group(1))
- reason = " ".join(str(http_match.group(2) or "").split())
- return cls._friendly_http_error(code, reason=reason)
-
- return raw or "Unknown network error"
-
- @staticmethod
- def _friendly_http_error(code: int, *, reason: str = "") -> str:
- reason_text = f" ({reason})" if reason else ""
- if code == 401:
- return "HTTP 401 (Unauthorized): this page needs authentication/cookies before scanning."
- if code == 403:
- return "HTTP 403 (Forbidden): website blocked automated scan requests. Try Network Check or a direct file URL."
- if code == 404:
- return "HTTP 404 (Not Found): the page or file URL no longer exists."
- if code == 429:
- return "HTTP 429 (Rate limited): try again in a minute, or reduce repeated scans on this host."
- if code in {500, 502, 503, 504}:
- return (
- f"HTTP {code}{reason_text}: the website/server failed before Sprite Factory could scan it. "
- "Try again later, scan a smaller page list, or use a direct file URL."
- )
- if 400 <= code < 500:
- return f"HTTP {code}{reason_text}: the website rejected this request."
- if 500 <= code < 600:
- return f"HTTP {code}{reason_text}: the website/server failed. Try again later."
- return f"HTTP {code}{reason_text}"
-
- @staticmethod
- def _is_timeout_error_message(detail: str) -> bool:
- lowered = str(detail or "").lower()
- return "timed out" in lowered or "timeout" in lowered or "winerror 10060" in lowered
-
- @classmethod
- def _is_recoverable_page_scan_error_message(cls, detail: str) -> bool:
- if cls._is_timeout_error_message(detail):
- return True
- http_match = re.search(r"http error\s+(\d{3})", str(detail or ""), flags=re.IGNORECASE)
- if not http_match:
- return False
- return int(http_match.group(1)) in {429, 500, 502, 503, 504}
-
- @classmethod
- def _is_socket_access_denied(cls, exc: Exception) -> bool:
- reason = getattr(exc, "reason", exc)
- win_error = getattr(reason, "winerror", None)
- if win_error == 10013:
- return True
- message = str(reason or exc).lower()
- return "winerror 10013" in message or "forbidden by its access permissions" in message
-
- @staticmethod
- def _normalize_diagnostics_url(raw_url: str) -> str:
- candidate = str(raw_url or "").strip()
- if not candidate:
- raise ValueError("Missing page URL for diagnostics.")
- if "://" not in candidate:
- candidate = f"https://{candidate}"
- parsed = urlparse(candidate)
- if parsed.scheme.lower() not in {"http", "https"} or not parsed.netloc:
- raise ValueError("Invalid URL. Use http(s)://domain/path.")
- return candidate
-
- def _diagnostics_summary_for_url(self, area_url: str) -> str:
- normalized = self._normalize_diagnostics_url(area_url)
- parsed = urlparse(normalized)
- host = (parsed.hostname or "").strip()
- if not host:
- raise ValueError("Diagnostics failed: URL host is missing.")
-
- port = parsed.port
- if port is None:
- port = 443 if parsed.scheme.lower() == "https" else 80
-
- try:
- socket.getaddrinfo(host, port, type=socket.SOCK_STREAM)
- except Exception as exc:
- detail = self._normalize_network_error_message(str(exc))
- return f"Network diagnostics: DNS lookup failed for {host} ({detail})"
-
- try:
- with socket.create_connection((host, int(port)), timeout=4.0):
- pass
- except Exception as exc:
- if self._is_socket_access_denied(exc):
- return f"Network diagnostics: {self.WINDOWS_BLOCKED_ACCESS_TEXT}"
- detail = self._normalize_network_error_message(str(exc))
- return f"Network diagnostics: TCP connect failed to {host}:{port} ({detail})"
-
- request = Request(normalized, headers={"User-Agent": "SpriteFactory/1.0.3 (Network Diagnostics)"})
-
- try:
- with urlopen(request, timeout=8.0) as response:
- status = getattr(response, "status", None)
- code = int(status) if isinstance(status, int) else 200
- return f"Network diagnostics OK: DNS + TCP + HTTP {code} for {host}:{port}"
- except Exception as first_exc:
- if self._is_socket_access_denied(first_exc):
- return f"Network diagnostics: {self.WINDOWS_BLOCKED_ACCESS_TEXT}"
-
- try:
- direct_opener = build_opener(ProxyHandler({}))
- with direct_opener.open(request, timeout=8.0) as response:
- status = getattr(response, "status", None)
- code = int(status) if isinstance(status, int) else 200
- return (
- f"Network diagnostics OK (direct/no-proxy): DNS + TCP + HTTP {code} for {host}:{port}"
- )
- except Exception as second_exc:
- if self._is_socket_access_denied(second_exc):
- return f"Network diagnostics: {self.WINDOWS_BLOCKED_ACCESS_TEXT}"
- detail = self._normalize_network_error_message(str(first_exc))
- return (
- "Network diagnostics partial: DNS + TCP succeeded, "
- f"HTTP request failed ({detail})"
- )
-
def init_panel(self) -> None:
registry: list[dict] = []
selected_website_id: str | None = None
@@ -255,16 +125,20 @@ def init_panel(self) -> None:
paths = getattr(self._window.controller, "app_paths", None)
if paths is not None:
try:
- web_cfg = load_web_sources_settings(paths)
- raw_registry = web_cfg.get("registry")
+ config = load_web_sources_settings(paths)
+ raw_registry = config.get("registry")
if isinstance(raw_registry, list):
registry = self._window.controller.load_web_sources_registry(raw_registry)
-
- selected = web_cfg.get("last_selected") if isinstance(web_cfg.get("last_selected"), dict) else {}
+ selected = config.get("last_selected") if isinstance(config.get("last_selected"), dict) else {}
selected_website_id = str(selected.get("website_id")) if selected.get("website_id") else None
selected_area_id = str(selected.get("area_id")) if selected.get("area_id") else None
-
- smart = coerce_smart_options(web_cfg.get("options"))
+ options = config.get("options") if isinstance(config.get("options"), dict) else {}
+ smart = SmartOptions(
+ show_likely=bool(options.get("show_likely", False)),
+ auto_sort=True,
+ skip_duplicates=bool(options.get("skip_duplicates", True)),
+ allow_zip=bool(options.get("allow_zip", True)),
+ )
except Exception:
pass
@@ -283,17 +157,16 @@ def persist_state(
smart: SmartOptions | None = None,
registry: list[dict] | None = None,
) -> None:
- if self._window.controller is None:
+ controller = self._window.controller
+ if controller is None:
return
-
- paths = getattr(self._window.controller, "app_paths", None)
+ paths = getattr(controller, "app_paths", None)
if paths is None:
return
panel_website_id, panel_area_id = self._window.web_sources_panel.selected_source_ids()
active_smart = smart or self._window.web_sources_panel.smart_options()
active_registry = registry if registry is not None else self._window.web_sources_panel.sources_registry()
-
try:
save_web_sources_settings(
paths,
@@ -304,308 +177,156 @@ def persist_state(
},
options={
"show_likely": active_smart.show_likely,
- "auto_sort": active_smart.auto_sort,
+ "auto_sort": True,
"skip_duplicates": active_smart.skip_duplicates,
"allow_zip": active_smart.allow_zip,
},
)
except Exception:
- # Persistence failures should not block the UI workflow.
- pass
+ # Settings persistence must never block scanning or downloading.
+ return
def on_registry_changed(self, payload: object) -> None:
- if self._window.controller is None:
+ controller = self._window.controller
+ if controller is None:
return
-
if not isinstance(payload, list):
- self._window.web_sources_panel.set_status("Invalid website registry payload.")
+ self._window.web_sources_panel.set_status("Saved-page update was invalid.")
return
- registry = self._window.controller.load_web_sources_registry(payload)
-
+ registry = controller.load_web_sources_registry(payload)
website_id, area_id = self._window.web_sources_panel.selected_source_ids()
self._window.web_sources_panel.set_sources(
websites=registry,
selected_website_id=website_id,
selected_area_id=area_id,
)
- persisted_website_id, persisted_area_id = self._window.web_sources_panel.selected_source_ids()
- self.persist_state(
- website_id=persisted_website_id,
- area_id=persisted_area_id,
- registry=registry,
- )
-
- def on_scan_requested(self, payload: object) -> None:
- if self._window.controller is None:
- self._window.web_sources_panel.set_status("Web Sources scan unavailable: controller not configured")
- return
-
- if not isinstance(payload, dict):
- self._window.web_sources_panel.set_status("Invalid scan payload.")
- return
-
- area_url = str(payload.get("area_url", "")).strip()
- if not area_url:
- self._window.web_sources_panel.set_status("Enter a URL or pick a saved page first.")
- return
-
- smart = coerce_smart_options(payload.get("smart"))
- progress = _ProgressSession(
- window=self._window,
- panel=self._window.web_sources_panel,
- label_text="Scanning webpage for assets...",
- title="Web Sources Scan",
- minimum=0,
- maximum=0,
- cancel_label_text="Cancelling scan...",
- cancel_status_text="Cancelling scan...",
- )
-
- try:
- results = self._window.controller.scan_web_sources_area(
- area_url,
- show_likely=smart.show_likely,
- cancel_requested=progress.is_cancel_requested,
- )
- except WebpageScanCancelledError:
- self._window.web_sources_panel.set_status("Scan cancelled")
- self._window._status("Web Sources scan cancelled")
- return
- except Exception as exc:
- detail = self._normalize_network_error_message(str(exc))
- if self._is_recoverable_page_scan_error_message(str(exc)):
- results = ScanResults(items=(), filtered_count=0, failed_pages=(f"{area_url}: {detail}",))
- self._window.web_sources_panel.set_results(results)
- self._window._status("Web Sources scan finished: 0 item(s), 1 failed page")
- self.persist_state(
- website_id=(str(payload.get("website_id")) if payload.get("website_id") else None),
- area_id=(str(payload.get("area_id")) if payload.get("area_id") else None),
- smart=smart,
- )
- return
- self._window.web_sources_panel.set_status(f"Scan failed: {detail}")
- return
- finally:
- progress.close()
-
- self._window.web_sources_panel.set_results(results)
- self._window._status(f"Web Sources scan complete: {len(results.items)} item(s)")
- self.persist_state(
- website_id=(str(payload.get("website_id")) if payload.get("website_id") else None),
- area_id=(str(payload.get("area_id")) if payload.get("area_id") else None),
- smart=smart,
- )
+ self.persist_state(website_id=website_id, area_id=area_id, registry=registry)
- def on_index_links_requested(self, payload: object) -> None:
- if self._window.controller is None:
- self._window.web_sources_panel.set_status("Web Sources index scan unavailable: controller not configured")
+ def on_preferences_changed(self, payload: object) -> None:
+ if not isinstance(payload, SmartOptions):
return
+ self.persist_state(smart=payload)
- if not isinstance(payload, dict):
- self._window.web_sources_panel.set_status("Invalid index scan payload.")
- return
-
- index_url = str(payload.get("index_url", "")).strip()
- if not index_url:
- self._window.web_sources_panel.set_status("Enter a URL or pick a saved page first.")
- return
-
- smart = coerce_smart_options(payload.get("smart"))
- progress = _ProgressSession(
- window=self._window,
- panel=self._window.web_sources_panel,
- label_text="Finding linked sprite pages...",
- title="Web Sources Index Scan",
- minimum=0,
- maximum=0,
- cancel_label_text="Cancelling index scan...",
- cancel_status_text="Cancelling index scan...",
- )
-
- try:
- links = self._window.controller.discover_web_source_index_links(
- index_url,
- same_domain_only=True,
- cancel_requested=progress.is_cancel_requested,
- )
- except WebpageScanCancelledError:
- self._window.web_sources_panel.set_status("Index scan cancelled")
- self._window._status("Web Sources index scan cancelled")
- return
- except Exception as exc:
- detail = self._normalize_network_error_message(str(exc))
- self._window.web_sources_panel.set_status(f"Index scan failed: {detail}")
+ def on_scan_requested(self, payload: object) -> None:
+ controller = self._window.controller
+ panel = self._window.web_sources_panel
+ if controller is None:
+ panel.set_status("Web Sources scanning is unavailable because the controller is not configured.")
return
- finally:
- progress.close()
-
- self._window.web_sources_panel.set_index_links(links)
- self._window._status(f"Web Sources index scan complete: {len(links)} linked page(s)")
- self.persist_state(
- website_id=(str(payload.get("website_id")) if payload.get("website_id") else None),
- area_id=(str(payload.get("area_id")) if payload.get("area_id") else None),
- smart=smart,
- )
-
- def on_multi_scan_requested(self, payload: object) -> None:
- if self._window.controller is None:
- self._window.web_sources_panel.set_status("Web Sources multi-page scan unavailable: controller not configured")
+ if not isinstance(payload, WebScanRequest):
+ panel.set_status("The page scan request was invalid.")
return
- if not isinstance(payload, dict):
- self._window.web_sources_panel.set_status("Invalid multi-page scan payload.")
+ urls = self._unique_urls(payload.urls)
+ if not urls:
+ panel.set_status("Choose at least one valid page URL to scan.")
return
- links = coerce_web_index_links(payload.get("pages"))
- if not links:
- self._window.web_sources_panel.set_status("Select one or more linked pages first.")
- return
+ cap = int(getattr(panel, "PAGE_SCAN_CAP", 100))
+ if len(urls) > cap:
+ if not panel.confirm_large_page_scan(len(urls), cap=cap):
+ panel.set_status("Page scan cancelled before starting.")
+ return
+ urls = urls[:cap]
- smart = coerce_smart_options(payload.get("smart"))
progress = _ProgressSession(
window=self._window,
- panel=self._window.web_sources_panel,
- label_text=f"Scanning {len(links)} linked page(s)...",
- title="Web Sources Multi-Page Scan",
+ panel=panel,
+ label_text=f"Scanning {len(urls)} page(s)...",
+ title="Web Sources Scan",
minimum=0,
maximum=0,
- cancel_label_text="Cancelling multi-page scan...",
- cancel_status_text="Cancelling multi-page scan...",
+ cancel_label_text="Cancelling page scan...",
+ cancel_status_text="Cancelling page scan...",
)
-
+ results: ScanResults | None = None
try:
- results = self._window.controller.scan_web_source_pages(
- [link.url for link in links],
- show_likely=smart.show_likely,
+ results = controller.scan_web_source_pages(
+ urls,
+ show_likely=payload.smart.show_likely,
cancel_requested=progress.is_cancel_requested,
)
except WebpageScanCancelledError:
- self._window.web_sources_panel.set_status("Multi-page scan cancelled")
- self._window._status("Web Sources multi-page scan cancelled")
+ panel.set_status("Page scan cancelled. Existing Found Files were kept.")
+ self._window._status("Web Sources scan cancelled")
return
except Exception as exc:
- detail = self._normalize_network_error_message(str(exc))
- self._window.web_sources_panel.set_status(f"Multi-page scan failed: {detail}")
+ panel.set_status(f"Page scan failed: {self._normalize_network_error_message(str(exc))}")
return
finally:
- progress.close()
-
- self._window.web_sources_panel.set_results(results)
- self._window._status(
- f"Web Sources multi-page scan complete: {len(results.items)} item(s) from {len(links)} page(s)"
+ progress.close(complete=results is not None)
+
+ friendly_results = self._friendly_scan_results(results)
+ outcome = panel.add_results(friendly_results)
+ failed_count = len(friendly_results.failed_pages)
+ status = (
+ f"Web Sources scan complete: {outcome.added_count} new, "
+ f"{len(outcome.results.items)} total"
)
+ if failed_count:
+ status += f", {failed_count} page(s) failed"
+ self._window._status(status)
self.persist_state(
- website_id=(str(payload.get("website_id")) if payload.get("website_id") else None),
- area_id=(str(payload.get("area_id")) if payload.get("area_id") else None),
- smart=smart,
+ website_id=payload.website_id,
+ area_id=payload.area_id,
+ smart=payload.smart,
)
- def on_index_scan_all_requested(self, payload: object) -> None:
- if self._window.controller is None:
- self._window.web_sources_panel.set_status("Web Sources linked-page scan unavailable: controller not configured")
- return
-
- if not isinstance(payload, dict):
- self._window.web_sources_panel.set_status("Invalid linked-page scan payload.")
+ def on_discover_links_requested(self, payload: object) -> None:
+ controller = self._window.controller
+ panel = self._window.web_sources_panel
+ if controller is None:
+ panel.set_status("Linked-page discovery is unavailable because the controller is not configured.")
return
-
- index_url = str(payload.get("index_url", "")).strip()
- if not index_url:
- self._window.web_sources_panel.set_status("Enter a URL or pick a saved page first.")
+ if not isinstance(payload, WebLinkDiscoveryRequest) or not payload.url.strip():
+ panel.set_status("Choose a valid page before finding linked pages.")
return
- smart = coerce_smart_options(payload.get("smart"))
progress = _ProgressSession(
window=self._window,
- panel=self._window.web_sources_panel,
+ panel=panel,
label_text="Finding linked pages...",
- title="Web Sources Linked Page Scan",
+ title="Find Linked Pages",
minimum=0,
maximum=0,
- cancel_label_text="Cancelling linked-page scan...",
- cancel_status_text="Cancelling linked-page scan...",
+ cancel_label_text="Cancelling page discovery...",
+ cancel_status_text="Cancelling page discovery...",
)
-
+ links = None
try:
- links = self._window.controller.discover_web_source_index_links(
- index_url,
- same_domain_only=True,
- cancel_requested=progress.is_cancel_requested,
- )
- self._window.web_sources_panel.set_index_links(links)
- if not links:
- self._window.web_sources_panel.set_status(
- "Found 0 linked pages. Try Scan Page for this page or choose a broader index page."
- )
- self._window._status("Web Sources linked-page scan found 0 linked pages")
- return
-
- page_count = len(links)
- scan_cap = int(getattr(self._window.web_sources_panel, "LINKED_PAGE_SCAN_CAP", 100))
- if page_count > scan_cap:
- should_continue = self._window.web_sources_panel.confirm_large_linked_page_scan(
- page_count,
- cap=scan_cap,
- )
- if not should_continue:
- self._window.web_sources_panel.set_status("Linked-page scan cancelled before starting.")
- self._window._status("Web Sources linked-page scan cancelled before starting")
- return
- links = links[:scan_cap]
-
- progress.update(
- done_count=0,
- total_count=max(1, len(links)),
- label_text=f"Scanning {len(links)} linked page(s)...",
- status_text=f"Scanning {len(links)} linked page(s)...",
- )
- results = self._window.controller.scan_web_source_pages(
- [link.url for link in links],
- show_likely=smart.show_likely,
+ links = controller.discover_web_source_index_links(
+ payload.url,
cancel_requested=progress.is_cancel_requested,
)
except WebpageScanCancelledError:
- self._window.web_sources_panel.set_status("Linked-page scan cancelled")
- self._window._status("Web Sources linked-page scan cancelled")
+ panel.set_status("Linked-page discovery cancelled.")
+ self._window._status("Web Sources page discovery cancelled")
return
except Exception as exc:
- detail = self._normalize_network_error_message(str(exc))
- self._window.web_sources_panel.set_status(f"Linked-page scan failed: {detail}")
+ panel.set_status(f"Could not find linked pages: {self._normalize_network_error_message(str(exc))}")
return
finally:
- progress.close()
+ progress.close(complete=links is not None)
- self._window.web_sources_panel.set_results(results)
- self._window._status(
- f"Web Sources linked-page scan complete: {len(results.items)} item(s) from {len(links)} page(s)"
- )
- self.persist_state(
- website_id=(str(payload.get("website_id")) if payload.get("website_id") else None),
- area_id=(str(payload.get("area_id")) if payload.get("area_id") else None),
- smart=smart,
- )
+ panel.set_index_links(tuple(links))
+ self._window._status(f"Web Sources found {len(links)} linked page(s)")
+ self.persist_state(website_id=payload.website_id, area_id=payload.area_id)
def on_download_requested(self, payload: object) -> None:
- if self._window.controller is None:
- self._window.web_sources_panel.set_status("Web Sources download unavailable: controller not configured")
+ controller = self._window.controller
+ panel = self._window.web_sources_panel
+ if controller is None:
+ panel.set_status("Web Sources downloading is unavailable because the controller is not configured.")
return
-
- if not isinstance(payload, dict):
- self._window.web_sources_panel.set_status("Invalid download payload.")
+ if not isinstance(payload, WebDownloadRequest) or not payload.items:
+ panel.set_status("Select at least one found file to download.")
return
- items = coerce_web_items(payload.get("items"))
- if not items:
- self._window.web_sources_panel.set_status("Select at least one item to download.")
- return
-
- target = coerce_import_target(payload.get("target"))
- smart = coerce_smart_options(payload.get("smart"))
-
+ items = list(payload.items)
progress = _ProgressSession(
window=self._window,
- panel=self._window.web_sources_panel,
+ panel=panel,
label_text="Preparing downloads...",
title="Web Sources Download",
minimum=0,
@@ -615,17 +336,17 @@ def on_download_requested(self, payload: object) -> None:
)
progress.update(
done_count=0,
- total_count=max(1, len(items)),
+ total_count=len(items),
label_text="Preparing downloads...",
status_text="Preparing downloads...",
)
report = None
try:
- report = self._window.controller.download_web_sources_items(
+ report = controller.download_web_sources_items(
items,
- target,
- smart=smart,
+ payload.target,
+ smart=payload.smart,
guards=DownloadGuards(max_bytes=25 * 1024 * 1024, max_pixels=64_000_000),
progress_callback=lambda done, total, message: progress.update(
done_count=done,
@@ -636,62 +357,183 @@ def on_download_requested(self, payload: object) -> None:
cancel_requested=progress.is_cancel_requested,
)
except Exception as exc:
- detail = self._normalize_network_error_message(str(exc))
- self._window.web_sources_panel.set_status(f"Download failed: {detail}")
+ panel.set_status(f"Download failed: {self._normalize_network_error_message(str(exc))}")
return
finally:
- should_mark_complete = bool(report is not None and not getattr(report, "cancelled", False))
- progress.close(complete=should_mark_complete)
-
- if report.assets:
+ progress.close(complete=bool(report is not None and not getattr(report, "cancelled", False)))
+
+ workspace_assets = [
+ asset
+ for asset in tuple(getattr(report, "assets", ()) or ())
+ if isinstance(asset, AssetRecord)
+ ]
+ if workspace_assets:
try:
- workspace_assets = [
- asset
- for asset in tuple(getattr(report, "assets", ()) or ())
- if isinstance(asset, AssetRecord)
- ]
- if workspace_assets:
- self._window._register_assets(workspace_assets, set_active=True)
+ self._window._register_assets(workspace_assets, set_active=True)
except Exception as exc:
detail = str(exc).strip() or exc.__class__.__name__
- self._window.web_sources_panel.set_status(
- f"Download completed but failed to load workspace assets: {detail}"
- )
- self._window._status("Web Sources import completed, but workspace load failed")
+ panel.set_status(f"Download completed but workspace loading failed: {detail}")
+ self._window._status("Web Sources download completed, but workspace load failed")
self.persist_state(
- website_id=(str(payload.get("website_id")) if payload.get("website_id") else None),
- area_id=(str(payload.get("area_id")) if payload.get("area_id") else None),
- smart=smart,
+ website_id=payload.website_id,
+ area_id=payload.area_id,
+ smart=payload.smart,
)
return
message = self.format_download_status(report)
- self._window.web_sources_panel.set_status(message)
+ panel.set_status(message)
self._window._status(message)
self.persist_state(
- website_id=(str(payload.get("website_id")) if payload.get("website_id") else None),
- area_id=(str(payload.get("area_id")) if payload.get("area_id") else None),
- smart=smart,
+ website_id=payload.website_id,
+ area_id=payload.area_id,
+ smart=payload.smart,
)
- def on_network_diagnostics_requested(self, payload: object) -> None:
- if not isinstance(payload, dict):
- self._window.web_sources_panel.set_status("Invalid diagnostics payload.")
+ def on_diagnostics_requested(self, payload: object) -> None:
+ panel = self._window.web_sources_panel
+ if not isinstance(payload, WebDiagnosticsRequest) or not payload.url.strip():
+ panel.set_status("Choose a valid page URL before running a connection check.")
return
+ try:
+ summary = self._diagnostics_summary_for_url(payload.url)
+ except Exception as exc:
+ summary = f"Connection check failed: {self._normalize_network_error_message(str(exc))}"
+ panel.set_status(summary)
+ self._window._status(summary)
- area_url = str(payload.get("area_url", "")).strip()
- if not area_url:
- self._window.web_sources_panel.set_status("Enter a URL or pick a saved page for diagnostics.")
- return
+ @staticmethod
+ def _unique_urls(values: tuple[str, ...]) -> list[str]:
+ urls: list[str] = []
+ seen: set[str] = set()
+ for value in values:
+ url = str(value or "").strip()
+ if not url or url.casefold() in seen:
+ continue
+ seen.add(url.casefold())
+ urls.append(url)
+ return urls
+
+ @classmethod
+ def _friendly_scan_results(cls, results: ScanResults) -> ScanResults:
+ failures: list[str] = []
+ for entry in tuple(results.failed_pages or ()):
+ text = " ".join(str(entry).split())
+ scheme_at = text.find("://")
+ separator = text.find(": ", scheme_at + 3 if scheme_at >= 0 else 0)
+ if separator < 0:
+ failures.append(cls._normalize_network_error_message(text))
+ continue
+ page = text[:separator]
+ detail = text[separator + 2 :]
+ failures.append(f"{page}: {cls._normalize_network_error_message(detail)}")
+ return ScanResults(
+ items=tuple(results.items),
+ filtered_count=int(results.filtered_count or 0),
+ failed_pages=tuple(failures),
+ )
+
+ @classmethod
+ def _normalize_network_error_message(cls, detail: str) -> str:
+ raw = str(detail or "").strip()
+ lowered = raw.lower()
+ if "winerror 10013" in lowered or "forbidden by its access permissions" in lowered:
+ return cls.WINDOWS_BLOCKED_ACCESS_TEXT
+ if "timed out" in lowered or "timeout" in lowered or "winerror 10060" in lowered:
+ return "Network timeout: the website did not respond in time. Try again or scan fewer pages."
+ http_match = re.search(r"http error\s+(\d{3})(?::\s*([^>]+))?", raw, flags=re.IGNORECASE)
+ if http_match:
+ return cls._friendly_http_error(
+ int(http_match.group(1)),
+ reason=" ".join(str(http_match.group(2) or "").split()),
+ )
+ return raw or "Unknown network error"
+
+ @staticmethod
+ def _friendly_http_error(code: int, *, reason: str = "") -> str:
+ reason_text = f" ({reason})" if reason else ""
+ if code == 401:
+ return "HTTP 401 (Unauthorized): this page needs authentication or cookies before scanning."
+ if code == 403:
+ return "HTTP 403 (Forbidden): the website blocked automated scanning. Try a connection check or a direct file URL."
+ if code == 404:
+ return "HTTP 404 (Not Found): the page or file URL no longer exists."
+ if code == 429:
+ return "HTTP 429 (Rate limited): wait briefly, then scan fewer pages on this website."
+ if code in {500, 502, 503, 504}:
+ return (
+ f"HTTP {code}{reason_text}: the website or server failed before Sprite Factory could scan it. "
+ "Try again later, scan fewer pages, or use a direct file URL."
+ )
+ if 400 <= code < 500:
+ return f"HTTP {code}{reason_text}: the website rejected this request."
+ if 500 <= code < 600:
+ return f"HTTP {code}{reason_text}: the website or server failed. Try again later."
+ return f"HTTP {code}{reason_text}"
+
+ @classmethod
+ def _is_socket_access_denied(cls, exc: Exception) -> bool:
+ reason = getattr(exc, "reason", exc)
+ if getattr(reason, "winerror", None) == 10013:
+ return True
+ message = str(reason or exc).lower()
+ return "winerror 10013" in message or "forbidden by its access permissions" in message
+
+ @staticmethod
+ def _normalize_diagnostics_url(raw_url: str) -> str:
+ candidate = str(raw_url or "").strip()
+ if not candidate:
+ raise ValueError("Missing page URL for the connection check.")
+ if "://" not in candidate:
+ candidate = f"https://{candidate}"
+ parsed = urlparse(candidate)
+ if parsed.scheme.lower() not in {"http", "https"} or not parsed.netloc:
+ raise ValueError("Invalid URL. Use http(s)://domain/path.")
+ return candidate
+
+ def _diagnostics_summary_for_url(self, area_url: str) -> str:
+ normalized = self._normalize_diagnostics_url(area_url)
+ parsed = urlparse(normalized)
+ host = (parsed.hostname or "").strip()
+ if not host:
+ raise ValueError("Connection check failed because the URL host is missing.")
+ port = parsed.port or (443 if parsed.scheme.lower() == "https" else 80)
try:
- summary = self._diagnostics_summary_for_url(area_url)
+ socket.getaddrinfo(host, port, type=socket.SOCK_STREAM)
except Exception as exc:
- detail = self._normalize_network_error_message(str(exc))
- summary = f"Network diagnostics failed: {detail}"
+ return f"Connection check: DNS lookup failed for {host} ({self._normalize_network_error_message(str(exc))})"
+ try:
+ with socket.create_connection((host, int(port)), timeout=4.0):
+ pass
+ except Exception as exc:
+ if self._is_socket_access_denied(exc):
+ return f"Connection check: {self.WINDOWS_BLOCKED_ACCESS_TEXT}"
+ return (
+ f"Connection check: could not connect to {host}:{port} "
+ f"({self._normalize_network_error_message(str(exc))})"
+ )
- self._window.web_sources_panel.set_status(summary)
- self._window._status(summary)
+ request = Request(normalized, headers={"User-Agent": "SpriteFactory/1.2 (Connection Check)"})
+ try:
+ with urlopen(request, timeout=8.0) as response:
+ status = getattr(response, "status", None)
+ code = int(status) if isinstance(status, int) else 200
+ return f"Connection check passed: DNS, connection, and HTTP {code} for {host}:{port}"
+ except Exception as first_exc:
+ if self._is_socket_access_denied(first_exc):
+ return f"Connection check: {self.WINDOWS_BLOCKED_ACCESS_TEXT}"
+ try:
+ direct_opener = build_opener(ProxyHandler({}))
+ with direct_opener.open(request, timeout=8.0) as response:
+ status = getattr(response, "status", None)
+ code = int(status) if isinstance(status, int) else 200
+ return f"Connection check passed without proxy: DNS, connection, and HTTP {code} for {host}:{port}"
+ except Exception as second_exc:
+ if self._is_socket_access_denied(second_exc):
+ return f"Connection check: {self.WINDOWS_BLOCKED_ACCESS_TEXT}"
+ detail = self._normalize_network_error_message(str(first_exc))
+ return f"Connection check partial: DNS and connection passed, but the page request failed ({detail})"
@staticmethod
def format_download_status(report: object) -> str:
@@ -707,17 +549,10 @@ def format_download_status(report: object) -> str:
)
reused = max(0, loaded - downloaded)
cancelled = bool(getattr(report, "cancelled", False))
- prefix = "Web Sources import cancelled" if cancelled else "Web Sources import"
+ prefix = "Web Sources download cancelled" if cancelled else "Web Sources download"
message = (
f"{prefix}: downloaded {downloaded}, reused {reused} cached, "
- f"skipped {skipped}, failed {failed}, workspace loaded {loaded}"
+ f"skipped {skipped}, failed {failed}, loaded {loaded} into the workspace"
)
- failure_preview = WebSourcesService.summarize_failures(tuple(getattr(report, "failed", ()) or ()), limit=2)
- if failure_preview:
- return f"{message} | sample failures: {failure_preview}"
- return message
-
-
-
-
-
+ sample = WebSourcesService.summarize_failures(tuple(getattr(report, "failed", ()) or ()), limit=2)
+ return f"{message} | sample failures: {sample}" if sample else message
diff --git a/image_engine_app/ui/main_window/web_sources_panel.py b/image_engine_app/ui/main_window/web_sources_panel.py
index 664a4d6..e47bad2 100644
--- a/image_engine_app/ui/main_window/web_sources_panel.py
+++ b/image_engine_app/ui/main_window/web_sources_panel.py
@@ -1,233 +1,169 @@
-"""Web Sources panel.
+"""Web Sources workspace.
-This is a thin UI shell.
-- UI emits scan/download requests.
-- Controller performs scan/download and calls set_results()/set_status().
-
-Keeping UI simple makes the scan/download workflow safer to maintain.
+The panel only collects user intent and renders state. Network work, persistence,
+downloads, and workspace imports are owned by the coordinator and services.
"""
from __future__ import annotations
-from dataclasses import asdict
+from copy import deepcopy
import re
import unicodedata
-from urllib.parse import unquote, urlparse
+from urllib.parse import unquote, urlparse, urlunparse
from PySide6.QtCore import Qt, Signal
from PySide6.QtGui import QAction
from PySide6.QtWidgets import (
- QCheckBox,
QComboBox,
QFrame,
+ QHeaderView,
QHBoxLayout,
QLabel,
QLineEdit,
QListWidget,
QListWidgetItem,
+ QMenu,
QMessageBox,
QPlainTextEdit,
QPushButton,
- QMenu,
QToolButton,
+ QTreeWidget,
+ QTreeWidgetItem,
QVBoxLayout,
QWidget,
)
-from image_engine_app.app.web_sources_models import Confidence, ImportTarget, ScanResults, SmartOptions, WebIndexLink, WebItem
+from image_engine_app.app.web_sources_models import (
+ Confidence,
+ FoundFilesStore,
+ ImportTarget,
+ ScanMergeResult,
+ ScanOrigin,
+ ScanResults,
+ SmartOptions,
+ WebDiagnosticsRequest,
+ WebDownloadRequest,
+ WebIndexLink,
+ WebItem,
+ WebLinkDiscoveryRequest,
+ WebScanRequest,
+)
class WebSourcesPanel(QFrame):
- """Main-window tab panel for Website/Area scanning + importing."""
+ """Clear four-step UI for scanning pages and importing discovered files."""
- LINKED_PAGE_SCAN_CAP = 100
+ PAGE_SCAN_CAP = 100
+ _ROLE_KIND = int(Qt.ItemDataRole.UserRole)
+ _ROLE_DATA = int(Qt.ItemDataRole.UserRole) + 1
- scan_requested = Signal(object) # payload dict
- index_links_requested = Signal(object) # payload dict
- index_scan_all_requested = Signal(object) # payload dict
- multi_scan_requested = Signal(object) # payload dict
- download_requested = Signal(object) # payload dict
- registry_changed = Signal(object) # payload list[dict]
- network_diagnostics_requested = Signal(object) # payload dict
+ scan_requested = Signal(object)
+ discover_links_requested = Signal(object)
+ download_requested = Signal(object)
+ diagnostics_requested = Signal(object)
+ registry_changed = Signal(object)
+ preferences_changed = Signal(object)
def __init__(self, parent: QWidget | None = None) -> None:
super().__init__(parent)
- self._website = QComboBox(self)
- self._area = QComboBox(self)
- self._saved_page = QComboBox(self)
- self._scan_btn = QPushButton("Scan Page", self)
- self._scan_saved_btn = QPushButton("Scan Saved", self)
- self._source_more_btn = QToolButton(self)
- self._url_more_btn = QToolButton(self)
- self._custom_url = QLineEdit(self)
- self._selected_page_hint = QLabel("Choose a website and page to scan.", self)
-
- self._find_index_links_btn = QPushButton("Find Pages", self)
- self._index_more_btn = QToolButton(self)
- self._index_keyword = QLineEdit(self)
- self._index_links = QListWidget(self)
- self._manual_links = QPlainTextEdit(self)
- self._manual_count = QLabel("0 valid URL(s)", self)
- self._scan_manual_links_btn = QPushButton("Scan List", self)
-
- self._search = QLineEdit(self)
- self._exclude_keywords = QLineEdit(self)
- self._filter_png = QCheckBox("PNG", self)
- self._filter_gif = QCheckBox("GIF", self)
- self._filter_webp = QCheckBox("WEBP", self)
- self._filter_jpg = QCheckBox("JPG", self)
- self._filter_zip = QCheckBox("ZIP", self)
-
- self._show_likely = QCheckBox("Show likely links", self)
- self._skip_dupes = QCheckBox("Skip duplicates", self)
- self._allow_zip = QCheckBox("Allow ZIP imports", self)
- self._filters_btn = QToolButton(self)
-
- self._results = QListWidget(self)
- self._selection_detail = QLabel("Select an item to see its source URL.", self)
- self._status = QLabel("", self)
- self._destination_hint = QLabel("Auto destination: Sprite Factory routes downloads into Main / Shiny / Animated / Items.", self)
- self._download_btn = QPushButton("Download", self)
+ self._entered_urls = QPlainTextEdit(self)
+ self._entered_count = QLabel("0 valid URLs", self)
+ self._scan_entered_btn = QPushButton("Scan Pages", self)
+ self._entered_more_btn = QToolButton(self)
+
+ self._saved_tree = QTreeWidget(self)
+ self._saved_count = QLabel("0 saved pages", self)
+ self._scan_saved_btn = QPushButton("Scan Selected", self)
+ self._saved_more_btn = QToolButton(self)
+
+ self._link_source = QComboBox(self)
+ self._find_links_btn = QPushButton("Find Pages", self)
+ self._scan_links_btn = QPushButton("Scan Selected", self)
+ self._links_more_btn = QToolButton(self)
+ self._links_search = QLineEdit(self)
+ self._links_count = QLabel("0 linked pages", self)
+ self._links = QListWidget(self)
+
+ self._results_search = QLineEdit(self)
+ self._exclude_words = QLineEdit(self)
+ self._filters_btn = QToolButton(self)
+ self._results_more_btn = QToolButton(self)
+ self._results_count = QLabel("0 files", self)
+ self._results = QTreeWidget(self)
+ self._selection_detail = QLabel("Select a file to see its source URL.", self)
- self._download_more_btn = QToolButton(self)
+ self._destination_hint = QLabel(
+ "Downloads are routed automatically into Main, Shiny, Animated, or Items.",
+ self,
+ )
+ self._download_options_btn = QToolButton(self)
+ self._download_btn = QPushButton("Download Selected", self)
+ self._status = QLabel("Paste one or more page URLs to begin.", self)
+
+ self._include_likely_action = self._checkable_action("Include uncertain image links", False)
+ self._skip_downloaded_action = self._checkable_action("Skip files already downloaded", True)
+ self._allow_zip_action = self._checkable_action("Allow ZIP extraction", True)
+ self._format_actions = {
+ ".png": self._checkable_action("PNG", True),
+ ".gif": self._checkable_action("GIF", True),
+ ".webp": self._checkable_action("WEBP", True),
+ ".jpg": self._checkable_action("JPG / JPEG", True),
+ ".zip": self._checkable_action("ZIP", True),
+ }
- self._items: list[WebItem] = []
- self._index_link_items: list[WebIndexLink] = []
- self._syncing_saved_page = False
- self._apply_web_sources_object_names()
+ self._registry: list[dict] = []
+ self._found_files = FoundFilesStore()
+ self._linked_items: list[WebIndexLink] = []
+ self._selected_link_urls: set[str] = set()
+ self._selected_file_urls: set[str] = set()
+ self._apply_object_names()
self._build_ui()
- self._set_index_controls_enabled(False)
-
- # --- Public API for controller ---
-
- def set_sources(self, *, websites: list[dict], selected_website_id: str | None = None, selected_area_id: str | None = None) -> None:
- """Populate saved website/page dropdowns.
-
- websites format (dict):
- {"id": str, "name": str, "areas": [{"id": str, "label": str, "url": str}, ...]}
- """
- self._website.blockSignals(True)
- self._area.blockSignals(True)
- self._saved_page.blockSignals(True)
-
- self._website.clear()
- for w in websites:
- self._website.addItem(str(w.get("name", "Website")), w)
-
- # select website
- if selected_website_id:
- for i in range(self._website.count()):
- w = self._website.itemData(i)
- if isinstance(w, dict) and w.get("id") == selected_website_id:
- self._website.setCurrentIndex(i)
- break
-
- self._rebuild_areas(selected_area_id)
- self._rebuild_saved_pages()
- self._sync_saved_page_from_selection()
-
- self._website.blockSignals(False)
- self._area.blockSignals(False)
- self._saved_page.blockSignals(False)
- self._update_selected_page_hint()
-
- def set_results(self, results: ScanResults) -> None:
- """Render scan results into the list."""
- self._items = list(results.items)
- self._refresh_list()
- visible_count = self._results.count()
- failed_pages = tuple(getattr(results, "failed_pages", ()) or ())
- failure_note = self._scan_failure_note(failed_pages)
- failure_tooltip = self._scan_failure_tooltip(failed_pages)
- if not self._items and int(results.filtered_count or 0) > 0:
- self._set_status_text(
- (
- f"Found 0 item(s); filtered out {results.filtered_count}. "
- f"Open Filters and enable 'Show likely links'.{f' {failure_note}' if failure_note else ''}"
- ),
- failure_tooltip,
- )
- return
- if not self._items and failed_pages:
- self._set_status_text(f"Found 0 item(s). {failure_note}", failure_tooltip)
- return
- if self._items and visible_count == 0:
- self._set_status_text(
- (
- f"Found {len(self._items)} item(s), but current search/filter options hide them."
- f"{f' {failure_note}' if failure_note else ''}"
- ),
- failure_tooltip,
- )
- return
- self._set_status_text(
- (
- f"Found {len(self._items)} item(s); filtered out {results.filtered_count}."
- f"{f' {failure_note}' if failure_note else ''}"
- ),
- failure_tooltip,
+ self._connect_state_actions()
+ self._refresh_entered_state()
+ self._refresh_saved_tree()
+ self._refresh_link_sources()
+ self._refresh_link_list(capture_selection=False)
+ self._refresh_results(capture_selection=False)
+
+ # --- Public coordinator boundary ---
+
+ def set_sources(
+ self,
+ *,
+ websites: list[dict],
+ selected_website_id: str | None = None,
+ selected_area_id: str | None = None,
+ ) -> None:
+ checked_urls = {page["url"] for page in self._checked_saved_pages(fallback_to_current=False)}
+ self._registry = deepcopy(websites if isinstance(websites, list) else [])
+ self._refresh_saved_tree(
+ selected_website_id=selected_website_id,
+ selected_area_id=selected_area_id,
+ checked_urls=checked_urls,
)
-
- def set_index_links(self, links: tuple[WebIndexLink, ...] | list[WebIndexLink]) -> None:
- self._index_link_items = list(links)
- self._refresh_index_link_list()
- count = len(self._index_link_items)
- self._set_index_controls_enabled(count > 0)
- if count:
- self._select_visible_index_links()
- self._status.setText(
- f"Found {count} linked page(s). Filter the list, select what you want, then scan selected pages."
- )
- else:
- self._status.setText("Found 0 linked pages. Try Scan Page for this page or choose a broader index page.")
-
- def set_status(self, msg: str) -> None:
- text = str(msg)
- self._set_status_text(text, text if len(text) > 120 else "")
-
- def _set_status_text(self, text: str, tooltip: str = "") -> None:
- self._status.setText(str(text))
- self._status.setToolTip(str(tooltip or ""))
+ self._refresh_link_sources()
def sources_registry(self) -> list[dict]:
- registry: list[dict] = []
- for index in range(self._website.count()):
- source = self._website.itemData(index)
- if not isinstance(source, dict):
- continue
- source_id = str(source.get("id", "")).strip()
- name = str(source.get("name", "")).strip()
- areas_raw = source.get("areas")
- if not source_id or not name or not isinstance(areas_raw, list):
- continue
- areas: list[dict] = []
- for area in areas_raw:
- if not isinstance(area, dict):
- continue
- area_id = str(area.get("id", "")).strip()
- label = str(area.get("label", "")).strip()
- url = str(area.get("url", "")).strip()
- if not area_id or not label or not url:
- continue
- areas.append({"id": area_id, "label": label, "url": url})
- if not areas:
- continue
- registry.append({"id": source_id, "name": name, "areas": areas})
- return registry
+ return deepcopy(self._registry)
+
+ def selected_source_ids(self) -> tuple[str | None, str | None]:
+ item = self._saved_tree.currentItem()
+ payload = self._saved_item_payload(item)
+ if payload is None:
+ return None, None
+ return payload.get("website_id"), payload.get("area_id")
def smart_options(self) -> SmartOptions:
return SmartOptions(
- show_likely=bool(self._show_likely.isChecked()),
+ show_likely=self._include_likely_action.isChecked(),
auto_sort=True,
- skip_duplicates=bool(self._skip_dupes.isChecked()),
- allow_zip=bool(self._allow_zip.isChecked()),
+ skip_duplicates=self._skip_downloaded_action.isChecked(),
+ allow_zip=self._allow_zip_action.isChecked(),
)
def set_smart_options(self, options: SmartOptions | dict | None) -> None:
- if options is None:
- return
if isinstance(options, SmartOptions):
smart = options
elif isinstance(options, dict):
@@ -240,1305 +176,960 @@ def set_smart_options(self, options: SmartOptions | dict | None) -> None:
else:
return
- self._show_likely.setChecked(smart.show_likely)
- self._skip_dupes.setChecked(smart.skip_duplicates)
- self._allow_zip.setChecked(smart.allow_zip)
+ for action, checked in (
+ (self._include_likely_action, smart.show_likely),
+ (self._skip_downloaded_action, smart.skip_duplicates),
+ (self._allow_zip_action, smart.allow_zip),
+ ):
+ action.blockSignals(True)
+ action.setChecked(bool(checked))
+ action.blockSignals(False)
- def selected_source_ids(self) -> tuple[str | None, str | None]:
- website = self._website.currentData()
- area = self._area.currentData()
- website_id = str(website.get("id")) if isinstance(website, dict) and website.get("id") else None
- area_id = str(area.get("id")) if isinstance(area, dict) and area.get("id") else None
- return website_id, area_id
+ def set_results(self, results: ScanResults) -> None:
+ self._found_files.replace(results)
+ available = {item.url for item in self._found_files.items}
+ self._selected_file_urls.intersection_update(available)
+ self._refresh_results(capture_selection=False)
+ self._show_scan_status(results)
+
+ def add_results(self, results: ScanResults) -> ScanMergeResult:
+ self._capture_result_selection()
+ outcome = self._found_files.add(results)
+ self._refresh_results(capture_selection=False)
+ self._show_scan_status(results, merge=outcome)
+ return outcome
+
+ def found_items(self) -> tuple[WebItem, ...]:
+ return self._found_files.items
- # --- Internals ---
+ def set_index_links(self, links: tuple[WebIndexLink, ...] | list[WebIndexLink]) -> None:
+ self._linked_items = list(links)
+ self._selected_link_urls = {link.url for link in self._linked_items}
+ self._refresh_link_list(capture_selection=False)
+ if self._linked_items:
+ self.set_status(
+ f"Found {len(self._linked_items)} linked page(s). Select the pages you want, then scan them."
+ )
+ else:
+ self.set_status("No linked pages were found. Try scanning this page directly or choose a broader index page.")
- def _apply_web_sources_object_names(self) -> None:
+ def set_status(self, message: str) -> None:
+ text = " ".join(str(message or "").split())
+ self._set_status_text(text, text if len(text) > 140 else "")
+
+ def confirm_large_page_scan(self, page_count: int, *, cap: int | None = None) -> bool:
+ limit = int(cap or self.PAGE_SCAN_CAP)
+ if int(page_count) <= limit:
+ return True
+ answer = QMessageBox.question(
+ self,
+ "Large page scan",
+ (
+ f"You selected {page_count} pages.\n\n"
+ "Scanning too many pages together may make the app or website unstable.\n"
+ f"Sprite Factory will scan the first {limit} pages only.\n\n"
+ "Continue?"
+ ),
+ QMessageBox.StandardButton.Yes | QMessageBox.StandardButton.No,
+ QMessageBox.StandardButton.No,
+ )
+ return answer == QMessageBox.StandardButton.Yes
+
+ # --- UI construction ---
+
+ def _apply_object_names(self) -> None:
+ self.setObjectName("webSourcesCard")
for button in (
- self._scan_btn,
+ self._scan_entered_btn,
self._scan_saved_btn,
- self._find_index_links_btn,
- self._scan_manual_links_btn,
+ self._find_links_btn,
+ self._scan_links_btn,
self._download_btn,
):
button.setObjectName("webSourcesPrimaryAction")
- self._index_links.setObjectName("webSourcesIndexList")
- self._manual_links.setObjectName("webSourcesManualList")
- self._results.setObjectName("webSourcesResultsList")
+ for label in (self._entered_count, self._saved_count, self._links_count, self._results_count):
+ label.setObjectName("webSourcesCountBadge")
+ self._entered_urls.setObjectName("webSourcesUrlList")
+ self._saved_tree.setObjectName("webSourcesSavedTree")
+ self._links.setObjectName("webSourcesIndexList")
+ self._results.setObjectName("webSourcesResultsTree")
def _build_ui(self) -> None:
- self.setObjectName("webSourcesCard")
self.setFrameShape(QFrame.Shape.NoFrame)
-
outer = QVBoxLayout(self)
outer.setContentsMargins(10, 10, 10, 10)
outer.setSpacing(8)
- outer.addWidget(self._build_source_section())
- outer.addWidget(self._build_saved_section())
- outer.addWidget(self._build_pages_section())
+ source_row = QHBoxLayout()
+ source_row.setSpacing(8)
+ source_row.addWidget(self._build_entered_section(), 3)
+ source_row.addWidget(self._build_saved_section(), 2)
+ outer.addLayout(source_row)
+ outer.addWidget(self._build_links_section())
outer.addWidget(self._build_results_section(), 1)
- outer.addLayout(self._build_download_footer())
self._status.setObjectName("shellHint")
+ self._status.setWordWrap(True)
outer.addWidget(self._status)
- # These controls are internal state for menus/filters, not direct layout widgets.
- # Hide them so Qt never paints a stray control at (0, 0).
- for orphan in (
- self._saved_page,
- self._show_likely,
- self._skip_dupes,
- self._allow_zip,
- self._filter_png,
- self._filter_gif,
- self._filter_webp,
- self._filter_jpg,
- self._filter_zip,
- ):
- orphan.hide()
-
- self._website.currentIndexChanged.connect(lambda _=None: self._on_website_changed())
- self._saved_page.currentIndexChanged.connect(lambda _=None: self._select_saved_page())
- self._website.setContextMenuPolicy(Qt.ContextMenuPolicy.CustomContextMenu)
- self._website.customContextMenuRequested.connect(self._show_website_context_menu)
- self._area.setContextMenuPolicy(Qt.ContextMenuPolicy.CustomContextMenu)
- self._area.customContextMenuRequested.connect(self._show_area_context_menu)
- self._area.currentIndexChanged.connect(lambda _=None: self._sync_saved_page_from_selection())
-
- def _build_source_section(self) -> QFrame:
+ def _build_entered_section(self) -> QFrame:
section, body = self._section_card(
"1. Scan Pages",
- "Start here. Scan one page, or scan many page URLs at once.",
+ "Paste one page URL or one full URL per line, including pages from different websites.",
)
-
- single_title = QLabel("Single page", self)
- single_title.setObjectName("shellTitle")
- body.addWidget(single_title)
-
- custom = QHBoxLayout()
- custom.setSpacing(8)
- self._custom_url.setPlaceholderText("Paste one page URL, e.g. https://example.com/sprites")
- self._custom_url.textChanged.connect(lambda _=None: self._update_selected_page_hint())
- self._scan_btn.clicked.connect(self._emit_url_scan)
- custom.addWidget(self._custom_url, 1)
- custom.addWidget(self._scan_btn)
- self._configure_more_button(
- self._url_more_btn,
- [
- ("Save URL as Page", self._add_custom_website),
- ("Clear URL", self._clear_url),
- ("Clear Page List", self._clear_manual_links),
- ("Check Pasted URL", self._emit_custom_url_network_diagnostics),
- ],
+ self._entered_urls.setPlaceholderText(
+ "https://example.com/sprites\nhttps://another-site.example/characters"
)
- custom.addWidget(self._url_more_btn)
- body.addLayout(custom)
-
- manual_header = QHBoxLayout()
- manual_title = QLabel("Multiple pages", self)
- manual_title.setObjectName("shellTitle")
- manual_header.addWidget(manual_title)
- manual_hint = QLabel("Paste one full URL per line. These do not need to be saved first.", self)
- manual_hint.setObjectName("shellHint")
- manual_header.addWidget(manual_hint, 1)
- self._manual_count.setObjectName("shellHint")
- manual_header.addWidget(self._manual_count)
- body.addLayout(manual_header)
-
- self._manual_links.setPlaceholderText(
- "https://example.com/sprites/gen-1\nhttps://another-site.example/sprites"
- )
- self._manual_links.setFixedHeight(76)
- self._manual_links.textChanged.connect(self._update_manual_link_count)
- body.addWidget(self._manual_links)
-
- manual_actions = QHBoxLayout()
- manual_actions.addStretch(1)
- self._scan_manual_links_btn.clicked.connect(self._emit_manual_page_scan)
- manual_actions.addWidget(self._scan_manual_links_btn)
- body.addLayout(manual_actions)
-
+ self._entered_urls.setFixedHeight(88)
+ self._entered_urls.textChanged.connect(self._refresh_entered_state)
+ body.addWidget(self._entered_urls)
+
+ actions = QHBoxLayout()
+ actions.addWidget(self._entered_count)
+ actions.addStretch(1)
+ self._scan_entered_btn.clicked.connect(self._emit_entered_scan)
+ actions.addWidget(self._scan_entered_btn)
+
+ entered_menu = QMenu(self._entered_more_btn)
+ entered_menu.addAction(self._action("Save Entered Pages", self._save_entered_pages))
+ entered_menu.addAction(self._action("Check First URL", self._diagnose_first_entered_url))
+ entered_menu.addSeparator()
+ entered_menu.addAction(self._include_likely_action)
+ entered_menu.addSeparator()
+ entered_menu.addAction(self._action("Clear Entered URLs", self._clear_entered_urls))
+ self._set_menu(self._entered_more_btn, entered_menu)
+ actions.addWidget(self._entered_more_btn)
+ body.addLayout(actions)
return section
def _build_saved_section(self) -> QFrame:
section, body = self._section_card(
- "2. Saved Shortcuts",
- "Reusable pages you saved from the URL box.",
+ "2. Saved Pages",
+ "Check pages across one or more websites, then scan them together.",
)
-
- picker_row = QHBoxLayout()
- picker_row.setSpacing(8)
- picker_row.addLayout(self._labeled_control("Website", self._website), 1)
- picker_row.addLayout(self._labeled_control("Saved page", self._area), 2)
-
- self._scan_saved_btn.clicked.connect(self._emit_saved_page_scan)
- picker_row.addWidget(self._scan_saved_btn, 0, Qt.AlignmentFlag.AlignBottom)
-
- self._configure_more_button(
- self._source_more_btn,
- [
- ("Scan All Saved", self._emit_saved_pages_scan),
- ("Remove Saved Page", self._remove_selected_area),
- ("Remove Website", self._remove_selected_website),
- ("Check Saved Page", self._emit_saved_page_network_diagnostics),
- ],
- )
- picker_row.addWidget(self._source_more_btn, 0, Qt.AlignmentFlag.AlignBottom)
- body.addLayout(picker_row)
-
- self._selected_page_hint.setObjectName("shellHint")
- body.addWidget(self._selected_page_hint)
+ self._saved_tree.setHeaderHidden(True)
+ self._saved_tree.setFixedHeight(88)
+ self._saved_tree.currentItemChanged.connect(lambda _current, _previous: self._refresh_link_sources())
+ body.addWidget(self._saved_tree)
+
+ actions = QHBoxLayout()
+ actions.addWidget(self._saved_count)
+ actions.addStretch(1)
+ self._scan_saved_btn.clicked.connect(self._emit_saved_scan)
+ actions.addWidget(self._scan_saved_btn)
+
+ saved_menu = QMenu(self._saved_more_btn)
+ saved_menu.addAction(self._action("Check Current Page", self._check_current_saved_page))
+ saved_menu.addAction(self._action("Clear Checked Pages", self._clear_checked_saved_pages))
+ saved_menu.addAction(self._action("Check Current Page Connection", self._diagnose_current_saved_page))
+ saved_menu.addSeparator()
+ saved_menu.addAction(self._action("Remove Current Page", self._remove_current_saved_page))
+ saved_menu.addAction(self._action("Remove Current Website", self._remove_current_saved_website))
+ self._set_menu(self._saved_more_btn, saved_menu)
+ actions.addWidget(self._saved_more_btn)
+ body.addLayout(actions)
return section
- def _build_pages_section(self) -> QFrame:
+ def _build_links_section(self) -> QFrame:
section, body = self._section_card(
"3. Find Linked Pages",
- "Optional. Use this when a page is an index and you want to choose pages inside it.",
+ "Optional. Choose an index or category page, find its page links, then scan only the ones you select.",
)
- index_header = QHBoxLayout()
- index_title = QLabel("Linked pages", self)
- index_title.setObjectName("shellTitle")
- index_header.addWidget(index_title)
- index_hint = QLabel("Uses the pasted URL first, otherwise the selected saved page.", self)
- index_hint.setObjectName("shellHint")
- index_header.addWidget(index_hint, 1)
- self._find_index_links_btn.clicked.connect(self._emit_index_links_scan)
- index_header.addWidget(self._find_index_links_btn)
- self._configure_more_button(
- self._index_more_btn,
- [
- ("Scan Selected Links", self._emit_multi_page_scan),
- ("Find and Scan First 100", self._emit_index_scan_all),
- ("Select Visible Links", self._select_visible_index_links),
- ("Clear Link Selection", self._index_links.clearSelection),
- ("Clear Linked Pages", self._clear_found_pages),
- ],
- )
- index_header.addWidget(self._index_more_btn)
- body.addLayout(index_header)
-
- index_filter = QHBoxLayout()
- self._index_keyword.setPlaceholderText("Search linked pages, e.g. gen 1, home, animation...")
- self._index_keyword.textChanged.connect(lambda _=None: self._refresh_index_link_list())
- index_filter.addWidget(self._index_keyword, 1)
- body.addLayout(index_filter)
-
- self._index_links.setSelectionMode(QListWidget.SelectionMode.ExtendedSelection)
- self._index_links.setFixedHeight(96)
- body.addWidget(self._index_links)
-
+ source_row = QHBoxLayout()
+ source_label = QLabel("Discover from", self)
+ source_label.setObjectName("shellHint")
+ source_row.addWidget(source_label)
+ source_row.addWidget(self._link_source, 1)
+ self._find_links_btn.clicked.connect(self._emit_discover_links)
+ source_row.addWidget(self._find_links_btn)
+ self._scan_links_btn.clicked.connect(self._emit_linked_scan)
+ source_row.addWidget(self._scan_links_btn)
+
+ links_menu = QMenu(self._links_more_btn)
+ links_menu.addAction(self._action("Select Visible Pages", self._select_visible_links))
+ links_menu.addAction(self._action("Clear Page Selection", self._clear_link_selection))
+ links_menu.addSeparator()
+ links_menu.addAction(self._action("Clear Linked Pages", self._clear_linked_pages))
+ self._set_menu(self._links_more_btn, links_menu)
+ source_row.addWidget(self._links_more_btn)
+ body.addLayout(source_row)
+
+ filter_row = QHBoxLayout()
+ self._links_search.setPlaceholderText("Search linked pages by name or URL...")
+ self._links_search.textChanged.connect(lambda _text: self._refresh_link_list())
+ filter_row.addWidget(self._links_search, 1)
+ filter_row.addWidget(self._links_count)
+ body.addLayout(filter_row)
+
+ self._links.setSelectionMode(QListWidget.SelectionMode.ExtendedSelection)
+ self._links.setFixedHeight(104)
+ self._links.itemSelectionChanged.connect(self._capture_link_selection)
+ body.addWidget(self._links)
return section
def _build_results_section(self) -> QFrame:
section, body = self._section_card(
"4. Found Files",
- "Search scan results, select the files you want, then download them into the workspace.",
+ "Results stay here across scans. Search, filter, select, then download them into the workspace.",
)
- options = QHBoxLayout()
- options.setSpacing(8)
- self._show_likely.setChecked(False)
- self._skip_dupes.setChecked(True)
- self._allow_zip.setChecked(True)
-
- filt = QHBoxLayout()
- filt.setSpacing(6)
- self._search.setPlaceholderText("Search results by filename, URL, or source page...")
- self._search.textChanged.connect(lambda _: self._refresh_list())
- self._exclude_keywords.setPlaceholderText("Exclude words, e.g. shiny, thumb")
- self._exclude_keywords.textChanged.connect(lambda _: self._refresh_list())
- for cb in (self._filter_png, self._filter_gif, self._filter_webp, self._filter_jpg, self._filter_zip):
- cb.setChecked(True)
- cb.stateChanged.connect(lambda _=None: self._refresh_list())
-
- search_label = QLabel("Search results", self)
- search_label.setObjectName("shellHint")
- filt.addWidget(search_label)
- filt.addWidget(self._search, 1)
- exclude_label = QLabel("Exclude words", self)
- exclude_label.setObjectName("shellHint")
- filt.addWidget(exclude_label)
- filt.addWidget(self._exclude_keywords, 0)
+ filter_row = QHBoxLayout()
+ self._results_search.setPlaceholderText("Search filename, URL, or source page...")
+ self._results_search.textChanged.connect(lambda _text: self._refresh_results())
+ filter_row.addWidget(self._results_search, 2)
+ self._exclude_words.setPlaceholderText("Hide words, e.g. shiny, thumb")
+ self._exclude_words.textChanged.connect(lambda _text: self._refresh_results())
+ filter_row.addWidget(self._exclude_words, 1)
filters_menu = QMenu(self._filters_btn)
- filters_menu.addAction(self._show_likely_action())
- filters_menu.addSeparator()
- filters_menu.addAction(self._checkbox_action(self._filter_png))
- filters_menu.addAction(self._checkbox_action(self._filter_gif))
- filters_menu.addAction(self._checkbox_action(self._filter_webp))
- filters_menu.addAction(self._checkbox_action(self._filter_jpg))
- filters_menu.addAction(self._checkbox_action(self._filter_zip))
+ for action in self._format_actions.values():
+ filters_menu.addAction(action)
filters_menu.addSeparator()
- filters_menu.addAction(self._checkbox_action(self._skip_dupes))
- filters_menu.addAction(self._checkbox_action(self._allow_zip))
- self._filters_btn.setText("Filters")
- self._filters_btn.setPopupMode(QToolButton.ToolButtonPopupMode.InstantPopup)
- self._filters_btn.setMenu(filters_menu)
- filt.addWidget(self._filters_btn)
-
- body.addLayout(filt)
-
- self._results.setSelectionMode(QListWidget.SelectionMode.ExtendedSelection)
- self._results.itemSelectionChanged.connect(self._update_preview)
+ filters_menu.addAction(self._action("Reset File Filters", self._reset_file_filters))
+ self._filters_btn.setText("File Types")
+ self._set_menu(self._filters_btn, filters_menu)
+ filter_row.addWidget(self._filters_btn)
+
+ results_menu = QMenu(self._results_more_btn)
+ results_menu.addAction(self._action("Select All Visible Files", self._select_all_visible_results))
+ results_menu.addAction(self._action("Clear File Selection", self._clear_result_selection))
+ results_menu.addSeparator()
+ results_menu.addAction(self._action("Clear Found Files", self._clear_found_files))
+ self._set_menu(self._results_more_btn, results_menu)
+ filter_row.addWidget(self._results_more_btn)
+ filter_row.addWidget(self._results_count)
+ body.addLayout(filter_row)
+
+ self._results.setHeaderLabels(["File", "Type", "Source page"])
+ self._results.setRootIsDecorated(False)
+ self._results.setAlternatingRowColors(True)
+ self._results.setSelectionMode(QTreeWidget.SelectionMode.ExtendedSelection)
+ header = self._results.header()
+ header.setSectionResizeMode(0, QHeaderView.ResizeMode.Stretch)
+ header.setSectionResizeMode(1, QHeaderView.ResizeMode.ResizeToContents)
+ header.setSectionResizeMode(2, QHeaderView.ResizeMode.Stretch)
+ self._results.itemSelectionChanged.connect(self._on_result_selection_changed)
body.addWidget(self._results, 1)
- self._selection_detail.setWordWrap(True)
self._selection_detail.setObjectName("shellHint")
+ self._selection_detail.setWordWrap(True)
body.addWidget(self._selection_detail)
- return section
-
- def _build_download_footer(self) -> QHBoxLayout:
- bottom = QHBoxLayout()
- bottom.setSpacing(8)
-
+ download_row = QHBoxLayout()
self._destination_hint.setObjectName("shellHint")
- bottom.addWidget(self._destination_hint, 1)
-
- self._configure_more_button(
- self._download_more_btn,
- [
- ("Select All Results", self._select_all_visible),
- ("Clear Result Selection", self._clear_selection),
- ("Clear Found Files", self._clear_found_files),
- ],
- )
- bottom.addWidget(self._download_more_btn)
-
+ download_row.addWidget(self._destination_hint, 1)
+
+ download_menu = QMenu(self._download_options_btn)
+ download_menu.addAction(self._skip_downloaded_action)
+ download_menu.addAction(self._allow_zip_action)
+ self._download_options_btn.setText("Download Options")
+ self._set_menu(self._download_options_btn, download_menu)
+ download_row.addWidget(self._download_options_btn)
self._download_btn.clicked.connect(self._emit_download)
- bottom.addWidget(self._download_btn)
-
- return bottom
+ download_row.addWidget(self._download_btn)
+ body.addLayout(download_row)
+ return section
- def _section_card(self, title: str, hint: str) -> tuple[QFrame, QVBoxLayout]:
- section = QFrame(self)
+ @staticmethod
+ def _section_card(title: str, hint: str) -> tuple[QFrame, QVBoxLayout]:
+ section = QFrame()
section.setObjectName("webSourcesSectionCard")
section.setFrameShape(QFrame.Shape.NoFrame)
layout = QVBoxLayout(section)
- layout.setContentsMargins(7, 6, 7, 6)
- layout.setSpacing(5)
+ layout.setContentsMargins(8, 7, 8, 7)
+ layout.setSpacing(6)
header = QHBoxLayout()
- header.setSpacing(8)
- title_label = QLabel(title, self)
+ title_label = QLabel(title, section)
title_label.setObjectName("shellTitle")
header.addWidget(title_label)
- hint_label = QLabel(hint, self)
+ hint_label = QLabel(hint, section)
hint_label.setObjectName("shellHint")
+ hint_label.setWordWrap(True)
header.addWidget(hint_label, 1)
layout.addLayout(header)
-
return section, layout
- def _labeled_control(self, label: str, widget: QWidget) -> QVBoxLayout:
- layout = QVBoxLayout()
- layout.setContentsMargins(0, 0, 0, 0)
- layout.setSpacing(2)
- text = QLabel(label, self)
- text.setObjectName("shellHint")
- layout.addWidget(text)
- layout.addWidget(widget)
- return layout
-
- def _configure_more_button(self, button: QToolButton, actions: list[tuple[str, object]]) -> None:
- button.setText("More")
- button.setPopupMode(QToolButton.ToolButtonPopupMode.InstantPopup)
- menu = QMenu(button)
- for label, callback in actions:
- menu.addAction(label, callback) # type: ignore[arg-type]
- button.setMenu(menu)
+ def _action(self, label: str, callback) -> QAction: # noqa: ANN001
+ action = QAction(label, self)
+ action.triggered.connect(callback)
+ return action
- def _checkbox_action(self, checkbox: QCheckBox):
- action = QAction(checkbox.text(), self)
+ def _checkable_action(self, label: str, checked: bool) -> QAction:
+ action = QAction(label, self)
action.setCheckable(True)
- action.setChecked(checkbox.isChecked())
- action.toggled.connect(checkbox.setChecked)
- checkbox.stateChanged.connect(lambda _=None, action=action, checkbox=checkbox: action.setChecked(checkbox.isChecked()))
+ action.setChecked(bool(checked))
return action
- def _show_likely_action(self):
- action = self._checkbox_action(self._show_likely)
- action.setText("Show likely links")
- return action
+ @staticmethod
+ def _set_menu(button: QToolButton, menu: QMenu) -> None:
+ if not button.text():
+ button.setText("More")
+ button.setPopupMode(QToolButton.ToolButtonPopupMode.InstantPopup)
+ button.setMenu(menu)
- def _rebuild_areas(self, selected_area_id: str | None = None) -> None:
- self._area.clear()
- w = self._website.currentData()
- if not isinstance(w, dict):
- return
- for a in (w.get("areas") or []):
- label = self._compact_area_label(
- str(a.get("label", "Area")),
- str(a.get("url", "")),
- )
- self._area.addItem(label, a)
- index = self._area.count() - 1
- self._area.setItemData(index, str(a.get("url", "")), Qt.ItemDataRole.ToolTipRole)
-
- if selected_area_id:
- for i in range(self._area.count()):
- a = self._area.itemData(i)
- if isinstance(a, dict) and a.get("id") == selected_area_id:
- self._area.setCurrentIndex(i)
- break
- self._update_selected_page_hint()
-
- def _on_website_changed(self) -> None:
- self._rebuild_areas()
- self._sync_saved_page_from_selection()
-
- def _rebuild_saved_pages(self) -> None:
- self._saved_page.clear()
- for website_index in range(self._website.count()):
- website = self._website.itemData(website_index)
- if not isinstance(website, dict):
+ def _connect_state_actions(self) -> None:
+ for action in (
+ self._include_likely_action,
+ self._skip_downloaded_action,
+ self._allow_zip_action,
+ ):
+ action.toggled.connect(lambda _checked, self=self: self.preferences_changed.emit(self.smart_options()))
+ for action in self._format_actions.values():
+ action.toggled.connect(lambda _checked, self=self: self._refresh_results())
+
+ # --- Entered pages ---
+
+ def _entered_url_values(self) -> tuple[tuple[str, ...], int, int]:
+ urls: list[str] = []
+ seen: set[str] = set()
+ invalid = 0
+ duplicates = 0
+ for raw_line in self._entered_urls.toPlainText().splitlines():
+ raw = raw_line.strip()
+ if not raw:
continue
- website_id = str(website.get("id", "")).strip()
- website_name = str(website.get("name", "")).strip() or "Website"
- for area in website.get("areas") or []:
- if not isinstance(area, dict):
- continue
- area_id = str(area.get("id", "")).strip()
- area_url = str(area.get("url", "")).strip()
- if not website_id or not area_id or not area_url:
- continue
- area_label = self._compact_area_label(str(area.get("label", "")), area_url)
- combo_label = f"{website_name} - {area_label}"
- self._saved_page.addItem(
- combo_label,
- {
- "website_id": website_id,
- "area_id": area_id,
- "url": area_url,
- },
- )
- self._saved_page.setItemData(
- self._saved_page.count() - 1,
- area_url,
- Qt.ItemDataRole.ToolTipRole,
- )
-
- if self._saved_page.count() == 0:
- self._saved_page.addItem("No saved pages yet", None)
+ normalized = self._normalize_page_url(raw)
+ if normalized is None:
+ invalid += 1
+ continue
+ key = normalized.casefold()
+ if key in seen:
+ duplicates += 1
+ continue
+ seen.add(key)
+ urls.append(normalized)
+ return tuple(urls), invalid, duplicates
- def _select_saved_page(self) -> None:
- if self._syncing_saved_page:
+ def _refresh_entered_state(self) -> None:
+ urls, invalid, duplicates = self._entered_url_values()
+ detail = f"{len(urls)} valid URL{'s' if len(urls) != 1 else ''}"
+ skipped: list[str] = []
+ if invalid:
+ skipped.append(f"{invalid} invalid")
+ if duplicates:
+ skipped.append(f"{duplicates} duplicate")
+ if skipped:
+ detail += f"; {', '.join(skipped)} skipped"
+ self._entered_count.setText(detail)
+ self._scan_entered_btn.setEnabled(bool(urls))
+ self._refresh_link_sources()
+
+ def _emit_entered_scan(self) -> None:
+ urls, _, _ = self._entered_url_values()
+ if not urls:
+ self.set_status("Enter at least one valid http or https page URL.")
return
+ self.scan_requested.emit(
+ WebScanRequest(urls=urls, smart=self.smart_options(), origin=ScanOrigin.ENTERED)
+ )
- selection = self._saved_page.currentData()
- if not isinstance(selection, dict):
- self._update_selected_page_hint()
- return
+ def _clear_entered_urls(self) -> None:
+ self._entered_urls.clear()
+ self.set_status("Entered URLs cleared. Found Files were kept.")
- website_id = str(selection.get("website_id", "")).strip()
- area_id = str(selection.get("area_id", "")).strip()
- if not website_id or not area_id:
- self._update_selected_page_hint()
+ def _diagnose_first_entered_url(self) -> None:
+ urls, _, _ = self._entered_url_values()
+ if not urls:
+ self.set_status("Enter a valid URL before checking its connection.")
return
+ self.diagnostics_requested.emit(WebDiagnosticsRequest(url=urls[0]))
- self._syncing_saved_page = True
- try:
- for website_index in range(self._website.count()):
- website = self._website.itemData(website_index)
- if isinstance(website, dict) and str(website.get("id", "")).strip() == website_id:
- self._website.setCurrentIndex(website_index)
- self._rebuild_areas(area_id)
- break
- finally:
- self._syncing_saved_page = False
- self._update_selected_page_hint()
-
- def _sync_saved_page_from_selection(self) -> None:
- if self._syncing_saved_page:
- self._update_selected_page_hint()
+ def _save_entered_pages(self) -> None:
+ urls, _, _ = self._entered_url_values()
+ if not urls:
+ self.set_status("Enter at least one valid URL before saving pages.")
return
- website_id, area_id = self.selected_source_ids()
- self._syncing_saved_page = True
- self._saved_page.blockSignals(True)
- try:
- for index in range(self._saved_page.count()):
- data = self._saved_page.itemData(index)
- if (
- isinstance(data, dict)
- and str(data.get("website_id", "")).strip() == str(website_id or "")
- and str(data.get("area_id", "")).strip() == str(area_id or "")
- ):
- self._saved_page.setCurrentIndex(index)
- break
- finally:
- self._saved_page.blockSignals(False)
- self._syncing_saved_page = False
- self._update_selected_page_hint()
-
- def _update_selected_page_hint(self) -> None:
- custom_url = self._custom_url.text().strip()
- if custom_url:
- self._selected_page_hint.setText(f"Pasted URL will be used for scan: {custom_url}")
- return
+ registry = deepcopy(self._registry)
+ saved_count = 0
+ duplicate_count = 0
+ selected_website_id: str | None = None
+ selected_area_id: str | None = None
- area = self._area.currentData()
- if not isinstance(area, dict) or not area.get("url"):
- self._selected_page_hint.setText("Choose a website and page to scan.")
- return
+ for url in urls:
+ parsed = urlparse(url)
+ host = (parsed.hostname or parsed.netloc).strip().lower()
+ source = next(
+ (entry for entry in registry if str(entry.get("name", "")).strip().lower() == host),
+ None,
+ )
+ if source is None:
+ source_ids = {str(entry.get("id", "")) for entry in registry if isinstance(entry, dict)}
+ source_id = self._unique_id(self._slugify(host) or "website", source_ids)
+ source = {"id": source_id, "name": host, "areas": []}
+ registry.append(source)
+
+ areas = source.setdefault("areas", [])
+ existing = next(
+ (
+ area
+ for area in areas
+ if isinstance(area, dict) and str(area.get("url", "")).strip().casefold() == url.casefold()
+ ),
+ None,
+ )
+ selected_website_id = str(source.get("id", "")) or None
+ if existing is not None:
+ duplicate_count += 1
+ selected_area_id = str(existing.get("id", "")) or None
+ continue
- label = self._compact_area_label(str(area.get("label", "Page")), str(area.get("url", "")))
- self._selected_page_hint.setText(f"Selected page: {label} - {area['url']}")
+ area_ids = {str(area.get("id", "")) for area in areas if isinstance(area, dict)}
+ label = self._page_label(url)
+ area_id = self._unique_id(self._slugify(label) or "page", area_ids)
+ areas.append({"id": area_id, "label": label, "url": url})
+ selected_area_id = area_id
+ saved_count += 1
- def _emit_scan(self) -> None:
- custom_url = self._custom_url.text().strip()
- if custom_url:
- self._emit_url_scan()
- return
+ self._registry = registry
+ self._refresh_saved_tree(
+ selected_website_id=selected_website_id,
+ selected_area_id=selected_area_id,
+ )
+ self._refresh_link_sources()
+ self.registry_changed.emit(self.sources_registry())
+ self.set_status(
+ f"Saved {saved_count} new page(s); skipped {duplicate_count} already saved page(s)."
+ )
- self._emit_saved_page_scan()
+ # --- Saved pages ---
+
+ def _refresh_saved_tree(
+ self,
+ *,
+ selected_website_id: str | None = None,
+ selected_area_id: str | None = None,
+ checked_urls: set[str] | None = None,
+ ) -> None:
+ checked = checked_urls or set()
+ self._saved_tree.blockSignals(True)
+ self._saved_tree.clear()
+ page_count = 0
+ selected_item: QTreeWidgetItem | None = None
+ first_page: QTreeWidgetItem | None = None
+
+ for website in self._registry:
+ if not isinstance(website, dict):
+ continue
+ website_id = str(website.get("id", "")).strip()
+ website_name = str(website.get("name", "Website")).strip() or "Website"
+ website_item = QTreeWidgetItem([website_name])
+ website_item.setData(0, self._ROLE_KIND, "website")
+ website_item.setData(0, self._ROLE_DATA, {"website_id": website_id, "area_id": None})
+ website_item.setFlags(
+ website_item.flags()
+ | Qt.ItemFlag.ItemIsUserCheckable
+ | Qt.ItemFlag.ItemIsAutoTristate
+ )
+ website_item.setCheckState(0, Qt.CheckState.Unchecked)
+ self._saved_tree.addTopLevelItem(website_item)
+ if website_id == selected_website_id and not selected_area_id:
+ selected_item = website_item
- def _emit_url_scan(self) -> None:
- custom_url = self._custom_url.text().strip()
- if not custom_url:
- self.set_status("Paste a URL first, or use Scan Saved for saved pages.")
+ for area in website.get("areas", []):
+ if not isinstance(area, dict):
+ continue
+ area_id = str(area.get("id", "")).strip()
+ label = str(area.get("label", "Page")).strip() or "Page"
+ url = str(area.get("url", "")).strip()
+ if not area_id or not url:
+ continue
+ child = QTreeWidgetItem([label])
+ payload = {
+ "website_id": website_id,
+ "area_id": area_id,
+ "website_name": website_name,
+ "label": label,
+ "url": url,
+ }
+ child.setData(0, self._ROLE_KIND, "page")
+ child.setData(0, self._ROLE_DATA, payload)
+ child.setToolTip(0, url)
+ child.setFlags(child.flags() | Qt.ItemFlag.ItemIsUserCheckable)
+ child.setCheckState(0, Qt.CheckState.Checked if url in checked else Qt.CheckState.Unchecked)
+ website_item.addChild(child)
+ page_count += 1
+ first_page = first_page or child
+ if website_id == selected_website_id and area_id == selected_area_id:
+ selected_item = child
+
+ website_item.setExpanded(True)
+
+ self._saved_tree.setCurrentItem(selected_item or first_page)
+ self._saved_tree.blockSignals(False)
+ self._saved_count.setText(f"{page_count} saved page{'s' if page_count != 1 else ''}")
+ self._scan_saved_btn.setEnabled(page_count > 0)
+
+ def _saved_item_payload(self, item: QTreeWidgetItem | None) -> dict | None:
+ if item is None:
+ return None
+ payload = item.data(0, self._ROLE_DATA)
+ return payload if isinstance(payload, dict) else None
+
+ def _checked_saved_pages(self, *, fallback_to_current: bool = True) -> list[dict]:
+ pages: list[dict] = []
+ for top_index in range(self._saved_tree.topLevelItemCount()):
+ website = self._saved_tree.topLevelItem(top_index)
+ for child_index in range(website.childCount()):
+ child = website.child(child_index)
+ if child.checkState(0) == Qt.CheckState.Checked:
+ payload = self._saved_item_payload(child)
+ if payload is not None:
+ pages.append(payload)
+ if pages or not fallback_to_current:
+ return pages
+
+ current = self._saved_tree.currentItem()
+ if current is None:
+ return []
+ if current.data(0, self._ROLE_KIND) == "page":
+ payload = self._saved_item_payload(current)
+ return [payload] if payload is not None else []
+ for child_index in range(current.childCount()):
+ payload = self._saved_item_payload(current.child(child_index))
+ if payload is not None:
+ pages.append(payload)
+ return pages
+
+ def _emit_saved_scan(self) -> None:
+ pages = self._checked_saved_pages()
+ if not pages:
+ self.set_status("Check one or more saved pages before scanning.")
return
+ website_ids = {str(page.get("website_id", "")) for page in pages}
+ area_ids = {str(page.get("area_id", "")) for page in pages}
+ self.scan_requested.emit(
+ WebScanRequest(
+ urls=tuple(str(page["url"]) for page in pages),
+ smart=self.smart_options(),
+ origin=ScanOrigin.SAVED,
+ website_id=next(iter(website_ids)) if len(website_ids) == 1 else None,
+ area_id=next(iter(area_ids)) if len(area_ids) == 1 else None,
+ )
+ )
- normalized = self._normalize_custom_url(custom_url)
- if normalized is None:
- self.set_status("Invalid URL. Use http(s)://domain/path.")
+ def _check_current_saved_page(self) -> None:
+ item = self._saved_tree.currentItem()
+ if item is None:
+ self.set_status("Choose a saved page first.")
return
+ item.setCheckState(0, Qt.CheckState.Checked)
- payload = {
- "area_url": normalized[0],
- "website_id": None,
- "area_id": None,
- "smart": asdict(self.smart_options()),
- }
- self._clear_result_text_filters()
- self.set_status(f"Scanning URL: {normalized[0]}")
- self.scan_requested.emit(payload)
+ def _clear_checked_saved_pages(self) -> None:
+ for top_index in range(self._saved_tree.topLevelItemCount()):
+ self._saved_tree.topLevelItem(top_index).setCheckState(0, Qt.CheckState.Unchecked)
+ self.set_status("Saved-page checks cleared.")
- def _emit_saved_page_scan(self) -> None:
- a = self._area.currentData()
- if not isinstance(a, dict) or not a.get("url"):
- self.set_status("Choose a saved page first.")
+ def _diagnose_current_saved_page(self) -> None:
+ payload = self._saved_item_payload(self._saved_tree.currentItem())
+ if payload is None or not payload.get("url"):
+ self.set_status("Choose a saved page before checking its connection.")
return
+ self.diagnostics_requested.emit(WebDiagnosticsRequest(url=str(payload["url"])))
- website_id, area_id = self.selected_source_ids()
- payload = {
- "area_url": str(a["url"]),
- "website_id": website_id,
- "area_id": area_id,
- "smart": asdict(self.smart_options()),
- }
- self._clear_result_text_filters()
- self.set_status(f"Scanning saved page: {str(a['url'])}")
- self.scan_requested.emit(payload)
+ def _remove_current_saved_page(self) -> None:
+ payload = self._saved_item_payload(self._saved_tree.currentItem())
+ if payload is None or not payload.get("area_id"):
+ self.set_status("Choose a saved page to remove.")
+ return
+ website_id = str(payload.get("website_id", ""))
+ area_id = str(payload.get("area_id", ""))
+ for website in self._registry:
+ if str(website.get("id", "")) != website_id:
+ continue
+ website["areas"] = [
+ area for area in website.get("areas", []) if str(area.get("id", "")) != area_id
+ ]
+ self._registry = [website for website in self._registry if website.get("areas")]
+ self._refresh_saved_tree()
+ self._refresh_link_sources()
+ self.registry_changed.emit(self.sources_registry())
+ self.set_status("Saved page removed. Found Files were kept.")
- def _emit_index_links_scan(self) -> None:
- area_payload = self._current_area_payload(status_action="find linked pages")
- if area_payload is None:
+ def _remove_current_saved_website(self) -> None:
+ payload = self._saved_item_payload(self._saved_tree.currentItem())
+ if payload is None or not payload.get("website_id"):
+ self.set_status("Choose a saved website to remove.")
return
+ website_id = str(payload["website_id"])
+ self._registry = [website for website in self._registry if str(website.get("id", "")) != website_id]
+ self._refresh_saved_tree()
+ self._refresh_link_sources()
+ self.registry_changed.emit(self.sources_registry())
+ self.set_status("Saved website removed. Found Files were kept.")
- payload = {
- "index_url": area_payload["area_url"],
- "website_id": area_payload.get("website_id"),
- "area_id": area_payload.get("area_id"),
- "smart": asdict(self.smart_options()),
- }
- self._index_link_items = []
- self._refresh_index_link_list()
- self._set_index_controls_enabled(False)
- self.set_status(f"Finding linked pages: {payload['index_url']}")
- self.index_links_requested.emit(payload)
-
- def _emit_saved_pages_scan(self) -> None:
- links: list[dict] = []
- seen_urls: set[str] = set()
- for website_index in range(self._website.count()):
- website = self._website.itemData(website_index)
- if not isinstance(website, dict):
- continue
- areas = website.get("areas")
- if not isinstance(areas, list):
+ # --- Linked pages ---
+
+ def _refresh_link_sources(self) -> None:
+ if not hasattr(self, "_link_source"):
+ return
+ current_data = self._link_source.currentData()
+ current_url = str(current_data.get("url", "")) if isinstance(current_data, dict) else ""
+ candidates: list[dict] = []
+ seen: set[str] = set()
+
+ entered, _, _ = self._entered_url_values()
+ for url in entered:
+ key = url.casefold()
+ if key in seen:
continue
- for area in areas:
+ seen.add(key)
+ candidates.append({"label": f"Entered: {self._short_url(url)}", "url": url})
+
+ for website in self._registry:
+ website_id = str(website.get("id", ""))
+ website_name = str(website.get("name", "Website"))
+ for area in website.get("areas", []):
if not isinstance(area, dict):
continue
url = str(area.get("url", "")).strip()
- if not url or url in seen_urls:
+ if not url or url.casefold() in seen:
continue
- seen_urls.add(url)
- links.append(
+ seen.add(url.casefold())
+ candidates.append(
{
- "label": str(area.get("label", "")).strip() or self._compact_area_label("", url),
+ "label": f"Saved: {website_name} / {str(area.get('label', 'Page'))}",
"url": url,
- "source_page": None,
+ "website_id": website_id,
+ "area_id": str(area.get("id", "")) or None,
}
)
- if not links:
- self.set_status("Save at least one website page before scanning all saved pages.")
- return
-
- original_count = len(links)
- links = self._cap_link_payloads_with_warning(links)
- if not links:
- return
-
- website_id, area_id = self.selected_source_ids()
- payload = {
- "pages": links,
- "website_id": website_id,
- "area_id": area_id,
- "smart": asdict(self.smart_options()),
- }
- if original_count > len(links):
- self.set_status(f"Scanning first {len(links)} of {original_count} saved page(s)...")
- else:
- self.set_status(f"Scanning {len(links)} saved page(s)...")
- self._clear_result_text_filters()
- self.multi_scan_requested.emit(payload)
-
- def _emit_index_scan_all(self) -> None:
- area_payload = self._current_area_payload(status_action="scan linked pages")
- if area_payload is None:
- return
-
- payload = {
- "index_url": area_payload["area_url"],
- "website_id": area_payload.get("website_id"),
- "area_id": area_payload.get("area_id"),
- "smart": asdict(self.smart_options()),
- }
- self._index_link_items = []
- self._refresh_index_link_list()
- self._set_index_controls_enabled(False)
- self._clear_result_text_filters()
- self.set_status(f"Finding and scanning linked pages: {payload['index_url']}")
- self.index_scan_all_requested.emit(payload)
-
- def _emit_multi_page_scan(self) -> None:
- if not self._index_link_items:
- self.set_status("Click Find Pages first, then scan the linked pages you want.")
- return
-
- selected_links = self._selected_index_link_payloads()
- if not selected_links:
- selected_links = self._visible_index_link_payloads()
- if not selected_links:
- self.set_status("Select one or more linked pages first.")
- return
- original_count = len(selected_links)
- selected_links = self._cap_link_payloads_with_warning(selected_links)
- if not selected_links:
- return
-
- website_id, area_id = self.selected_source_ids()
- payload = {
- "pages": selected_links,
- "website_id": website_id,
- "area_id": area_id,
- "smart": asdict(self.smart_options()),
- }
- if original_count > len(selected_links):
- self.set_status(f"Scanning first {len(selected_links)} of {original_count} linked page(s)...")
+ self._link_source.blockSignals(True)
+ self._link_source.clear()
+ if not candidates:
+ self._link_source.addItem("Enter or save a page first", None)
else:
- self.set_status(f"Scanning {len(selected_links)} linked page(s)...")
- self._clear_result_text_filters()
- self.multi_scan_requested.emit(payload)
-
- def _emit_manual_page_scan(self) -> None:
- links, invalid_count, duplicate_count = self._manual_index_links()
- if not links:
- self.set_status("Paste one or more valid page URLs to scan manually.")
+ selected_index = 0
+ for index, candidate in enumerate(candidates):
+ self._link_source.addItem(candidate["label"], candidate)
+ self._link_source.setItemData(index, candidate["url"], Qt.ItemDataRole.ToolTipRole)
+ if candidate["url"] == current_url:
+ selected_index = index
+ self._link_source.setCurrentIndex(selected_index)
+ self._link_source.blockSignals(False)
+ self._find_links_btn.setEnabled(bool(candidates))
+
+ def _emit_discover_links(self) -> None:
+ payload = self._link_source.currentData()
+ if not isinstance(payload, dict) or not payload.get("url"):
+ self.set_status("Choose a page in Discover from before finding linked pages.")
return
+ self.discover_links_requested.emit(
+ WebLinkDiscoveryRequest(
+ url=str(payload["url"]),
+ website_id=str(payload.get("website_id")) if payload.get("website_id") else None,
+ area_id=str(payload.get("area_id")) if payload.get("area_id") else None,
+ )
+ )
- payload_links = [asdict(link) for link in links]
- original_count = len(payload_links)
- payload_links = self._cap_link_payloads_with_warning(payload_links)
- if not payload_links:
- return
-
- skipped_parts: list[str] = []
- if invalid_count:
- skipped_parts.append(f"{invalid_count} invalid")
- if duplicate_count:
- skipped_parts.append(f"{duplicate_count} duplicate")
-
- website_id, area_id = self.selected_source_ids()
- payload = {
- "pages": payload_links,
- "website_id": website_id,
- "area_id": area_id,
- "smart": asdict(self.smart_options()),
- }
+ def _refresh_link_list(self, *, capture_selection: bool = True) -> None:
+ if capture_selection:
+ self._capture_link_selection()
+ query = self._links_search.text().strip().casefold()
+ self._links.blockSignals(True)
+ self._links.clear()
+ visible_count = 0
+ for link in self._linked_items:
+ haystack = f"{link.label} {link.url} {link.source_page or ''}".casefold()
+ if query and query not in haystack:
+ continue
+ item = QListWidgetItem(f"{link.label}\n{link.url}")
+ item.setData(Qt.ItemDataRole.UserRole, link)
+ item.setToolTip(link.url)
+ self._links.addItem(item)
+ item.setSelected(link.url in self._selected_link_urls)
+ visible_count += 1
+ self._links.blockSignals(False)
+ selected_count = len(self._selected_link_urls)
+ total = len(self._linked_items)
+ self._links_count.setText(f"{visible_count}/{total} shown; {selected_count} selected")
+ self._scan_links_btn.setEnabled(selected_count > 0)
+
+ def _capture_link_selection(self) -> None:
+ visible_urls: set[str] = set()
+ selected_urls: set[str] = set()
+ for row in range(self._links.count()):
+ item = self._links.item(row)
+ link = item.data(Qt.ItemDataRole.UserRole)
+ if not isinstance(link, WebIndexLink):
+ continue
+ visible_urls.add(link.url)
+ if item.isSelected():
+ selected_urls.add(link.url)
+ self._selected_link_urls.difference_update(visible_urls)
+ self._selected_link_urls.update(selected_urls)
+ if hasattr(self, "_links_count"):
+ self._links_count.setText(
+ f"{self._links.count()}/{len(self._linked_items)} shown; {len(self._selected_link_urls)} selected"
+ )
+ self._scan_links_btn.setEnabled(bool(self._selected_link_urls))
- if original_count > len(payload_links):
- message = f"Scanning first {len(payload_links)} of {original_count} manual page URL(s)"
- else:
- message = f"Scanning {len(payload_links)} manual page URL(s)"
- if skipped_parts:
- message = f"{message}; skipped {', '.join(skipped_parts)}"
- self._clear_result_text_filters()
- self.set_status(f"{message}...")
- self.multi_scan_requested.emit(payload)
-
- def _emit_custom_url_network_diagnostics(self) -> None:
- custom_url = self._custom_url.text().strip()
- if not custom_url:
- self.set_status("Paste a URL before running a pasted URL network check.")
+ def _emit_linked_scan(self) -> None:
+ self._capture_link_selection()
+ selected = [link for link in self._linked_items if link.url in self._selected_link_urls]
+ if not selected:
+ self.set_status("Select one or more linked pages before scanning.")
return
+ source = self._link_source.currentData()
+ self.scan_requested.emit(
+ WebScanRequest(
+ urls=tuple(link.url for link in selected),
+ smart=self.smart_options(),
+ origin=ScanOrigin.LINKED,
+ website_id=(str(source.get("website_id")) if isinstance(source, dict) and source.get("website_id") else None),
+ area_id=(str(source.get("area_id")) if isinstance(source, dict) and source.get("area_id") else None),
+ )
+ )
- normalized = self._normalize_custom_url(custom_url)
- if normalized is None:
- self.set_status("Invalid URL. Use http(s)://domain/path.")
- return
- payload = {
- "area_url": normalized[0],
- "website_id": None,
- "area_id": None,
- }
- self.set_status(f"Running network diagnostics for pasted URL: {normalized[0]}")
- self.network_diagnostics_requested.emit(payload)
+ def _select_visible_links(self) -> None:
+ for row in range(self._links.count()):
+ self._links.item(row).setSelected(True)
+ self._capture_link_selection()
- def _emit_saved_page_network_diagnostics(self) -> None:
- a = self._area.currentData()
- if not isinstance(a, dict) or not a.get("url"):
- self.set_status("Choose a saved page before running a saved page network check.")
- return
+ def _clear_link_selection(self) -> None:
+ self._selected_link_urls.clear()
+ self._links.clearSelection()
+ self._refresh_link_list(capture_selection=False)
- website_id, area_id = self.selected_source_ids()
- payload = {
- "area_url": str(a["url"]),
- "website_id": website_id,
- "area_id": area_id,
- }
- self.set_status(f"Running network diagnostics for saved page: {str(a['url'])}")
- self.network_diagnostics_requested.emit(payload)
+ def _clear_linked_pages(self) -> None:
+ self._linked_items = []
+ self._selected_link_urls.clear()
+ self._refresh_link_list(capture_selection=False)
+ self.set_status("Linked pages cleared. Found Files were kept.")
- def _current_area_payload(self, *, status_action: str) -> dict | None:
- custom_url = self._custom_url.text().strip()
- if custom_url:
- normalized = self._normalize_custom_url(custom_url)
- if normalized is None:
- self.set_status("Invalid URL. Use http(s)://domain/path.")
- return None
- return {
- "area_url": normalized[0],
- "website_id": None,
- "area_id": None,
- }
-
- area = self._area.currentData()
- if not isinstance(area, dict) or not area.get("url"):
- self.set_status(f"Enter a URL or pick a saved page to {status_action}.")
- return None
+ # --- Found files ---
- website_id, area_id = self.selected_source_ids()
- return {
- "area_url": str(area["url"]),
- "website_id": website_id,
- "area_id": area_id,
- }
-
- def _manual_index_links(self) -> tuple[list[WebIndexLink], int, int]:
- links: list[WebIndexLink] = []
- seen_urls: set[str] = set()
- invalid_count = 0
- duplicate_count = 0
+ def _refresh_results(self, *, capture_selection: bool = True) -> None:
+ if capture_selection:
+ self._capture_result_selection()
+ query = self._results_search.text().strip().casefold()
+ excluded = self._excluded_terms()
+ allowed = {ext for ext, action in self._format_actions.items() if action.isChecked()}
- for raw_line in self._manual_links.toPlainText().splitlines():
- raw_url = raw_line.strip()
- if not raw_url:
+ self._results.blockSignals(True)
+ self._results.clear()
+ visible_count = 0
+ for file_item in self._found_files.items:
+ ext = (file_item.ext or "").lower()
+ filter_ext = ".jpg" if ext == ".jpeg" else ext
+ haystack = " ".join(
+ (file_item.name, file_item.url, file_item.source_page or "", ext)
+ ).casefold()
+ if filter_ext not in allowed:
continue
-
- normalized = self._normalize_custom_url(raw_url)
- if normalized is None:
- invalid_count += 1
+ if query and query not in haystack:
continue
-
- url = normalized[0]
- if url in seen_urls:
- duplicate_count += 1
+ if excluded and any(term in haystack for term in excluded):
continue
- seen_urls.add(url)
- links.append(
- WebIndexLink(
- label=self._compact_area_label("", url),
- url=url,
- source_page=None,
- )
+ source = self._short_url(file_item.source_page or file_item.url)
+ row = QTreeWidgetItem([file_item.name or "download", ext.lstrip(".").upper(), source])
+ row.setData(0, Qt.ItemDataRole.UserRole, file_item)
+ row.setToolTip(0, file_item.url)
+ row.setToolTip(2, file_item.source_page or file_item.url)
+ self._results.addTopLevelItem(row)
+ row.setSelected(file_item.url in self._selected_file_urls)
+ visible_count += 1
+ self._results.blockSignals(False)
+ total = len(self._found_files.items)
+ selected = len(self._selected_file_urls)
+ self._results_count.setText(f"{visible_count}/{total} shown; {selected} selected")
+ self._download_btn.setEnabled(selected > 0)
+ self._update_selection_detail()
+ if total and visible_count == 0:
+ self.set_status(
+ f"Found Files contains {total} item(s), but the current search or file-type filters hide all stored results."
)
- return links, invalid_count, duplicate_count
+ def _capture_result_selection(self) -> None:
+ visible_urls: set[str] = set()
+ selected_urls: set[str] = set()
+ for row_index in range(self._results.topLevelItemCount()):
+ row = self._results.topLevelItem(row_index)
+ file_item = row.data(0, Qt.ItemDataRole.UserRole)
+ if not isinstance(file_item, WebItem):
+ continue
+ visible_urls.add(file_item.url)
+ if row.isSelected():
+ selected_urls.add(file_item.url)
+ self._selected_file_urls.difference_update(visible_urls)
+ self._selected_file_urls.update(selected_urls)
+
+ def _on_result_selection_changed(self) -> None:
+ self._capture_result_selection()
+ self._results_count.setText(
+ f"{self._results.topLevelItemCount()}/{len(self._found_files.items)} shown; "
+ f"{len(self._selected_file_urls)} selected"
+ )
+ self._download_btn.setEnabled(bool(self._selected_file_urls))
+ self._update_selection_detail()
- def _update_manual_link_count(self) -> None:
- links, invalid_count, duplicate_count = self._manual_index_links()
- detail = f"{len(links)} valid URL(s)"
- skipped: list[str] = []
- if invalid_count:
- skipped.append(f"{invalid_count} invalid")
- if duplicate_count:
- skipped.append(f"{duplicate_count} duplicate")
- if skipped:
- detail = f"{detail}; {', '.join(skipped)} skipped"
- self._manual_count.setText(detail)
+ def _update_selection_detail(self) -> None:
+ selected = self._selected_result_items()
+ if not selected:
+ self._selection_detail.setText("Select a file to see its source URL.")
+ return
+ first = selected[0]
+ prefix = f"{len(selected)} selected. " if len(selected) > 1 else ""
+ self._selection_detail.setText(
+ f"{prefix}{first.name} | {first.ext or 'unknown type'} | {first.confidence.value} | {first.url}"
+ )
- def _clear_manual_links(self) -> None:
- self._manual_links.clear()
- self._update_manual_link_count()
+ def _selected_result_items(self) -> list[WebItem]:
+ self._capture_result_selection()
+ return [item for item in self._found_files.items if item.url in self._selected_file_urls]
- def _clear_url(self) -> None:
- self._custom_url.clear()
- self._update_selected_page_hint()
- self.set_status("URL cleared.")
+ def _select_all_visible_results(self) -> None:
+ self._results.selectAll()
+ self._on_result_selection_changed()
- def _clear_found_pages(self) -> None:
- self._index_link_items = []
- self._refresh_index_link_list()
- self._set_index_controls_enabled(False)
- self.set_status("Linked pages cleared.")
+ def _clear_result_selection(self) -> None:
+ self._selected_file_urls.clear()
+ self._results.clearSelection()
+ self._refresh_results(capture_selection=False)
def _clear_found_files(self) -> None:
- self._items = []
- self._refresh_list()
- self._selection_detail.setText("Select an item to see its source URL.")
- self.set_status("Found files cleared.")
+ self._found_files.clear()
+ self._selected_file_urls.clear()
+ self._refresh_results(capture_selection=False)
+ self.set_status("Found Files cleared.")
+
+ def _reset_file_filters(self) -> None:
+ self._results_search.clear()
+ self._exclude_words.clear()
+ for action in self._format_actions.values():
+ action.setChecked(True)
+ self._refresh_results()
def _emit_download(self) -> None:
- selected = self._selected_items_payloads()
+ selected = self._selected_result_items()
if not selected:
- self.set_status("Select at least one item to download.")
+ self.set_status("Select at least one found file before downloading.")
return
-
website_id, area_id = self.selected_source_ids()
- area = self._area.currentData()
- area_url = str(area.get("url", "")).strip() if isinstance(area, dict) else ""
- area_label = str(area.get("label", "")).strip() if isinstance(area, dict) else ""
-
- payload = {
- "items": [asdict(x) for x in selected],
- "target": ImportTarget.NORMAL.value,
- "website_id": website_id,
- "area_id": area_id,
- "area_url": area_url or None,
- "area_label": area_label or None,
- "smart": asdict(self.smart_options()),
- }
- self.set_status("Downloading with smart routing...")
- self.download_requested.emit(payload)
-
- def _add_custom_website(self) -> None:
- raw_url = self._custom_url.text().strip()
- if not raw_url:
- self.set_status("Enter a website URL to add.")
- return
-
- normalized = self._normalize_custom_url(raw_url)
- if normalized is None:
- self.set_status("Invalid URL. Use http(s)://domain/path.")
- return
-
- normalized_url, host = normalized
- sources = self.sources_registry()
- source = self._find_source_by_host(sources, host)
-
- if source is None:
- existing_ids = {str(item.get("id", "")).strip() for item in sources if isinstance(item, dict)}
- source_id = self._next_unique_id(self._slugify(host) or "custom_site", existing_ids)
- source = {"id": source_id, "name": host, "areas": []}
- sources.append(source)
-
- areas = source.get("areas")
- if not isinstance(areas, list):
- areas = []
- source["areas"] = areas
-
- existing_area_ids = {str(a.get("id", "")).strip() for a in areas if isinstance(a, dict)}
- existing_urls = {str(a.get("url", "")).strip() for a in areas if isinstance(a, dict)}
-
- selected_area_id: str | None = None
- created = False
- if normalized_url in existing_urls:
- selected_area = next(
- (
- area
- for area in areas
- if isinstance(area, dict) and str(area.get("url", "")).strip() == normalized_url
- ),
- None,
+ self.download_requested.emit(
+ WebDownloadRequest(
+ items=tuple(selected),
+ smart=self.smart_options(),
+ target=ImportTarget.NORMAL,
+ website_id=website_id,
+ area_id=area_id,
)
- if isinstance(selected_area, dict):
- selected_area_id = str(selected_area.get("id", "")).strip() or None
+ )
+
+ def _show_scan_status(self, latest: ScanResults, *, merge: ScanMergeResult | None = None) -> None:
+ total = len(self._found_files.items)
+ failed = tuple(latest.failed_pages or ())
+ failure_note = self._scan_failure_note(failed)
+ tooltip = self._scan_failure_tooltip(failed)
+ if merge is None:
+ text = f"Found Files contains {total} item(s); scanner filtered out {latest.filtered_count}."
else:
- parsed = urlparse(normalized_url)
- path_parts = [part for part in str(parsed.path or "").split("/") if part]
- area_label = self._path_label_from_parts(path_parts)
- if parsed.query:
- area_label = f"{area_label} (Query)"
- area_id = self._next_unique_id(self._slugify(area_label) or "page", existing_area_ids)
- areas.append({"id": area_id, "label": area_label, "url": normalized_url})
- selected_area_id = area_id
- created = True
+ text = f"Added {merge.added_count} new item(s); {total} total"
+ if merge.duplicate_count:
+ text += f"; ignored {merge.duplicate_count} duplicate(s)"
+ if latest.filtered_count:
+ text += f"; scanner filtered out {latest.filtered_count}"
+ text += "."
+ if failed:
+ text += f" {failure_note}"
+ if total and self._results.topLevelItemCount() == 0:
+ text += " Current search or file-type filters hide all stored results."
+ self._set_status_text(text, tooltip)
+
+ def _excluded_terms(self) -> list[str]:
+ normalized = self._exclude_words.text().strip().casefold().replace(",", " ").replace(";", " ")
+ return [term for term in normalized.split() if term]
- source_id = str(source.get("id", "")).strip()
- self.set_sources(websites=sources, selected_website_id=source_id, selected_area_id=selected_area_id)
- self._custom_url.clear()
- self.registry_changed.emit(self.sources_registry())
+ # --- Shared helpers ---
- if created:
- self.set_status(f"Saved page: {normalized_url}")
- else:
- self.set_status("Page URL already exists in the saved list.")
+ def _set_status_text(self, text: str, tooltip: str = "") -> None:
+ self._status.setText(str(text))
+ self._status.setToolTip(str(tooltip or ""))
@staticmethod
- def _normalize_custom_url(raw_url: str) -> tuple[str, str] | None:
- candidate = (raw_url or "").strip()
+ def _normalize_page_url(raw_url: str) -> str | None:
+ candidate = str(raw_url or "").strip()
if not candidate:
return None
-
if "://" not in candidate:
candidate = f"https://{candidate}"
-
parsed = urlparse(candidate)
- scheme = parsed.scheme.lower()
- if scheme not in {"http", "https"} or not parsed.netloc:
+ if (
+ parsed.scheme.lower() not in {"http", "https"}
+ or not parsed.netloc
+ or any(character.isspace() for character in parsed.netloc)
+ ):
return None
-
- host = parsed.netloc.lower()
- if host.startswith("www."):
- host = host[4:]
-
- return candidate, host
+ return urlunparse(
+ (
+ parsed.scheme.lower(),
+ parsed.netloc.lower(),
+ parsed.path or "/",
+ parsed.params,
+ parsed.query,
+ "",
+ )
+ )
@staticmethod
- def _friendly_path_segment(segment: str) -> str:
- raw = WebSourcesPanel._ascii_clean(unquote(segment or "")).strip().replace("-", " ").replace("_", " ")
- words = [word for word in raw.split() if word]
- if not words:
- return "Area"
- return " ".join(word.capitalize() for word in words)
-
- @classmethod
- def _path_label_from_parts(cls, path_parts: list[str]) -> str:
- friendly_parts = [cls._friendly_path_segment(part) for part in path_parts if str(part or "").strip()]
- if not friendly_parts:
- return "Root"
- if len(friendly_parts) > 3:
- friendly_parts = ["..."] + friendly_parts[-3:]
- return " / ".join(friendly_parts)
+ def _short_url(url: str, *, limit: int = 72) -> str:
+ parsed = urlparse(str(url or ""))
+ text = f"{parsed.netloc}{unquote(parsed.path or '/')}"
+ if parsed.query:
+ text += "?" + parsed.query
+ if len(text) > limit:
+ return text[: limit - 3].rstrip() + "..."
+ return text or str(url or "")
@classmethod
- def _compact_area_label(cls, label: str, url: str) -> str:
- parsed = urlparse(str(url or "").strip())
- path_parts = [part for part in str(parsed.path or "").split("/") if part]
- clean = cls._path_label_from_parts(path_parts)
+ def _page_label(cls, url: str) -> str:
+ parsed = urlparse(url)
+ parts = [cls._friendly_segment(part) for part in parsed.path.split("/") if part]
+ label = " / ".join(parts[-3:]) if parts else "Root"
+ if len(parts) > 3:
+ label = f"... / {label}"
if parsed.query:
- clean = f"{clean} (Query)"
-
- if not path_parts:
- fallback = " ".join(cls._ascii_clean(unquote(label or "")).split())
- clean = fallback or "Root"
-
- max_len = 72
- if len(clean) > max_len:
- clean = f"{clean[: max_len - 3].rstrip()}..."
- return clean or "Area"
+ label += " (Query)"
+ return label
@staticmethod
- def _ascii_clean(value: str) -> str:
- normalized = unicodedata.normalize("NFKD", str(value or ""))
- return normalized.encode("ascii", "ignore").decode("ascii")
+ def _friendly_segment(segment: str) -> str:
+ normalized = unicodedata.normalize("NFKD", unquote(str(segment or "")))
+ ascii_text = normalized.encode("ascii", "ignore").decode("ascii")
+ words = ascii_text.replace("-", " ").replace("_", " ").split()
+ return " ".join(word.capitalize() for word in words) or "Page"
@staticmethod
def _slugify(value: str) -> str:
- out = "".join(ch.lower() if ch.isalnum() else "_" for ch in (value or ""))
- return "_".join(part for part in out.split("_") if part)
+ slug = re.sub(r"[^a-z0-9]+", "_", str(value or "").lower()).strip("_")
+ return slug
@staticmethod
- def _next_unique_id(base: str, existing: set[str]) -> str:
- candidate = base.strip() or "custom"
- if candidate not in existing:
- return candidate
- index = 2
- while True:
- next_candidate = f"{candidate}_{index}"
- if next_candidate not in existing:
- return next_candidate
- index += 1
-
- @staticmethod
- def _find_source_by_host(sources: list[dict], host: str) -> dict | None:
- for source in sources:
- if not isinstance(source, dict):
- continue
- areas = source.get("areas")
- if not isinstance(areas, list):
- continue
- for area in areas:
- if not isinstance(area, dict):
- continue
- parsed = urlparse(str(area.get("url", "")).strip())
- netloc = parsed.netloc.lower()
- if netloc.startswith("www."):
- netloc = netloc[4:]
- if netloc and netloc == host:
- return source
- return None
- def _show_website_context_menu(self, pos) -> None: # noqa: ANN001
- menu = QMenu(self)
- remove_action = menu.addAction("Remove Website")
- chosen = menu.exec(self._website.mapToGlobal(pos))
- if chosen is remove_action:
- self._remove_selected_website()
- def _show_area_context_menu(self, pos) -> None: # noqa: ANN001
- menu = QMenu(self)
- remove_action = menu.addAction("Remove URL")
- chosen = menu.exec(self._area.mapToGlobal(pos))
- if chosen is remove_action:
- self._remove_selected_area()
- def _remove_selected_website(self) -> None:
- source = self._website.currentData()
- if not isinstance(source, dict):
- self.set_status("No website selected.")
- return
-
- source_id = str(source.get("id", "")).strip()
- source_name = str(source.get("name", source_id or "Website")).strip() or "Website"
- if not source_id:
- self.set_status("No website selected.")
- return
-
- sources = self.sources_registry()
- remove_index = next(
- (
- index
- for index, item in enumerate(sources)
- if isinstance(item, dict) and str(item.get("id", "")).strip() == source_id
- ),
- None,
- )
- if remove_index is None:
- self.set_status("Website not found.")
- return
-
- sources.pop(remove_index)
-
- selected_website_id: str | None = None
- selected_area_id: str | None = None
- if sources:
- next_index = min(remove_index, len(sources) - 1)
- next_source = sources[next_index] if isinstance(sources[next_index], dict) else None
- if isinstance(next_source, dict):
- selected_website_id = str(next_source.get("id", "")).strip() or None
- next_areas = next_source.get("areas")
- if isinstance(next_areas, list) and next_areas:
- first_area = next_areas[0]
- if isinstance(first_area, dict):
- selected_area_id = str(first_area.get("id", "")).strip() or None
-
- self.set_sources(
- websites=sources,
- selected_website_id=selected_website_id,
- selected_area_id=selected_area_id,
- )
- self._clear_results_for_registry_change()
- self.registry_changed.emit(self.sources_registry())
- self.set_status(f"Removed website: {source_name}")
-
- def _remove_selected_area(self) -> None:
- source = self._website.currentData()
- area = self._area.currentData()
- if not isinstance(source, dict) or not isinstance(area, dict):
- self.set_status("No URL selected.")
- return
-
- source_id = str(source.get("id", "")).strip()
- source_name = str(source.get("name", source_id or "Website")).strip() or "Website"
- area_id = str(area.get("id", "")).strip()
- area_label = str(area.get("label", "URL")).strip() or "URL"
- if not source_id or not area_id:
- self.set_status("No URL selected.")
- return
-
- sources = self.sources_registry()
- source_index = next(
- (
- index
- for index, item in enumerate(sources)
- if isinstance(item, dict) and str(item.get("id", "")).strip() == source_id
- ),
- None,
- )
- if source_index is None:
- self.set_status("Selected website not found.")
- return
-
- target_source = sources[source_index]
- if not isinstance(target_source, dict):
- self.set_status("Selected website not found.")
- return
-
- areas = target_source.get("areas")
- if not isinstance(areas, list):
- self.set_status("Selected URL not found.")
- return
-
- remove_area_index = next(
- (
- index
- for index, item in enumerate(areas)
- if isinstance(item, dict) and str(item.get("id", "")).strip() == area_id
- ),
- None,
- )
- if remove_area_index is None:
- self.set_status("Selected URL not found.")
- return
-
- areas.pop(remove_area_index)
-
- selected_website_id: str | None = source_id
- selected_area_id: str | None = None
- if areas:
- next_area_index = min(remove_area_index, len(areas) - 1)
- next_area = areas[next_area_index]
- if isinstance(next_area, dict):
- selected_area_id = str(next_area.get("id", "")).strip() or None
- else:
- sources.pop(source_index)
- if sources:
- next_source_index = min(source_index, len(sources) - 1)
- next_source = sources[next_source_index] if isinstance(sources[next_source_index], dict) else None
- if isinstance(next_source, dict):
- selected_website_id = str(next_source.get("id", "")).strip() or None
- next_areas = next_source.get("areas")
- if isinstance(next_areas, list) and next_areas:
- first_area = next_areas[0]
- if isinstance(first_area, dict):
- selected_area_id = str(first_area.get("id", "")).strip() or None
- else:
- selected_website_id = None
- selected_area_id = None
-
- self.set_sources(
- websites=sources,
- selected_website_id=selected_website_id,
- selected_area_id=selected_area_id,
- )
- self._clear_results_for_registry_change()
- self.registry_changed.emit(self.sources_registry())
- self.set_status(f"Removed URL: {area_label} ({source_name})")
-
- def _clear_results_for_registry_change(self) -> None:
- self._items = []
- self._index_link_items = []
- self._refresh_list()
- self._refresh_index_link_list()
- self._set_index_controls_enabled(False)
- self._selection_detail.setText("Select an item to see its source URL.")
-
- def _refresh_list(self) -> None:
- self._results.clear()
- query = self._search.text().strip().lower()
- excluded_terms = self._excluded_result_terms()
-
- allow = set()
- if self._filter_png.isChecked():
- allow.add(".png")
- if self._filter_gif.isChecked():
- allow.add(".gif")
- if self._filter_webp.isChecked():
- allow.add(".webp")
- if self._filter_jpg.isChecked():
- allow.add(".jpg")
- allow.add(".jpeg")
- if self._filter_zip.isChecked():
- allow.add(".zip")
-
- for item in self._items:
- name = item.name or ""
- ext = (item.ext or "").lower()
- haystack = " ".join(
- (
- name,
- ext,
- item.url or "",
- item.source_page or "",
- )
- ).lower()
- if allow and ext and ext not in allow:
- continue
- if query and query not in haystack:
- continue
- if excluded_terms and any(term in haystack for term in excluded_terms):
- continue
-
- badge = "DIRECT"
- if item.confidence == Confidence.LIKELY:
- badge = "LIKELY"
- elif item.confidence == Confidence.UNKNOWN:
- badge = "UNKNOWN"
-
- label = f"[{badge}] {name} ({ext.lstrip('.') if ext else 'file'})"
- lw = QListWidgetItem(label)
- lw.setToolTip(item.url)
- lw.setData(Qt.ItemDataRole.UserRole, item)
- self._results.addItem(lw)
-
- def _excluded_result_terms(self) -> list[str]:
- raw = self._exclude_keywords.text().strip().lower()
- if not raw:
- return []
- normalized = raw.replace(",", " ").replace(";", " ")
- return [term for term in normalized.split() if term]
+ def _unique_id(base: str, existing: set[str]) -> str:
+ candidate = base or "item"
+ suffix = 2
+ while candidate in existing:
+ candidate = f"{base}_{suffix}"
+ suffix += 1
+ return candidate
@staticmethod
def _scan_failure_note(failed_pages: tuple[str, ...]) -> str:
if not failed_pages:
return ""
- reason = WebSourcesPanel._scan_failure_reason(failed_pages[0])
- suffix = f" ({reason})" if reason else ""
noun = "page" if len(failed_pages) == 1 else "pages"
- return f"{len(failed_pages)} {noun} failed{suffix}. Hover for details."
+ return f"{len(failed_pages)} {noun} failed; hover for details."
@staticmethod
def _scan_failure_tooltip(failed_pages: tuple[str, ...]) -> str:
if not failed_pages:
return ""
lines = ["Failed page details:"]
- for page in failed_pages[:10]:
- lines.append(f"- {' '.join(str(page).split())}")
+ lines.extend(f"- {' '.join(str(page).split())}" for page in failed_pages[:10])
if len(failed_pages) > 10:
lines.append(f"- ...and {len(failed_pages) - 10} more")
return "\n".join(lines)
-
- @staticmethod
- def _scan_failure_reason(failure: str) -> str:
- text = " ".join(str(failure or "").split())
- http_match = re.search(r"HTTP\s+(\d{3})(?:\s*\(([^)]+)\))?", text, flags=re.IGNORECASE)
- if http_match:
- code = http_match.group(1)
- label = " ".join(str(http_match.group(2) or "").split())
- return f"HTTP {code}{f' {label}' if label else ''}"
- if "timeout" in text.lower() or "timed out" in text.lower():
- return "timeout"
- return ""
-
- def _refresh_index_link_list(self) -> None:
- self._index_links.clear()
- query = self._index_keyword.text().strip().lower()
-
- for link in self._index_link_items:
- haystack = f"{link.label} {link.url} {link.source_page or ''}".lower()
- if query and query not in haystack:
- continue
-
- item = QListWidgetItem(f"{link.label}\n{link.url}")
- item.setToolTip(link.url)
- item.setData(Qt.ItemDataRole.UserRole, link)
- self._index_links.addItem(item)
-
- def _selected_index_link_payloads(self) -> list[dict]:
- selected = self._index_links.selectedItems()
- if not selected:
- return []
-
- out: list[dict] = []
- for item in selected:
- link = item.data(Qt.ItemDataRole.UserRole)
- if isinstance(link, WebIndexLink):
- out.append(asdict(link))
- return out
-
- def _visible_index_link_payloads(self) -> list[dict]:
- out: list[dict] = []
- for row in range(self._index_links.count()):
- item = self._index_links.item(row)
- if item is None:
- continue
- link = item.data(Qt.ItemDataRole.UserRole)
- if isinstance(link, WebIndexLink):
- out.append(asdict(link))
- return out
-
- def _select_visible_index_links(self) -> None:
- self._index_links.selectAll()
-
- def _clear_result_text_filters(self) -> None:
- if self._search.text():
- self._search.clear()
- if self._exclude_keywords.text():
- self._exclude_keywords.clear()
-
- def _set_index_controls_enabled(self, enabled: bool) -> None:
- for widget in (
- self._index_keyword,
- ):
- widget.setEnabled(bool(enabled))
-
- def confirm_large_linked_page_scan(self, page_count: int, *, cap: int | None = None) -> bool:
- limit = int(cap or self.LINKED_PAGE_SCAN_CAP)
- if int(page_count) <= limit:
- return True
-
- answer = QMessageBox.question(
- self,
- "Large linked-page scan",
- (
- f"This index has {page_count} linked pages.\n\n"
- "Scanning too many pages at once can make the app slow or unstable.\n"
- f"Sprite Factory will scan the first {limit} pages only.\n\n"
- "Continue?"
- ),
- QMessageBox.StandardButton.Yes | QMessageBox.StandardButton.No,
- QMessageBox.StandardButton.No,
- )
- return answer == QMessageBox.StandardButton.Yes
-
- def _cap_link_payloads_with_warning(self, links: list[dict]) -> list[dict]:
- cap = int(self.LINKED_PAGE_SCAN_CAP)
- if len(links) <= cap:
- return links
- if not self.confirm_large_linked_page_scan(len(links), cap=cap):
- self.set_status("Linked-page scan cancelled before starting.")
- return []
- return links[:cap]
-
- def _selected_items_payloads(self) -> list[WebItem]:
- selected = self._results.selectedItems()
- if not selected:
- return []
- out: list[WebItem] = []
- for lw in selected:
- meta = lw.data(Qt.ItemDataRole.UserRole)
- if isinstance(meta, WebItem):
- out.append(meta)
- return out
-
- def _update_preview(self) -> None:
- selected = self._selected_items_payloads()
- if not selected:
- self._selection_detail.setText("Select an item to see its source URL.")
- return
- item = selected[0]
- self._selection_detail.setText(
- f"Selected: {item.name} | {item.ext} | {item.confidence.value} | {item.url}"
- )
-
- def _select_all_visible(self) -> None:
- self._results.selectAll()
-
- def _clear_selection(self) -> None:
- self._results.clearSelection()
-
-
-
-
-
-
-
-
-
-
-
diff --git a/image_engine_app/ui/windows/__init__.py b/image_engine_app/ui/windows/__init__.py
index 31103ba..82e56a7 100644
--- a/image_engine_app/ui/windows/__init__.py
+++ b/image_engine_app/ui/windows/__init__.py
@@ -1,11 +1,9 @@
"""Secondary dialogs/windows for the Image Engine UI."""
from .batch_manager import BatchManagerDialog
-from .export_encoding import ExportEncodingDialog
from .preset_manager import PresetManagerDialog
__all__ = [
"BatchManagerDialog",
- "ExportEncodingDialog",
"PresetManagerDialog",
]
diff --git a/image_engine_app/ui/windows/batch_manager.py b/image_engine_app/ui/windows/batch_manager.py
index c9f0e3f..f45d781 100644
--- a/image_engine_app/ui/windows/batch_manager.py
+++ b/image_engine_app/ui/windows/batch_manager.py
@@ -28,7 +28,7 @@
QWidget,
)
-from image_engine_app.engine.models import BackgroundRemovalMode
+from image_engine_app.engine.models import BackgroundRemovalMode, BatchEditSource
from image_engine_app.ui.windows.batch_queue_state import (
BatchQueueRowState,
BatchQueueState,
@@ -43,13 +43,11 @@
class BatchDialogOptions:
"""UI-selected batch run options."""
- auto_preset: bool
+ edit_source: BatchEditSource
auto_export: bool
preview_skip_mode: bool
export_name_template: str
avoid_overwrite: bool
- apply_active_edits: bool
- apply_selected_preset: bool
selected_preset_name: str | None
background_removal_override: str | None = None
export_directory: str | None = None
@@ -74,10 +72,8 @@ def __init__(self, parent: QWidget | None = None) -> None:
self._progress_label = QLabel("Batch progress: 0%", self)
self._current_item_label = QLabel("Current item: --", self)
self._current_stage_label = QLabel("Stage: --", self)
- self._auto_preset_check = QCheckBox("Smart presets by asset type", self)
self._auto_export_check = QCheckBox("Save files after processing", self)
- self._apply_active_edits_check = QCheckBox("Copy current asset edits", self)
- self._apply_preset_check = QCheckBox("Apply chosen preset", self)
+ self._edit_source_combo = QComboBox(self)
self._background_combo = QComboBox(self)
self._batch_preset_combo = QComboBox(self)
self._export_name_combo = QComboBox(self)
@@ -94,7 +90,6 @@ def __init__(self, parent: QWidget | None = None) -> None:
self._select_all_action: QAction | None = None
self._select_failed_action: QAction | None = None
self._clear_selection_action: QAction | None = None
- self._auto_preset_action: QAction | None = None
self._auto_export_action: QAction | None = None
self._preview_skip_action: QAction | None = None
self._run_btn = QPushButton("Run Selected", self)
@@ -110,16 +105,17 @@ def current_options(self) -> BatchDialogOptions:
"""Return current run options from dialog controls."""
return BatchDialogOptions(
- auto_preset=self._auto_preset_check.isChecked(),
+ edit_source=BatchEditSource(str(self._edit_source_combo.currentData())),
auto_export=self._auto_export_check.isChecked(),
preview_skip_mode=self._preview_skip_check.isChecked(),
export_name_template=str(self._export_name_combo.currentData() or "{stem}"),
avoid_overwrite=self._avoid_overwrite_check.isChecked(),
- apply_active_edits=self._apply_active_edits_check.isChecked(),
- apply_selected_preset=self._apply_preset_check.isChecked(),
selected_preset_name=(
str(self._batch_preset_combo.currentData()).strip()
- if self._batch_preset_combo.currentData()
+ if (
+ self._edit_source_combo.currentData() == BatchEditSource.CHOSEN_PRESET.value
+ and self._batch_preset_combo.currentData()
+ )
else None
),
background_removal_override=(
@@ -223,11 +219,9 @@ def set_running(self, is_running: bool) -> None:
self._is_running = bool(is_running)
self._cancel_btn.setEnabled(self._is_running)
- self._auto_preset_check.setEnabled(not self._is_running)
self._auto_export_check.setEnabled(not self._is_running)
self._preview_skip_check.setEnabled(not self._is_running)
- self._apply_active_edits_check.setEnabled(not self._is_running)
- self._apply_preset_check.setEnabled(not self._is_running)
+ self._edit_source_combo.setEnabled(not self._is_running)
self._background_combo.setEnabled(not self._is_running)
self.queue_list.setEnabled(not self._is_running)
self._refresh_idle_controls()
@@ -383,7 +377,7 @@ def _build_ui(self) -> None:
self._workflow_label.setWordWrap(True)
self._workflow_label.setStyleSheet("color:#49686d;")
self._workflow_label.setText(
- "Run order: copy current edits, apply chosen preset, apply background override, run smart presets, process, then export."
+ "Choose one edit source. Batch then applies the optional background override, processes each item, and exports."
)
layout.addWidget(self._workflow_label)
@@ -470,13 +464,10 @@ def _build_ui(self) -> None:
status_layout.addWidget(self._details_label)
layout.addWidget(status_box)
- self._auto_preset_check.setChecked(True)
self._auto_export_check.setChecked(True)
self._preview_skip_check.setChecked(True)
- self._auto_preset_check.setToolTip("Auto-pick safe batch presets from the asset type, tags, and format.")
self._auto_export_check.setToolTip("Save processed files to the selected export folder.")
self._preview_skip_check.setToolTip("Skip extra planning UI steps for a faster queue run.")
- self._auto_preset_check.hide()
self._auto_export_check.hide()
self._preview_skip_check.hide()
@@ -485,11 +476,6 @@ def _build_ui(self) -> None:
rules_header.addStretch(1)
options_menu = QMenu(self._run_options_btn)
- self._auto_preset_action = self._option_action(
- self._auto_preset_check,
- "Smart presets by asset type",
- "Auto-pick safe batch presets from the asset type, tags, and format.",
- )
self._auto_export_action = self._option_action(
self._auto_export_check,
"Export after processing",
@@ -500,7 +486,6 @@ def _build_ui(self) -> None:
"Fast run",
"Skip extra planning UI steps for a faster queue run.",
)
- options_menu.addAction(self._auto_preset_action)
options_menu.addAction(self._auto_export_action)
options_menu.addAction(self._preview_skip_action)
self._run_options_btn.setText("Options")
@@ -510,17 +495,17 @@ def _build_ui(self) -> None:
rules_header.addWidget(self._run_options_btn)
apply_row = QHBoxLayout()
- self._apply_active_edits_check.setChecked(False)
- self._apply_preset_check.setChecked(False)
- self._apply_active_edits_check.setToolTip("Copy the active asset's edit settings and queued heavy jobs onto the batch clones.")
- self._apply_preset_check.setToolTip("Apply one chosen preset to all compatible selected items before the batch run starts.")
- apply_row.addWidget(self._apply_active_edits_check)
- apply_row.addWidget(self._apply_preset_check)
- apply_row.addWidget(QLabel("Preset:", self))
+ apply_row.addWidget(QLabel("Edit source:", self))
+ self._edit_source_combo.addItem("Keep each asset's controls", BatchEditSource.KEEP_EACH.value)
+ self._edit_source_combo.addItem("Apply one preset", BatchEditSource.CHOSEN_PRESET.value)
+ self._edit_source_combo.addItem("Copy active asset controls", BatchEditSource.COPY_ACTIVE.value)
+ self._edit_source_combo.addItem("Smart match each asset", BatchEditSource.SMART_MATCH.value)
+ self._edit_source_combo.setToolTip("Choose exactly one source of control settings for this run.")
+ apply_row.addWidget(self._edit_source_combo, 1)
self._batch_preset_combo.clear()
self._batch_preset_combo.addItem("Choose preset...", None)
self._batch_preset_combo.setMinimumWidth(220)
- self._batch_preset_combo.setToolTip("Only compatible items will receive the chosen preset.")
+ self._batch_preset_combo.setToolTip("The chosen preset starts from each asset's own detected controls.")
apply_row.addWidget(self._batch_preset_combo, 1)
apply_row.addStretch(1)
@@ -584,7 +569,7 @@ def _build_ui(self) -> None:
layout.addLayout(options_row)
self._auto_export_check.toggled.connect(self._on_auto_export_toggled)
- self._apply_preset_check.toggled.connect(self._on_apply_preset_toggled)
+ self._edit_source_combo.currentIndexChanged.connect(self._on_edit_source_changed)
self._batch_preset_combo.currentIndexChanged.connect(self._on_batch_preset_changed)
actions = QHBoxLayout()
@@ -605,8 +590,7 @@ def _on_auto_export_toggled(self, checked: bool) -> None:
_ = checked
self._refresh_idle_controls()
- def _on_apply_preset_toggled(self, checked: bool) -> None:
- _ = checked
+ def _on_edit_source_changed(self, _index: int) -> None:
self._refresh_idle_controls()
def _on_batch_preset_changed(self, _index: int) -> None:
@@ -675,8 +659,9 @@ def _refresh_idle_controls(self, *, total: int | None = None, selected: int | No
has_selection = selected > 0
has_failed = bool(self._queue_state.failed_asset_ids())
+ edit_source = str(self._edit_source_combo.currentData() or BatchEditSource.KEEP_EACH.value)
preset_selected = bool(self._batch_preset_combo.currentData())
- preset_ready = (not self._apply_preset_check.isChecked()) or preset_selected
+ preset_ready = edit_source != BatchEditSource.CHOSEN_PRESET.value or preset_selected
self._run_btn.setEnabled(is_idle and has_selection and preset_ready)
self._select_all_btn.setEnabled(is_idle and has_rows)
@@ -690,13 +675,11 @@ def _refresh_idle_controls(self, *, total: int | None = None, selected: int | No
self._clear_selection_action.setEnabled(is_idle and has_rows)
self._queue_more_btn.setEnabled(is_idle and has_rows)
self._run_options_btn.setEnabled(is_idle and has_selection)
- if self._auto_preset_action is not None:
- self._auto_preset_action.setEnabled(is_idle and has_selection)
if self._auto_export_action is not None:
self._auto_export_action.setEnabled(is_idle and has_selection)
if self._preview_skip_action is not None:
self._preview_skip_action.setEnabled(is_idle and has_selection)
- self._apply_active_edits_check.setEnabled(is_idle and has_selection)
+ self._edit_source_combo.setEnabled(is_idle and has_selection)
allow_export_controls = is_idle and self._auto_export_check.isChecked()
self._export_name_combo.setEnabled(allow_export_controls)
@@ -705,9 +688,13 @@ def _refresh_idle_controls(self, *, total: int | None = None, selected: int | No
self._browse_export_dir_btn.setEnabled(allow_export_controls)
has_presets = self._batch_preset_combo.count() > 1
- allow_preset_controls = is_idle and has_selection and has_presets
- self._apply_preset_check.setEnabled(allow_preset_controls)
- self._batch_preset_combo.setEnabled(allow_preset_controls and self._apply_preset_check.isChecked())
+ allow_preset_controls = (
+ is_idle
+ and has_selection
+ and has_presets
+ and edit_source == BatchEditSource.CHOSEN_PRESET.value
+ )
+ self._batch_preset_combo.setEnabled(allow_preset_controls)
self._background_combo.setEnabled(is_idle and has_selection)
def _set_progress(self, percent: int, *, total: int | None = None, processed: int | None = None) -> None:
@@ -730,4 +717,4 @@ def _to_int(value: object, *, default: int) -> int:
return int(value)
except Exception:
return default
-
+
diff --git a/image_engine_app/ui/windows/export_encoding.py b/image_engine_app/ui/windows/export_encoding.py
deleted file mode 100644
index 6eb707d..0000000
--- a/image_engine_app/ui/windows/export_encoding.py
+++ /dev/null
@@ -1,148 +0,0 @@
-"""Expert export encoding dialog with apply signal for active-asset export settings."""
-
-from __future__ import annotations
-
-from dataclasses import dataclass
-
-from PySide6.QtCore import Signal
-from PySide6.QtWidgets import (
- QCheckBox,
- QComboBox,
- QDialog,
- QFormLayout,
- QHBoxLayout,
- QLabel,
- QPushButton,
- QSpinBox,
- QVBoxLayout,
- QWidget,
-)
-
-from image_engine_app.engine.models import ChromaSubsampling, ExportFormat
-
-
-@dataclass(frozen=True)
-class ExportEncodingOptions:
- """Encoding options chosen in the expert dialog."""
-
- format: str
- quality: int
- compression_level: int
- chroma_subsampling: str
- strip_metadata: bool
-
-
-class ExportEncodingDialog(QDialog):
- """Advanced export encoding window for expert controls."""
-
- apply_requested = Signal(object)
-
- def __init__(self, parent: QWidget | None = None) -> None:
- super().__init__(parent)
- self.setWindowTitle("Export Encoding")
- self.resize(540, 380)
-
- self._format_combo = QComboBox(self)
- self._quality_spin = QSpinBox(self)
- self._compression_spin = QSpinBox(self)
- self._chroma_combo = QComboBox(self)
- self._strip_metadata = QCheckBox("Strip metadata", self)
- self._apply_btn = QPushButton("Apply to Current Asset", self)
-
- self._build_ui()
-
- def current_options(self) -> ExportEncodingOptions:
- """Return current dialog values as a plain options object."""
-
- return ExportEncodingOptions(
- format=str(self._format_combo.currentData() or ExportFormat.AUTO.value),
- quality=int(self._quality_spin.value()),
- compression_level=int(self._compression_spin.value()),
- chroma_subsampling=str(self._chroma_combo.currentData() or ChromaSubsampling.AUTO.value),
- strip_metadata=bool(self._strip_metadata.isChecked()),
- )
-
- def load_from_asset(self, asset: object) -> None:
- """Load export settings from an asset into the dialog controls."""
-
- settings = getattr(getattr(getattr(asset, "edit_state", None), "settings", None), "export", None)
- if settings is None:
- return
-
- format_value = str(getattr(getattr(settings, "format", None), "value", ExportFormat.AUTO.value) or ExportFormat.AUTO.value)
- quality = int(getattr(settings, "quality", 90))
- compression = int(getattr(settings, "compression_level", 6))
- chroma_value = str(
- getattr(getattr(settings, "chroma_subsampling", None), "value", ChromaSubsampling.AUTO.value)
- or ChromaSubsampling.AUTO.value
- )
- strip_metadata = bool(getattr(settings, "strip_metadata", True))
-
- self._set_combo_by_data(self._format_combo, format_value)
- self._quality_spin.setValue(max(1, min(100, quality)))
- self._compression_spin.setValue(max(0, min(9, compression)))
- self._set_combo_by_data(self._chroma_combo, chroma_value)
- self._strip_metadata.setChecked(strip_metadata)
-
- def _build_ui(self) -> None:
- layout = QVBoxLayout(self)
- layout.setContentsMargins(12, 12, 12, 12)
- layout.setSpacing(10)
-
- guide = QLabel(
- "Apply advanced format/encoding values to the active asset. "
- "Use this for final size tuning after visual edits."
- )
- guide.setWordWrap(True)
- layout.addWidget(guide)
-
- form = QFormLayout()
-
- self._format_combo.addItem("Auto", ExportFormat.AUTO.value)
- self._format_combo.addItem("PNG", ExportFormat.PNG.value)
- self._format_combo.addItem("JPEG", ExportFormat.JPG.value)
- self._format_combo.addItem("WebP", ExportFormat.WEBP.value)
- self._format_combo.addItem("GIF", ExportFormat.GIF.value)
- self._format_combo.addItem("ICO", ExportFormat.ICO.value)
- self._format_combo.addItem("TIFF", ExportFormat.TIFF.value)
- self._format_combo.addItem("BMP", ExportFormat.BMP.value)
- form.addRow("Format", self._format_combo)
-
- self._quality_spin.setRange(1, 100)
- self._quality_spin.setValue(90)
- self._quality_spin.setToolTip("Lossy quality (mainly JPEG/WEBP).")
- form.addRow("Quality", self._quality_spin)
-
- self._compression_spin.setRange(0, 9)
- self._compression_spin.setValue(6)
- self._compression_spin.setToolTip("Compression level for supported formats.")
- form.addRow("Compression", self._compression_spin)
-
- self._chroma_combo.addItem("Auto", ChromaSubsampling.AUTO.value)
- self._chroma_combo.addItem("4:4:4", ChromaSubsampling.CS_444.value)
- self._chroma_combo.addItem("4:2:2", ChromaSubsampling.CS_422.value)
- self._chroma_combo.addItem("4:2:0", ChromaSubsampling.CS_420.value)
- form.addRow("Chroma", self._chroma_combo)
-
- self._strip_metadata.setChecked(True)
- form.addRow("", self._strip_metadata)
-
- layout.addLayout(form)
-
- footer = QHBoxLayout()
- footer.addStretch(1)
- self._apply_btn.clicked.connect(self._emit_apply_requested)
- footer.addWidget(self._apply_btn)
- footer.addWidget(QPushButton("Close", self, clicked=self.close))
- layout.addLayout(footer)
-
- def _emit_apply_requested(self) -> None:
- self.apply_requested.emit(self.current_options())
-
- @staticmethod
- def _set_combo_by_data(combo: QComboBox, value: str) -> None:
- for index in range(combo.count()):
- if str(combo.itemData(index)) == str(value):
- combo.setCurrentIndex(index)
- return
-
diff --git a/image_engine_app/ui/windows/preset_manager.py b/image_engine_app/ui/windows/preset_manager.py
index 1dab197..a58f6ce 100644
--- a/image_engine_app/ui/windows/preset_manager.py
+++ b/image_engine_app/ui/windows/preset_manager.py
@@ -1,16 +1,18 @@
-"""Preset manager dialog (create/edit/save user presets)."""
+"""Preset manager built around reusable control changes."""
from __future__ import annotations
import json
from dataclasses import dataclass
+from pathlib import Path
+from typing import Callable
-from PySide6.QtCore import Qt
+from PySide6.QtCore import Qt, Signal
from PySide6.QtWidgets import (
QCheckBox,
QDialog,
- QFrame,
QFormLayout,
+ QFrame,
QHBoxLayout,
QLabel,
QLineEdit,
@@ -20,11 +22,12 @@
QPushButton,
QPlainTextEdit,
QSplitter,
+ QToolButton,
QVBoxLayout,
QWidget,
)
-from image_engine_app.engine.models import EditMode, PresetModel
+from image_engine_app.engine.models import AssetRecord, EditMode, PresetModel
@dataclass
@@ -36,22 +39,26 @@ class _PresetDraft:
settings_delta_text: str = "{}"
uses_heavy_tools: bool = False
requires_apply: bool = False
- mode_min: str = EditMode.ADVANCED.value
class PresetManagerDialog(QDialog):
- """UI for managing user presets.
+ """Create user presets from controls and manage system templates."""
- Built-in presets are shown but treated as read-only; saving edits creates/overrides
- a user preset entry.
- """
+ presets_changed = Signal()
- def __init__(self, controller, parent: QWidget | None = None) -> None:
+ def __init__(
+ self,
+ controller,
+ parent: QWidget | None = None,
+ *,
+ active_asset_provider: Callable[[], AssetRecord | None] | None = None,
+ ) -> None:
super().__init__(parent)
self._controller = controller
+ self._active_asset_provider = active_asset_provider or (lambda: None)
self.setObjectName("presetManagerDialog")
self.setWindowTitle("Preset Manager")
- self.resize(980, 620)
+ self.resize(980, 640)
self._list = QListWidget(self)
self._list.setObjectName("shellListPanel")
@@ -59,9 +66,10 @@ def __init__(self, controller, parent: QWidget | None = None) -> None:
self._desc = QLineEdit(self)
self._formats = QLineEdit(self)
self._tags = QLineEdit(self)
- self._uses_heavy = QCheckBox("Uses heavy tools", self)
+ self._uses_heavy = QCheckBox("Uses heavy processing", self)
self._requires_apply = QCheckBox("Requires Apply", self)
self._delta = QPlainTextEdit(self)
+
self._preset_kind = QLabel("No preset selected", self)
self._preset_kind.setObjectName("shellBadgeWarm")
self._scope_hint = QLabel(self)
@@ -70,40 +78,53 @@ def __init__(self, controller, parent: QWidget | None = None) -> None:
self._save_hint = QLabel(self)
self._save_hint.setObjectName("shellHint")
self._save_hint.setWordWrap(True)
+ self._capture_status = QLabel(self)
+ self._capture_status.setObjectName("shellHint")
+ self._capture_status.setWordWrap(True)
- self._btn_new = QPushButton("New", self)
+ self._btn_new = QPushButton("New from Active", self)
self._btn_duplicate = QPushButton("Duplicate", self)
self._btn_delete = QPushButton("Delete", self)
+ self._btn_capture = QPushButton("Use Active Controls", self)
+ self._btn_capture.setObjectName("shellPrimaryAction")
self._btn_format_json = QPushButton("Format JSON", self)
- self._btn_example = QPushButton("Insert Example", self)
- self._btn_save = QPushButton("Save User Preset", self)
+ self._btn_save = QPushButton("Save Preset", self)
+ self._btn_save.setObjectName("shellPrimaryAction")
self._btn_close = QPushButton("Close", self)
+ self._advanced_toggle = QToolButton(self)
+ self._advanced_toggle.setText("Advanced")
+ self._advanced_toggle.setCheckable(True)
+ self._advanced_toggle.setToolButtonStyle(Qt.ToolButtonStyle.ToolButtonTextBesideIcon)
+ self._advanced_panel = QFrame(self)
+ self._advanced_panel.setObjectName("presetManagerCard")
+
self._build_ui()
self._wire()
self.refresh_from_controller()
def refresh_from_controller(self) -> None:
+ selected_name = self._selected_preset_name()
self._list.blockSignals(True)
self._list.clear()
- for entry in self._controller.available_preset_entries():
+ selected_row = -1
+ for row, entry in enumerate(self._controller.available_preset_entries()):
preset = self._controller.get_preset(entry.name)
- label = entry.label
- if self._controller.is_user_preset(preset.name):
- label = f"{label} (User)"
- else:
- label = f"{label} (System)"
- item = QListWidgetItem(label)
+ source = "User" if self._controller.is_user_preset(preset.name) else "System"
+ item = QListWidgetItem(f"{entry.label} ({source})")
item.setData(Qt.ItemDataRole.UserRole, preset.name)
self._list.addItem(item)
+ if preset.name == selected_name:
+ selected_row = row
self._list.blockSignals(False)
if self._list.count() > 0:
- self._list.setCurrentRow(0)
+ self._list.setCurrentRow(selected_row if selected_row >= 0 else 0)
self._load_selected_into_form()
else:
self._load_draft_into_form(_PresetDraft())
+ self._refresh_active_asset_status()
def _build_ui(self) -> None:
layout = QVBoxLayout(self)
@@ -118,7 +139,7 @@ def _build_ui(self) -> None:
title = QLabel("Preset Studio", header_card)
title.setObjectName("shellTitle")
intro = QLabel(
- "System presets are safe starting templates. Duplicate one or write your own user preset with scoped formats, tags, and a JSON settings delta.",
+ "Save the active asset's control changes once, then reuse the same preset in Workspace or Batch.",
header_card,
)
intro.setObjectName("shellSubtitle")
@@ -134,14 +155,13 @@ def _build_ui(self) -> None:
left_layout = QVBoxLayout(left)
left_layout.setContentsMargins(12, 12, 12, 12)
left_layout.setSpacing(8)
- left_layout.addWidget(QLabel("Presets"))
+ left_layout.addWidget(QLabel("Preset Library", left))
left_layout.addWidget(self._list, 1)
left_buttons = QHBoxLayout()
left_buttons.addWidget(self._btn_new)
left_buttons.addWidget(self._btn_duplicate)
left_buttons.addWidget(self._btn_delete)
- left_buttons.addStretch(1)
left_layout.addLayout(left_buttons)
right = QFrame(splitter)
@@ -150,34 +170,57 @@ def _build_ui(self) -> None:
right_layout.setContentsMargins(12, 12, 12, 12)
right_layout.setSpacing(8)
- right_layout.addWidget(self._preset_kind)
+ capture_card = QFrame(right)
+ capture_card.setObjectName("presetManagerCard")
+ capture_layout = QHBoxLayout(capture_card)
+ capture_layout.setContentsMargins(10, 10, 10, 10)
+ capture_text = QVBoxLayout()
+ capture_title = QLabel("Create from current controls", capture_card)
+ capture_title.setObjectName("shellTitle")
+ capture_text.addWidget(capture_title)
+ capture_text.addWidget(self._capture_status)
+ capture_layout.addLayout(capture_text, 1)
+ capture_layout.addWidget(self._btn_capture)
+ right_layout.addWidget(capture_card)
+
+ meta_row = QHBoxLayout()
+ meta_row.addWidget(self._preset_kind)
+ meta_row.addStretch(1)
+ right_layout.addLayout(meta_row)
right_layout.addWidget(self._scope_hint)
form = QFormLayout()
form.setLabelAlignment(Qt.AlignmentFlag.AlignRight)
form.setFormAlignment(Qt.AlignmentFlag.AlignTop)
-
form.addRow("Name", self._name)
form.addRow("Description", self._desc)
- form.addRow("Applies to formats", self._formats)
- form.addRow("Applies to tags", self._tags)
-
- form.addRow("", self._uses_heavy)
- form.addRow("", self._requires_apply)
-
+ form.addRow("Formats", self._formats)
+ form.addRow("Asset types", self._tags)
right_layout.addLayout(form)
right_layout.addWidget(self._save_hint)
- right_layout.addWidget(QLabel("Settings delta (JSON)", self))
- self._delta.setPlaceholderText('{"cleanup": {"denoise": 0.2}, "export": {"format": "png"}}')
+ self._advanced_toggle.setArrowType(Qt.ArrowType.RightArrow)
+ right_layout.addWidget(self._advanced_toggle, 0, Qt.AlignmentFlag.AlignLeft)
+
+ advanced_layout = QVBoxLayout(self._advanced_panel)
+ advanced_layout.setContentsMargins(10, 10, 10, 10)
+ advanced_layout.setSpacing(7)
+ flags = QHBoxLayout()
+ flags.addWidget(self._uses_heavy)
+ flags.addWidget(self._requires_apply)
+ flags.addStretch(1)
+ advanced_layout.addLayout(flags)
+ advanced_layout.addWidget(QLabel("Captured settings (JSON)", self._advanced_panel))
+ self._delta.setPlaceholderText('{"cleanup": {"denoise": 0.2}}')
self._delta.setTabStopDistance(28)
- right_layout.addWidget(self._delta, 1)
-
+ advanced_layout.addWidget(self._delta, 1)
json_tools = QHBoxLayout()
json_tools.addWidget(self._btn_format_json)
- json_tools.addWidget(self._btn_example)
json_tools.addStretch(1)
- right_layout.addLayout(json_tools)
+ advanced_layout.addLayout(json_tools)
+ self._advanced_panel.setVisible(False)
+ right_layout.addWidget(self._advanced_panel, 1)
+ right_layout.addStretch(1)
footer = QHBoxLayout()
footer.addStretch(1)
@@ -187,7 +230,7 @@ def _build_ui(self) -> None:
splitter.setStretchFactor(0, 0)
splitter.setStretchFactor(1, 1)
- splitter.setSizes([320, 640])
+ splitter.setSizes([330, 650])
layout.addWidget(splitter, 1)
def _wire(self) -> None:
@@ -195,11 +238,18 @@ def _wire(self) -> None:
self._btn_new.clicked.connect(self._new_preset)
self._btn_duplicate.clicked.connect(self._duplicate_selected)
self._btn_delete.clicked.connect(self._delete_selected)
+ self._btn_capture.clicked.connect(self._capture_active_controls)
self._btn_format_json.clicked.connect(self._format_delta_json)
- self._btn_example.clicked.connect(self._insert_example_delta)
self._btn_save.clicked.connect(self._save_current)
+ self._advanced_toggle.toggled.connect(self._set_advanced_visible)
self._list.currentItemChanged.connect(lambda *_args: self._load_selected_into_form())
+ def _active_asset(self) -> AssetRecord | None:
+ try:
+ return self._active_asset_provider()
+ except Exception:
+ return None
+
def _selected_preset_name(self) -> str | None:
item = self._list.currentItem()
if item is None:
@@ -208,7 +258,11 @@ def _selected_preset_name(self) -> str | None:
return str(raw) if raw else None
def _new_preset(self) -> None:
+ self._list.clearSelection()
+ self._list.setCurrentItem(None)
self._load_draft_into_form(_PresetDraft())
+ if self._active_asset() is not None:
+ self._capture_active_controls(fill_identity=True)
self._name.setFocus()
def _duplicate_selected(self) -> None:
@@ -216,17 +270,17 @@ def _duplicate_selected(self) -> None:
if not selected:
return
base = self._controller.get_preset(selected)
- draft = _PresetDraft(
- name=f"{base.name} Copy",
- description=base.description,
- applies_to_formats=list(base.applies_to_formats or []),
- applies_to_tags=list(base.applies_to_tags or []),
- settings_delta_text=json.dumps(base.settings_delta or {}, indent=2, sort_keys=True),
- uses_heavy_tools=bool(base.uses_heavy_tools),
- requires_apply=bool(base.requires_apply),
- mode_min=base.mode_min.value,
+ self._load_draft_into_form(
+ _PresetDraft(
+ name=f"{base.name} Copy",
+ description=base.description,
+ applies_to_formats=list(base.applies_to_formats or []),
+ applies_to_tags=list(base.applies_to_tags or []),
+ settings_delta_text=json.dumps(base.settings_delta or {}, indent=2, sort_keys=True),
+ uses_heavy_tools=bool(base.uses_heavy_tools),
+ requires_apply=bool(base.requires_apply),
+ )
)
- self._load_draft_into_form(draft)
def _delete_selected(self) -> None:
selected = self._selected_preset_name()
@@ -244,8 +298,31 @@ def _delete_selected(self) -> None:
if confirm != QMessageBox.StandardButton.Yes:
return
self._controller.delete_user_preset(selected)
+ self.presets_changed.emit()
self.refresh_from_controller()
+ def _capture_active_controls(self, _checked: bool = False, *, fill_identity: bool = False) -> None:
+ asset = self._active_asset()
+ if asset is None:
+ self._capture_status.setText("Select an asset in Workspace before capturing controls.")
+ return
+
+ captured = self._controller.capture_preset_controls(asset)
+ if fill_identity and not self._name.text().strip():
+ stem = Path(asset.original_name or "Custom").stem.strip() or "Custom"
+ self._name.setText(f"{stem} Polish")
+ if fill_identity and not self._desc.text().strip():
+ self._desc.setText("Control adjustments captured from the active asset")
+
+ self._formats.setText(", ".join(captured.applies_to_formats))
+ self._tags.setText(", ".join(captured.applies_to_tags))
+ self._delta.setPlainText(json.dumps(captured.settings_delta, indent=2, sort_keys=True))
+ self._uses_heavy.setChecked(captured.uses_heavy_tools)
+ self._requires_apply.setChecked(captured.requires_apply)
+ self._preset_kind.setText("New user preset")
+ self._btn_delete.setEnabled(False)
+ self._refresh_delta_summary()
+
def _save_current(self) -> None:
try:
preset = self._read_form_as_preset()
@@ -253,8 +330,9 @@ def _save_current(self) -> None:
except Exception as exc:
QMessageBox.critical(self, "Save failed", str(exc))
return
+
+ self.presets_changed.emit()
self.refresh_from_controller()
- # Re-select the saved preset.
for row in range(self._list.count()):
item = self._list.item(row)
if item is not None and item.data(Qt.ItemDataRole.UserRole) == preset.name:
@@ -262,72 +340,65 @@ def _save_current(self) -> None:
break
def _format_delta_json(self) -> None:
- raw_delta = self._delta.toPlainText().strip() or "{}"
try:
- parsed = json.loads(raw_delta)
+ parsed = json.loads(self._delta.toPlainText().strip() or "{}")
except Exception as exc:
- QMessageBox.critical(self, "Format failed", f"Settings delta must be valid JSON before formatting:\n{exc}")
+ QMessageBox.critical(self, "Format failed", f"Captured settings must be valid JSON:\n{exc}")
return
self._delta.setPlainText(json.dumps(parsed, indent=2, sort_keys=True))
-
- def _insert_example_delta(self) -> None:
- example = {
- "cleanup": {"denoise": 0.2, "artifact_removal": 0.15},
- "detail": {"sharpen_amount": 0.4},
- "export": {"format": "png"},
- }
- self._delta.setPlainText(json.dumps(example, indent=2, sort_keys=True))
+ self._refresh_delta_summary()
def _read_form_as_preset(self) -> PresetModel:
- name = (self._name.text() or "").strip()
+ name = self._name.text().strip()
if not name:
raise ValueError("Preset name cannot be empty")
- desc = (self._desc.text() or "").strip()
- formats = [p.strip() for p in (self._formats.text() or "").split(",") if p.strip()]
- tags = [p.strip() for p in (self._tags.text() or "").split(",") if p.strip()]
-
- raw_delta = self._delta.toPlainText().strip() or "{}"
+ formats = [part.strip() for part in self._formats.text().split(",") if part.strip()]
+ tags = [part.strip() for part in self._tags.text().split(",") if part.strip()]
try:
- delta_obj = json.loads(raw_delta)
+ delta = json.loads(self._delta.toPlainText().strip() or "{}")
except Exception as exc:
- raise ValueError(f"Settings delta must be valid JSON: {exc}") from exc
- if not isinstance(delta_obj, dict):
- raise ValueError("Settings delta JSON must be an object (dict)")
+ raise ValueError(f"Captured settings must be valid JSON: {exc}") from exc
+ if not isinstance(delta, dict):
+ raise ValueError("Captured settings must be a JSON object")
+ if not delta:
+ raise ValueError("No control changes were captured. Adjust a control first or duplicate a system preset.")
- preset = PresetModel(
+ return PresetModel(
name=name,
- description=desc,
+ description=self._desc.text().strip(),
applies_to_formats=formats or ["*"],
applies_to_tags=tags or ["*"],
- settings_delta=delta_obj,
- uses_heavy_tools=bool(self._uses_heavy.isChecked()),
- requires_apply=bool(self._requires_apply.isChecked()),
+ settings_delta=delta,
+ uses_heavy_tools=self._uses_heavy.isChecked(),
+ requires_apply=self._requires_apply.isChecked(),
mode_min=EditMode.ADVANCED,
)
- return preset
def _load_selected_into_form(self) -> None:
selected = self._selected_preset_name()
if not selected:
- self._load_draft_into_form(_PresetDraft())
return
preset = self._controller.get_preset(selected)
- draft = _PresetDraft(
- name=preset.name,
- description=preset.description,
- applies_to_formats=list(preset.applies_to_formats or []),
- applies_to_tags=list(preset.applies_to_tags or []),
- settings_delta_text=json.dumps(preset.settings_delta or {}, indent=2, sort_keys=True),
- uses_heavy_tools=bool(preset.uses_heavy_tools),
- requires_apply=bool(preset.requires_apply),
- mode_min=preset.mode_min.value,
+ self._load_draft_into_form(
+ _PresetDraft(
+ name=preset.name,
+ description=preset.description,
+ applies_to_formats=list(preset.applies_to_formats or []),
+ applies_to_tags=list(preset.applies_to_tags or []),
+ settings_delta_text=json.dumps(preset.settings_delta or {}, indent=2, sort_keys=True),
+ uses_heavy_tools=bool(preset.uses_heavy_tools),
+ requires_apply=bool(preset.requires_apply),
+ )
+ )
+ is_user = self._controller.is_user_preset(selected)
+ self._btn_delete.setEnabled(is_user)
+ self._preset_kind.setText("User preset" if is_user else "System template")
+ self._save_hint.setText(
+ "Saving updates this user preset."
+ if is_user
+ else "Duplicate this template, or capture the active controls to create your own preset."
)
- self._load_draft_into_form(draft)
-
- # Delete button only for user presets.
- self._btn_delete.setEnabled(bool(self._controller.is_user_preset(selected)))
- self._refresh_editor_meta(selected, preset)
def _load_draft_into_form(self, draft: _PresetDraft) -> None:
self._name.setText(draft.name)
@@ -335,32 +406,37 @@ def _load_draft_into_form(self, draft: _PresetDraft) -> None:
self._formats.setText(", ".join(draft.applies_to_formats or []))
self._tags.setText(", ".join(draft.applies_to_tags or []))
self._delta.setPlainText(draft.settings_delta_text or "{}")
- self._uses_heavy.setChecked(bool(draft.uses_heavy_tools))
- self._requires_apply.setChecked(bool(draft.requires_apply))
-
+ self._uses_heavy.setChecked(draft.uses_heavy_tools)
+ self._requires_apply.setChecked(draft.requires_apply)
self._btn_delete.setEnabled(False)
self._preset_kind.setText("New user preset")
self._scope_hint.setText(
- "Formats and tags are comma-separated scopes. Leave them blank for any asset. Examples: png, webp, gif | sprite_sheet, photo, icon, animation."
- )
- self._save_hint.setText(
- "Save creates a user preset. Duplicate a system preset first if you want a safer starting point."
+ "Formats and asset types are filled from the active asset. Advanced users can edit these scopes."
)
+ self._save_hint.setText("Only controls that differ from the detected asset baseline are saved.")
+ self._refresh_delta_summary()
+
+ def _refresh_active_asset_status(self) -> None:
+ asset = self._active_asset()
+ self._btn_capture.setEnabled(asset is not None)
+ if asset is None:
+ self._capture_status.setText("No active asset. Select one in Workspace to capture its control changes.")
+ return
+ self._capture_status.setText(f"Active: {asset.original_name or asset.id}")
- def _refresh_editor_meta(self, preset_name: str, preset: PresetModel) -> None:
- is_user = bool(self._controller.is_user_preset(preset_name))
- scope_parts: list[str] = []
- formats = ", ".join(preset.applies_to_formats or ["*"])
- tags = ", ".join(preset.applies_to_tags or ["*"])
- scope_parts.append(f"Formats: {formats}")
- scope_parts.append(f"Tags: {tags}")
- self._scope_hint.setText(" | ".join(scope_parts))
- if is_user:
- self._preset_kind.setText("User preset")
- self._save_hint.setText("Saving updates this user preset in your local preset library.")
+ def _refresh_delta_summary(self) -> None:
+ try:
+ delta = json.loads(self._delta.toPlainText().strip() or "{}")
+ except Exception:
+ self._capture_status.setText("Advanced settings contain invalid JSON.")
+ return
+ groups = [str(group).replace("_", " ").title() for group in delta if isinstance(delta, dict)]
+ if groups:
+ self._capture_status.setText(f"Captured groups: {', '.join(groups)}")
else:
- self._preset_kind.setText("System template")
- self._save_hint.setText(
- "Saving with the same name creates a user override. Duplicate it first if you want to keep the system preset untouched."
- )
-
+ self._refresh_active_asset_status()
+
+ def _set_advanced_visible(self, visible: bool) -> None:
+ self._advanced_panel.setVisible(bool(visible))
+ self._advanced_toggle.setArrowType(Qt.ArrowType.DownArrow if visible else Qt.ArrowType.RightArrow)
+
diff --git a/pyproject.toml b/pyproject.toml
index 4b682f9..732721e 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -25,3 +25,6 @@ spritefactory-audit = "image_engine_app.app.audit:main"
[tool.setuptools.packages.find]
include = ["image_engine_app*", "image_engine_v3*"]
exclude = ["image_engine_app.tests*"]
+
+[tool.setuptools.package-data]
+image_engine_app = ["assets/icons/*.ico", "assets/icons/*.png", "docs/*.json"]
diff --git a/spritefactory.spec b/spritefactory.spec
index 66761b3..3572669 100644
--- a/spritefactory.spec
+++ b/spritefactory.spec
@@ -31,10 +31,11 @@ datas = []
datas += collect_data_files("image_engine_app", include_py_files=False)
# Bundle runtime icon files so Qt can load them directly in frozen mode.
+icon_source_dir = os.path.join(project_root, "image_engine_app", "assets", "icons")
for icon_name in ("spritefactory_pro.png", "spritefactory_pro.ico", "spritefactory.png", "spritefactory.ico"):
- icon_data = os.path.join(project_root, icon_name)
+ icon_data = os.path.join(icon_source_dir, icon_name)
if os.path.exists(icon_data):
- datas.append((icon_data, "."))
+ datas.append((icon_data, os.path.join("image_engine_app", "assets", "icons")))
# Runtime hook: fixes Qt plugin lookup when running from dist/
rthook = os.path.join(project_root, "pyinstaller_rthooks", "pyside6_plugin_path.py")
@@ -78,7 +79,11 @@ exe_kwargs = dict(
console=False,
)
-icon_file = os.path.join(project_root, "spritefactory_pro.ico")
+icon_file = os.path.join(icon_source_dir, "spritefactory_pro.ico")
+if not os.path.exists(icon_file):
+ icon_file = os.path.join(icon_source_dir, "spritefactory.ico")
+if not os.path.exists(icon_file):
+ icon_file = os.path.join(project_root, "spritefactory_pro.ico")
if not os.path.exists(icon_file):
icon_file = os.path.join(project_root, "spritefactory.ico")
if os.path.exists(icon_file):
diff --git a/spritefactory_onefile.spec b/spritefactory_onefile.spec
index 5401c9b..0126b5a 100644
--- a/spritefactory_onefile.spec
+++ b/spritefactory_onefile.spec
@@ -26,10 +26,11 @@ datas = []
datas += collect_data_files("image_engine_app", include_py_files=False)
# Bundle runtime icon files so Qt can load them directly in frozen mode.
+icon_source_dir = os.path.join(project_root, "image_engine_app", "assets", "icons")
for icon_name in ("spritefactory_pro.png", "spritefactory_pro.ico", "spritefactory.png", "spritefactory.ico"):
- icon_data = os.path.join(project_root, icon_name)
+ icon_data = os.path.join(icon_source_dir, icon_name)
if os.path.exists(icon_data):
- datas.append((icon_data, "."))
+ datas.append((icon_data, os.path.join("image_engine_app", "assets", "icons")))
rthook = os.path.join(project_root, "pyinstaller_rthooks", "pyside6_plugin_path.py")
runtime_hooks = [rthook] if os.path.exists(rthook) else []
@@ -73,7 +74,11 @@ exe_kwargs = dict(
console=False,
)
-icon_file = os.path.join(project_root, "spritefactory_pro.ico")
+icon_file = os.path.join(icon_source_dir, "spritefactory_pro.ico")
+if not os.path.exists(icon_file):
+ icon_file = os.path.join(icon_source_dir, "spritefactory.ico")
+if not os.path.exists(icon_file):
+ icon_file = os.path.join(project_root, "spritefactory_pro.ico")
if not os.path.exists(icon_file):
icon_file = os.path.join(project_root, "spritefactory.ico")
if os.path.exists(icon_file):
"
- "webp"
- ""
- ).encode("utf-8")
- scan = controller.scan_webpage_images(
- "https://example.com/gallery",
- filters=WebpageScanFilters(allowed_extensions={".png", ".webp"}),
- opener=lambda request, timeout=0: _FakeResponse(html, "text/html; charset=utf-8"),
- )
- self.assertEqual({item.url for item in scan.images}, {
- "https://example.com/a.png",
- "https://example.com/c.webp",
- })
- self.assertEqual(len(scan.filtered_out), 1)
-
+
+ def test_user_presets_load_upsert_delete(self) -> None:
+ with tempfile.TemporaryDirectory() as temp_dir:
+ paths = ensure_app_paths(base_dir=temp_dir)
+ store = PresetStore(paths)
+ from image_engine_app.engine.models import PresetModel, EditMode # local import keeps file tidy
+
+ store.save_user_presets(
+ [
+ PresetModel(
+ name="User A",
+ description="demo",
+ settings_delta={"cleanup": {"denoise": 0.12}},
+ uses_heavy_tools=False,
+ requires_apply=False,
+ mode_min=EditMode.ADVANCED,
+ )
+ ]
+ )
+
+ controller = ImageEngineUIController(app_paths=paths)
+ self.assertIn("User A", controller.available_preset_names())
+ self.assertTrue(controller.is_user_preset("User A"))
+
+ # Upsert override and delete.
+ controller.upsert_user_preset(
+ PresetModel(
+ name="User A",
+ description="updated",
+ settings_delta={"detail": {"sharpen_amount": 0.25}},
+ uses_heavy_tools=False,
+ requires_apply=False,
+ mode_min=EditMode.ADVANCED,
+ )
+ )
+ self.assertEqual(controller.get_preset("User A").description, "updated")
+ self.assertTrue(controller.delete_user_preset("User A"))
+ self.assertNotIn("User A", controller.available_preset_names())
+
+ def test_import_local_sources_returns_assets_and_filters_duplicates(self) -> None:
+ controller = ImageEngineUIController()
+ with tempfile.TemporaryDirectory() as temp_dir:
+ root = Path(temp_dir)
+ (root / "a.png").write_bytes(_fake_png(8, 8, payload=b"same"))
+ (root / "b.png").write_bytes(_fake_png(8, 8, payload=b"same"))
+ (root / "c.jpg").write_bytes(_fake_jpg(b"jpg"))
+ (root / "note.txt").write_text("x", encoding="utf-8")
+
+ summary = controller.import_local_sources([root], preserve_structure=False)
+
+ self.assertEqual(len(summary.assets), 2)
+ self.assertEqual(len(summary.duplicates), 1)
+ self.assertEqual(len(summary.unsupported), 1)
+ self.assertEqual({asset.format for asset in summary.assets}, {AssetFormat.PNG, AssetFormat.JPG})
+
+ def test_import_url_source_and_webpage_scan_with_mocked_openers(self) -> None:
+ with tempfile.TemporaryDirectory() as temp_dir:
+ paths = ensure_app_paths(base_dir=temp_dir)
+ controller = ImageEngineUIController(app_paths=paths)
+
+ png_bytes = _fake_png(32, 16, payload=b"hello")
+ url_summary = controller.import_url_source(
+ "https://example.com/sprite.png",
+ opener=lambda request, timeout=0: _FakeResponse(png_bytes, "image/png"),
+ )
+ self.assertEqual(url_summary.asset.source_type, SourceType.URL)
+ self.assertEqual(url_summary.asset.format, AssetFormat.PNG)
+ self.assertEqual(url_summary.asset.dimensions_original, (32, 16))
+ self.assertEqual(url_summary.preview_detected_format, "png")
+ self.assertEqual(url_summary.preview_dimensions, (32, 16))
+ self.assertIsNotNone(url_summary.preview_bytes_sampled)
+ self.assertTrue(Path(url_summary.asset.cache_path).exists())
+
+ html = (
+ ""
+ "
"
- ""
- ).encode("utf-8")
- png_bytes = _fake_png(14, 9, payload=b"page-fallback")
-
- def opener(request, timeout=0): # noqa: ANN001
- _ = timeout
- url = str(getattr(request, "full_url", request))
- if url == "https://example.com/gallery/one":
- return _FakeResponse(page_html, "text/html; charset=utf-8")
- if url == "https://example.com/sprite.png":
- return _FakeResponse(png_bytes, "image/png")
- raise URLError(f"unexpected URL: {url}")
-
- summary = controller.import_url_source(
- "https://example.com/gallery/one",
- opener=opener,
- stream_preview=False,
- allow_webpage_fallback=True,
- )
-
- self.assertEqual(summary.asset.source_uri, "https://example.com/sprite.png")
- self.assertEqual(summary.asset.format, AssetFormat.PNG)
- self.assertEqual(summary.asset.dimensions_original, (14, 9))
- self.assertIn("url_fallback:webpage_first_image", summary.asset.classification_tags)
-
- def test_load_web_sources_registry_sanitizes_missing_ids(self) -> None:
- controller = ImageEngineUIController()
- registry = controller.load_web_sources_registry(
- [
- {
- "name": "Demo Site",
- "areas": [{"label": "Main Area", "url": "https://example.com/gallery"}],
- }
- ]
- )
-
- self.assertEqual(len(registry), 1)
- self.assertEqual(registry[0]["id"], "demo_site")
- self.assertEqual(registry[0]["areas"][0]["id"], "main_area")
-
- def test_scan_web_sources_area_filters_likely_and_detects_zip_links(self) -> None:
- controller = ImageEngineUIController()
- html = (
- ""
- "
"
- "
"
- "ZIP"
- ""
- ).encode("utf-8")
-
- def opener(request, timeout=0): # noqa: ANN001
- _ = (request, timeout)
- return _FakeResponse(html, "text/html; charset=utf-8")
-
- strict = controller.scan_web_sources_area(
- "https://example.com/gallery",
- show_likely=False,
- opener=opener,
- )
- strict_urls = {item.url for item in strict.items}
- self.assertIn("https://cdn.example.com/a.png", strict_urls)
- self.assertIn("https://example.com/pack.zip", strict_urls)
- self.assertNotIn("https://cdn.example.com/image?id=42", strict_urls)
-
- likely = controller.scan_web_sources_area(
- "https://example.com/gallery",
- show_likely=True,
- opener=opener,
- )
- likely_urls = {item.url for item in likely.items}
- self.assertIn("https://cdn.example.com/image?id=42", likely_urls)
-
- def test_scan_web_sources_area_falls_back_to_likely_when_no_direct_links(self) -> None:
- controller = ImageEngineUIController()
- html = "