♻️ Merge discstore folder into jukebox

discstore/adapters/inbound/api/current_tag_router.py → jukebox/adapters/inbound/admin/api/current_tag_router.py

@@ -1,21 +1,21 @@
 from typing import Any
 
 from fastapi import APIRouter, HTTPException, Response, status
 from pydantic import ValidationError
 
-from discstore.adapters.inbound.api.models import (
+from jukebox.adapters.inbound.admin.api.models import (
     CurrentTagDiscOutput,
     CurrentTagStatusOutput,
     DiscInput,
     DiscOutput,
     DiscPatchInput,
 )
-from discstore.domain.entities import CurrentTagStatus, Disc, DiscMetadata, DiscOption
-from discstore.domain.use_cases.add_disc import AddDisc
-from discstore.domain.use_cases.edit_disc import EditDisc
-from discstore.domain.use_cases.get_current_tag_status import GetCurrentTagStatus
-from discstore.domain.use_cases.get_disc import GetDisc
-from discstore.domain.use_cases.remove_disc import RemoveDisc
+from jukebox.domain.entities import CurrentTagStatus, Disc, DiscMetadata, DiscOption
+from jukebox.domain.use_cases.library.add_disc import AddDisc
+from jukebox.domain.use_cases.library.edit_disc import EditDisc
+from jukebox.domain.use_cases.library.get_current_tag_status import GetCurrentTagStatus
+from jukebox.domain.use_cases.library.get_disc import GetDisc
+from jukebox.domain.use_cases.library.remove_disc import RemoveDisc
 
 
 def build_current_tag_router(

discstore/adapters/inbound/api/discs_router.py → jukebox/adapters/inbound/admin/api/discs_router.py

@@ -1,13 +1,13 @@
 from fastapi import APIRouter, HTTPException, Response, status
 from pydantic import ValidationError
 
-from discstore.adapters.inbound.api.models import DiscInput, DiscOutput, DiscPatchInput
-from discstore.domain.entities import Disc, DiscMetadata, DiscOption
-from discstore.domain.use_cases.add_disc import AddDisc
-from discstore.domain.use_cases.edit_disc import EditDisc
-from discstore.domain.use_cases.get_disc import GetDisc
-from discstore.domain.use_cases.list_discs import ListDiscs
-from discstore.domain.use_cases.remove_disc import RemoveDisc
+from jukebox.adapters.inbound.admin.api.models import DiscInput, DiscOutput, DiscPatchInput
+from jukebox.domain.entities import Disc, DiscMetadata, DiscOption
+from jukebox.domain.use_cases.library.add_disc import AddDisc
+from jukebox.domain.use_cases.library.edit_disc import EditDisc
+from jukebox.domain.use_cases.library.get_disc import GetDisc
+from jukebox.domain.use_cases.library.list_discs import ListDiscs
+from jukebox.domain.use_cases.library.remove_disc import RemoveDisc
 
 
 def build_discs_router(

discstore/adapters/inbound/api/models.py → jukebox/adapters/inbound/admin/api/models.py

@@ -2,7 +2,7 @@
 
 from pydantic import BaseModel, RootModel
 
-from discstore.domain.entities import CurrentTagStatus, Disc
+from jukebox.domain.entities import CurrentTagStatus, Disc
 
 
 class DiscInput(Disc):

discstore/adapters/inbound/api/settings_router.py → jukebox/adapters/inbound/admin/api/settings_router.py

@@ -1,8 +1,8 @@
 from typing import Any, cast
 
 from fastapi import APIRouter, HTTPException
 
-from discstore.adapters.inbound.api.models import SettingsPatchInput, SettingsResetInput
+from jukebox.adapters.inbound.admin.api.models import SettingsPatchInput, SettingsResetInput
 from jukebox.settings.errors import SettingsError
 from jukebox.settings.service_protocols import SettingsService
 from jukebox.settings.types import JsonObject

discstore/adapters/inbound/api_controller.py → jukebox/adapters/inbound/admin/api_controller.py

@@ -3,11 +3,11 @@
 from jukebox.shared.dependency_messages import optional_extra_dependency_message
 
 try:
     from fastapi import FastAPI, HTTPException
 
-    from discstore.adapters.inbound.api.current_tag_router import build_current_tag_router
-    from discstore.adapters.inbound.api.discs_router import build_discs_router
-    from discstore.adapters.inbound.api.models import (
+    from jukebox.adapters.inbound.admin.api.current_tag_router import build_current_tag_router
+    from jukebox.adapters.inbound.admin.api.discs_router import build_discs_router
+    from jukebox.adapters.inbound.admin.api.models import (
         CurrentTagDiscOutput,
         CurrentTagStatusOutput,
         DiscInput,
@@ -16,19 +16,19 @@
         SettingsPatchInput,
         SettingsResetInput,
     )
-    from discstore.adapters.inbound.api.settings_router import build_settings_router
+    from jukebox.adapters.inbound.admin.api.settings_router import build_settings_router
 except ModuleNotFoundError as e:
     if e.name != "fastapi":
         raise
     raise ModuleNotFoundError(
         optional_extra_dependency_message("The `api_controller` module", "api", "jukebox-admin api")
     ) from e
-from discstore.domain.use_cases.add_disc import AddDisc
-from discstore.domain.use_cases.edit_disc import EditDisc
-from discstore.domain.use_cases.get_current_tag_status import GetCurrentTagStatus
-from discstore.domain.use_cases.get_disc import GetDisc
-from discstore.domain.use_cases.list_discs import ListDiscs
-from discstore.domain.use_cases.remove_disc import RemoveDisc
+from jukebox.domain.use_cases.library.add_disc import AddDisc
+from jukebox.domain.use_cases.library.edit_disc import EditDisc
+from jukebox.domain.use_cases.library.get_current_tag_status import GetCurrentTagStatus
+from jukebox.domain.use_cases.library.get_disc import GetDisc
+from jukebox.domain.use_cases.library.list_discs import ListDiscs
+from jukebox.domain.use_cases.library.remove_disc import RemoveDisc
 from jukebox.settings.entities import SelectedSonosGroupSettings
 from jukebox.settings.selected_sonos_group_repository import SettingsSelectedSonosGroupRepository
 from jukebox.settings.service_protocols import SettingsService

discstore/adapters/inbound/cli_controller.py → jukebox/adapters/inbound/admin/cli_controller.py

@@ -1,22 +1,22 @@
 import logging
 
-from discstore.adapters.inbound.cli_display import display_library_line, display_library_table
-from discstore.commands import (
+from jukebox.adapters.inbound.admin.cli_display import display_library_line, display_library_table
+from jukebox.admin.library_commands import (
     CliAddCommand,
     CliEditCommand,
     CliGetCommand,
     CliListCommand,
     CliRemoveCommand,
     CliSearchCommand,
 )
-from discstore.domain.entities import Disc, DiscMetadata, DiscOption
-from discstore.domain.use_cases.add_disc import AddDisc
-from discstore.domain.use_cases.edit_disc import EditDisc
-from discstore.domain.use_cases.get_disc import GetDisc
-from discstore.domain.use_cases.list_discs import ListDiscs
-from discstore.domain.use_cases.remove_disc import RemoveDisc
-from discstore.domain.use_cases.resolve_tag_id import ResolveTagId
-from discstore.domain.use_cases.search_discs import SearchDiscs
+from jukebox.domain.entities import Disc, DiscMetadata, DiscOption
+from jukebox.domain.use_cases.library.add_disc import AddDisc
+from jukebox.domain.use_cases.library.edit_disc import EditDisc
+from jukebox.domain.use_cases.library.get_disc import GetDisc
+from jukebox.domain.use_cases.library.list_discs import ListDiscs
+from jukebox.domain.use_cases.library.remove_disc import RemoveDisc
+from jukebox.domain.use_cases.library.resolve_tag_id import ResolveTagId
+from jukebox.domain.use_cases.library.search_discs import SearchDiscs
 
 LOGGER = logging.getLogger("discstore")
 

discstore/adapters/inbound/cli_display.py → jukebox/adapters/inbound/admin/cli_display.py

@@ -1,4 +1,4 @@
-from discstore.domain.entities import Disc
+from jukebox.domain.entities import Disc
 
 MAX_COL_WIDTH = 20
 

discstore/adapters/inbound/interactive_cli_controller.py → jukebox/adapters/inbound/admin/interactive_cli_controller.py

@@ -1,12 +1,12 @@
 import logging
 
-from discstore.adapters.inbound.cli_display import display_library_line, display_library_table
-from discstore.domain.entities import CurrentTagStatus, Disc, DiscMetadata, DiscOption
-from discstore.domain.use_cases.add_disc import AddDisc
-from discstore.domain.use_cases.edit_disc import EditDisc
-from discstore.domain.use_cases.get_current_tag_status import GetCurrentTagStatus
-from discstore.domain.use_cases.list_discs import ListDiscs
-from discstore.domain.use_cases.remove_disc import RemoveDisc
+from jukebox.adapters.inbound.admin.cli_display import display_library_line, display_library_table
+from jukebox.domain.entities import CurrentTagStatus, Disc, DiscMetadata, DiscOption
+from jukebox.domain.use_cases.library.add_disc import AddDisc
+from jukebox.domain.use_cases.library.edit_disc import EditDisc
+from jukebox.domain.use_cases.library.get_current_tag_status import GetCurrentTagStatus
+from jukebox.domain.use_cases.library.list_discs import ListDiscs
+from jukebox.domain.use_cases.library.remove_disc import RemoveDisc
 
 LOGGER = logging.getLogger("discstore")
 

discstore/adapters/inbound/ui_controller.py → jukebox/adapters/inbound/admin/ui_controller.py

@@ -4,12 +4,12 @@
 from jukebox.shared.dependency_messages import optional_extra_dependency_message
 
 try:
     from fastapi import HTTPException, Request
     from fastapi.responses import HTMLResponse, StreamingResponse
     from fastui import AnyComponent, FastUI, prebuilt_html
     from fastui import components as c
     from fastui.events import GoToEvent
     from fastui.forms import fastui_form
 except ModuleNotFoundError as e:
     raise ModuleNotFoundError(
         optional_extra_dependency_message("The `ui_controller` module", "ui", "jukebox-admin ui")
@@ -17,17 +17,17 @@
 
 from pydantic import BaseModel, Field
 
-from discstore.adapters.inbound.api_controller import APIController
-from discstore.adapters.inbound.ui_pages.library import DiscForm, DiscTable, LibraryUIPageBuilder
-from discstore.adapters.inbound.ui_pages.settings import SettingsUIPageBuilder
-from discstore.adapters.inbound.ui_pages.sonos import SonosSelectionForm, SonosUIPageBuilder
-from discstore.domain.entities import CurrentTagStatus, Disc, DiscMetadata, DiscOption
-from discstore.domain.use_cases.add_disc import AddDisc
-from discstore.domain.use_cases.edit_disc import EditDisc
-from discstore.domain.use_cases.get_current_tag_status import GetCurrentTagStatus
-from discstore.domain.use_cases.get_disc import GetDisc
-from discstore.domain.use_cases.list_discs import ListDiscs
-from discstore.domain.use_cases.remove_disc import RemoveDisc
+from jukebox.adapters.inbound.admin.api_controller import APIController
+from jukebox.adapters.inbound.admin.ui_pages.library import DiscForm, DiscTable, LibraryUIPageBuilder
+from jukebox.adapters.inbound.admin.ui_pages.settings import SettingsUIPageBuilder
+from jukebox.adapters.inbound.admin.ui_pages.sonos import SonosSelectionForm, SonosUIPageBuilder
+from jukebox.domain.entities import CurrentTagStatus, Disc, DiscMetadata, DiscOption
+from jukebox.domain.use_cases.library.add_disc import AddDisc
+from jukebox.domain.use_cases.library.edit_disc import EditDisc
+from jukebox.domain.use_cases.library.get_current_tag_status import GetCurrentTagStatus
+from jukebox.domain.use_cases.library.get_disc import GetDisc
+from jukebox.domain.use_cases.library.list_discs import ListDiscs
+from jukebox.domain.use_cases.library.remove_disc import RemoveDisc
 from jukebox.settings.definitions import (
     EditableSettingDisplay,
     get_setting_definition,

discstore/adapters/inbound/ui_pages/library.py → jukebox/adapters/inbound/admin/ui_pages/library.py

@@ -8,10 +8,10 @@
 from fastui.events import BackEvent, GoToEvent, PageEvent
 from pydantic import BaseModel, Field
 
-from discstore.domain.entities import CurrentTagStatus, DiscMetadata, DiscOption
-from discstore.domain.use_cases.get_current_tag_status import GetCurrentTagStatus
-from discstore.domain.use_cases.get_disc import GetDisc
-from discstore.domain.use_cases.list_discs import ListDiscs
+from jukebox.domain.entities import CurrentTagStatus, DiscMetadata, DiscOption
+from jukebox.domain.use_cases.library.get_current_tag_status import GetCurrentTagStatus
+from jukebox.domain.use_cases.library.get_disc import GetDisc
+from jukebox.domain.use_cases.library.list_discs import ListDiscs
 
 
 class DiscTable(DiscMetadata, DiscOption):

jukebox/admin/app.py

@@ -5,8 +5,8 @@
 import typer
 from pydantic import ValidationError
 
-from discstore.command_handlers import execute_library_command
-from discstore.commands import (
+from jukebox.admin.library_command_handlers import execute_library_command
+from jukebox.admin.library_commands import (
     CliAddCommand,
     CliEditCommand,
     CliGetCommand,
@@ -16,7 +16,6 @@
     CliSearchCommand,
     InteractiveCliCommand,
 )
-from discstore.di_container import build_cli_controller, build_interactive_cli_controller
 from jukebox.settings.errors import SettingsError
 from jukebox.shared.config_utils import get_package_version
 from jukebox.shared.logger import set_logger
@@ -41,7 +40,14 @@
     is_settings_command,
     is_sonos_command,
 )
-from .di_container import build_admin_api_app, build_admin_services, build_admin_ui_app, build_settings_service
+from .di_container import (
+    build_admin_api_app,
+    build_admin_services,
+    build_admin_ui_app,
+    build_cli_controller,
+    build_interactive_cli_controller,
+    build_settings_service,
+)
 from .pn532_command_handlers import execute_pn532_command
 from .pn532_commands import Pn532ProbeCommand, Pn532ProfilesCommand, Pn532SelectCommand, is_pn532_command
 from .sonos_households import GroupedSonosHousehold