Add hybrid shared-data source composition

Author: RayJr2

CMakeLists.txt

@@ -101,6 +101,9 @@ qt_add_executable(BrickSuite
     src/services/storage/SessionStorageSelectionService.cpp
     src/services/application/ApplicationServices.h
     src/services/application/ApplicationServices.cpp
+    src/services/application/ApplicationServicesCore.cpp
+    src/services/application/UnavailableApplicationServices.cpp
+    src/services/application/SharedDataSource.h
     src/services/database/AutomaticBackupRetention.h
     src/services/database/AutomaticBackupRetention.cpp
     src/services/Logger.h
@@ -958,9 +961,30 @@ if(BUILD_TESTING)
         src/models/InventoryRecord.h src/models/InventoryRecord.cpp
         src/models/CollectionItem.h src/models/CollectionItem.cpp
         src/services/application/ApplicationServices.h
+        src/services/application/ApplicationServicesCore.cpp
+        src/services/application/UnavailableApplicationServices.cpp
+        src/services/application/SharedDataSource.h
+        src/services/parts/PartReferenceManifest.h src/services/parts/PartReferenceManifest.cpp
+        src/app/WorkspaceContext.h src/app/WorkspaceContext.cpp
     )
     target_link_libraries(ApplicationServiceContractsTest PRIVATE Qt6::Core)
     add_test(NAME ApplicationServiceContracts COMMAND ApplicationServiceContractsTest)
+
+    qt_add_executable(SharedDataSourceSettingsTest EXCLUDE_FROM_ALL
+        tests/SharedDataSourceSettingsTest.cpp
+        src/settings/UserSettings.h src/settings/UserSettings.cpp
+        src/services/application/SharedDataSource.h
+        src/services/CredentialStore.h src/services/CredentialStore.cpp
+        src/services/database/AutomaticBackupPolicy.h
+        src/services/database/AutomaticBackupPolicy.cpp
+    )
+    target_link_libraries(SharedDataSourceSettingsTest PRIVATE Qt6::Core Qt6::Sql)
+    if(WIN32)
+        target_link_libraries(SharedDataSourceSettingsTest PRIVATE Advapi32)
+    elseif(APPLE)
+        target_link_libraries(SharedDataSourceSettingsTest PRIVATE "-framework Security")
+    endif()
+    add_test(NAME SharedDataSourceSettings COMMAND SharedDataSourceSettingsTest)
 endif()
 
 if(WIN32)

resources/help/settings.html

@@ -36,6 +36,16 @@ <h2>General</h2>
 automatically when the application starts. When only one Workspace exists, BrickSuite can select
 it automatically.</p>
 
+<p><b>Shared Data Source</b> controls where workshop data is owned. <b>This Computer</b> uses this
+device for both local reference catalogs and Workspaces, Storage, Inventory, Builds, and Collection.
+<b>BrickSuite Host</b> continues using this device's Rebrickable catalogs, compositions, images, and
+built-in Part Reference while shared workshop data comes from a Host. Changing this setting takes
+effect after restarting BrickSuite; it never copies, merges, or deletes either source's data.</p>
+
+<div class="note"><b>Development status:</b> Host connectivity is not configured in this phase.
+Selecting BrickSuite Host therefore leaves shared workshop views visibly unavailable after restart,
+while local catalog browsing and Rebrickable file imports remain available.</div>
+
 <div class="note"><b>Changing the Default Workspace does not move or combine inventory.</b>
 It changes the Workspace selected by default; each Workspace continues to maintain its own data.</div>
 

src/app/Application.cpp

@@ -28,6 +28,7 @@
 #include "../services/database/AutomaticBackupService.h"
 #include "../services/storage/SessionStorageSelectionService.h"
 #include "../services/application/ApplicationServices.h"
+#include "../settings/UserSettings.h"
 #include "../ui/MainWindow.h"
 
 #include <QDebug>
@@ -80,7 +81,15 @@ bool Application::initialize(const StartupProgress& progress)
     phaseTimer.restart();
     m_workspaceContext = std::make_unique<WorkspaceContext>();
     m_sessionStorageSelectionService = std::make_unique<SessionStorageSelectionService>();
-    m_applicationServices = std::make_unique<ApplicationServices>();
+    const SharedDataSource sharedDataSource = UserSettings::instance().sharedDataSource();
+    m_applicationServices = sharedDataSource == SharedDataSource::ThisComputer
+        ? std::make_unique<ApplicationServices>()
+        : createUnavailableHostApplicationServices();
+    qInfo().noquote() << "Shared data source:"
+                      << (sharedDataSource == SharedDataSource::ThisComputer
+                              ? "This Computer" : "BrickSuite Host");
+    if (!m_applicationServices->sharedStatus().isAvailable())
+        qWarning().noquote() << "BrickSuite Host shared services are unavailable until remote connectivity is configured.";
     qInfo() << "Startup phase application service creation completed in"
             << phaseTimer.elapsed() << "ms.";
 

src/services/application/ApplicationServices.cpp

@@ -77,6 +77,7 @@ class LocalPartReferenceService final : public SharedPartReferenceCustomizationS
                                               int id) const override
     { return PartReferenceCustomizationService(manifest).remove(id); }
 };
+
 }
 
 ApplicationServices::ApplicationServices()
@@ -85,17 +86,3 @@ ApplicationServices::ApplicationServices()
                           std::make_unique<LocalBuildService>(),
                           std::make_unique<LocalCollectionService>(),
                           std::make_unique<LocalPartReferenceService>()) {}
-
-ApplicationServices::ApplicationServices(std::unique_ptr<WorkspaceApplicationService> w,
-    std::unique_ptr<InventoryApplicationService> i, std::unique_ptr<BuildApplicationService> b,
-    std::unique_ptr<CollectionApplicationService> c,
-    std::unique_ptr<SharedPartReferenceCustomizationService> p)
-    : m_workspaces(std::move(w)), m_inventory(std::move(i)), m_builds(std::move(b)),
-      m_collection(std::move(c)), m_partReference(std::move(p)) {}
-
-WorkspaceApplicationService& ApplicationServices::workspaces() const { return *m_workspaces; }
-InventoryApplicationService& ApplicationServices::inventory() const { return *m_inventory; }
-BuildApplicationService& ApplicationServices::builds() const { return *m_builds; }
-CollectionApplicationService& ApplicationServices::collection() const { return *m_collection; }
-SharedPartReferenceCustomizationService& ApplicationServices::partReferenceCustomizations() const
-{ return *m_partReference; }

src/services/application/ApplicationServices.h

@@ -1,5 +1,7 @@
 #pragma once
 
+#include "SharedDataSource.h"
+
 // M26 ownership boundary: catalog/reference services remain local to each
 // device. These contracts cover shared, Host-authoritative application data.
 // The composition root supplies local implementations today and may supply
@@ -25,10 +27,30 @@
 
 class PartReferenceManifest;
 
+enum class ApplicationServiceAvailability
+{
+    AvailableLocal,
+    AvailableRemote,
+    UnavailableNotConnected,
+    UnavailableMaintenance
+};
+
+struct ApplicationServiceStatus
+{
+    ApplicationServiceAvailability availability = ApplicationServiceAvailability::AvailableLocal;
+    QString message;
+    bool isAvailable() const
+    {
+        return availability == ApplicationServiceAvailability::AvailableLocal
+            || availability == ApplicationServiceAvailability::AvailableRemote;
+    }
+};
+
 class WorkspaceApplicationService
 {
 public:
     virtual ~WorkspaceApplicationService() = default;
+    virtual ApplicationServiceStatus status() const { return {}; }
     virtual QList<Workspace> list() const = 0;
     virtual std::optional<Workspace> get(int workspaceId) const = 0;
     virtual bool exists(int workspaceId) const = 0;
@@ -41,6 +63,7 @@ class InventoryApplicationService
 public:
     struct Page { QList<InventorySearchResult> rows; int total = 0; };
     virtual ~InventoryApplicationService() = default;
+    virtual ApplicationServiceStatus status() const { return {}; }
     virtual int count(const InventorySearchCriteria& criteria) const = 0;
     virtual QList<InventorySearchResult> searchRows(
         const InventorySearchCriteria& criteria) const = 0;
@@ -55,6 +78,7 @@ class BuildApplicationService
 {
 public:
     virtual ~BuildApplicationService() = default;
+    virtual ApplicationServiceStatus status() const { return {}; }
     virtual QList<Build> list(int workspaceId, bool includeArchived) const = 0;
     virtual std::optional<Build> get(int buildId) const = 0;
     virtual QList<BuildRequirement> requirements(int buildId) const = 0;
@@ -68,6 +92,7 @@ class CollectionApplicationService
 public:
     struct Page { QList<CollectionSearchResult> rows; int total = 0; };
     virtual ~CollectionApplicationService() = default;
+    virtual ApplicationServiceStatus status() const { return {}; }
     virtual int count(const CollectionSearchCriteria& criteria) const = 0;
     virtual QList<CollectionSearchResult> searchRows(
         const CollectionSearchCriteria& criteria) const = 0;
@@ -80,6 +105,7 @@ class SharedPartReferenceCustomizationService
 {
 public:
     virtual ~SharedPartReferenceCustomizationService() = default;
+    virtual ApplicationServiceStatus status() const { return {}; }
     virtual QList<PartReferenceEntry> effectiveEntries(
         const PartReferenceManifest& manifest, QString* errorMessage) const = 0;
     virtual PartReferenceCustomizationResult add(
@@ -98,18 +124,24 @@ class ApplicationServices
                         std::unique_ptr<InventoryApplicationService> inventory,
                         std::unique_ptr<BuildApplicationService> builds,
                         std::unique_ptr<CollectionApplicationService> collection,
-                        std::unique_ptr<SharedPartReferenceCustomizationService> partReference);
+                        std::unique_ptr<SharedPartReferenceCustomizationService> partReference,
+                        SharedDataSource source = SharedDataSource::ThisComputer);
 
     WorkspaceApplicationService& workspaces() const;
     InventoryApplicationService& inventory() const;
     BuildApplicationService& builds() const;
     CollectionApplicationService& collection() const;
     SharedPartReferenceCustomizationService& partReferenceCustomizations() const;
+    SharedDataSource sharedDataSource() const;
+    ApplicationServiceStatus sharedStatus() const;
 
 private:
     std::unique_ptr<WorkspaceApplicationService> m_workspaces;
     std::unique_ptr<InventoryApplicationService> m_inventory;
     std::unique_ptr<BuildApplicationService> m_builds;
     std::unique_ptr<CollectionApplicationService> m_collection;
     std::unique_ptr<SharedPartReferenceCustomizationService> m_partReference;
+    SharedDataSource m_source = SharedDataSource::ThisComputer;
 };
+
+std::unique_ptr<ApplicationServices> createUnavailableHostApplicationServices();

src/services/application/ApplicationServicesCore.cpp

@@ -0,0 +1,17 @@
+#include "ApplicationServices.h"
+
+ApplicationServices::ApplicationServices(std::unique_ptr<WorkspaceApplicationService> w,
+    std::unique_ptr<InventoryApplicationService> i, std::unique_ptr<BuildApplicationService> b,
+    std::unique_ptr<CollectionApplicationService> c,
+    std::unique_ptr<SharedPartReferenceCustomizationService> p, SharedDataSource source)
+    : m_workspaces(std::move(w)), m_inventory(std::move(i)), m_builds(std::move(b)),
+      m_collection(std::move(c)), m_partReference(std::move(p)), m_source(source) {}
+
+WorkspaceApplicationService& ApplicationServices::workspaces() const { return *m_workspaces; }
+InventoryApplicationService& ApplicationServices::inventory() const { return *m_inventory; }
+BuildApplicationService& ApplicationServices::builds() const { return *m_builds; }
+CollectionApplicationService& ApplicationServices::collection() const { return *m_collection; }
+SharedPartReferenceCustomizationService& ApplicationServices::partReferenceCustomizations() const
+{ return *m_partReference; }
+SharedDataSource ApplicationServices::sharedDataSource() const { return m_source; }
+ApplicationServiceStatus ApplicationServices::sharedStatus() const { return m_workspaces->status(); }

src/services/application/SharedDataSource.h

@@ -0,0 +1,9 @@
+#pragma once
+
+// Stable device-local composition choice. Keep serialized spellings in
+// UserSettings; this enum is shared by startup composition and presentation.
+enum class SharedDataSource
+{
+    ThisComputer,
+    BrickSuiteHost
+};

src/services/application/UnavailableApplicationServices.cpp

@@ -0,0 +1,51 @@
+#include "ApplicationServices.h"
+
+#include "../parts/PartReferenceManifest.h"
+
+namespace {
+const QString kHostUnavailable = QStringLiteral("BrickSuite Host shared data is not connected.");
+ApplicationServiceStatus unavailable()
+{ return {ApplicationServiceAvailability::UnavailableNotConnected, kHostUnavailable}; }
+
+class Workspaces final : public WorkspaceApplicationService {
+public:
+    ApplicationServiceStatus status() const override{return unavailable();}
+    QList<Workspace> list() const override{return {};} std::optional<Workspace> get(int) const override{return {};}
+    bool exists(int) const override{return false;} bool create(Workspace&) const override{return false;} bool update(Workspace&) const override{return false;}
+};
+class Inventory final : public InventoryApplicationService {
+public:
+    ApplicationServiceStatus status() const override{return unavailable();}
+    int count(const InventorySearchCriteria&) const override{return 0;} QList<InventorySearchResult> searchRows(const InventorySearchCriteria&) const override{return {};}
+    std::optional<InventoryRecord> get(int) const override{return {};} QList<InventoryHistoryResult> history(int,int,int) const override{return {};}
+};
+class Builds final : public BuildApplicationService {
+public:
+    ApplicationServiceStatus status() const override{return unavailable();}
+    QList<Build> list(int,bool) const override{return {};} std::optional<Build> get(int) const override{return {};}
+    QList<BuildRequirement> requirements(int) const override{return {};} QList<MissingPartsService::MissingPart> missingParts(int,int) const override{return {};}
+    BuildPullingService::PullingView pullingView(int) const override{BuildPullingService::PullingView r;r.message=kHostUnavailable;return r;}
+};
+class Collection final : public CollectionApplicationService {
+public:
+    ApplicationServiceStatus status() const override{return unavailable();}
+    int count(const CollectionSearchCriteria&) const override{return 0;} QList<CollectionSearchResult> searchRows(const CollectionSearchCriteria&) const override{return {};}
+    std::optional<CollectionSearchResult> getDisplay(int) const override{return {};}
+};
+class PartReference final : public SharedPartReferenceCustomizationService {
+public:
+    ApplicationServiceStatus status() const override{return unavailable();}
+    QList<PartReferenceEntry> effectiveEntries(const PartReferenceManifest& manifest,QString* error) const override
+    {if(error)*error=kHostUnavailable+QStringLiteral(" Built-in Part Reference entries remain available; shared customizations are unavailable.");return manifest.entries();}
+    PartReferenceCustomizationResult add(const PartReferenceManifest&,const QString&,const QString&,const QString&,PartReferencePlacement,const QString&) const override{return {false,kHostUnavailable,0};}
+    PartReferenceCustomizationResult remove(const PartReferenceManifest&,int) const override{return {false,kHostUnavailable,0};}
+};
+}
+
+std::unique_ptr<ApplicationServices> createUnavailableHostApplicationServices()
+{
+    return std::make_unique<ApplicationServices>(std::make_unique<Workspaces>(),
+        std::make_unique<Inventory>(),std::make_unique<Builds>(),
+        std::make_unique<Collection>(),std::make_unique<PartReference>(),
+        SharedDataSource::BrickSuiteHost);
+}

src/settings/UserSettings.cpp

@@ -40,6 +40,7 @@ constexpr auto kThemeKey = "Theme";
 constexpr auto kResultsPerPageKey = "ResultsPerPage";
 
 constexpr auto kDefaultWorkspaceIdKey = "DefaultWorkspaceId";
+constexpr auto kSharedDataSourceKey = "SharedDataSource";
 
 constexpr auto kRebrickableApiKey = "ApiKey";
 constexpr auto kRebrickableConnectionPreviouslyVerifiedKey = "ConnectionPreviouslyVerified";
@@ -124,6 +125,34 @@ void UserSettings::setTheme(Theme theme)
     settings.endGroup();
 }
 
+SharedDataSource UserSettings::sharedDataSource() const
+{
+    QSettings settings;
+    settings.beginGroup(kGroupGeneral);
+    const QString value = settings.value(kSharedDataSourceKey, "this-computer").toString();
+    settings.endGroup();
+    if (value.compare("this-computer", Qt::CaseInsensitive) == 0)
+        return SharedDataSource::ThisComputer;
+    if (value.compare("bricksuite-host", Qt::CaseInsensitive) == 0)
+        return SharedDataSource::BrickSuiteHost;
+    qWarning() << "Unknown Shared Data Source setting; using This Computer:" << value;
+    return SharedDataSource::ThisComputer;
+}
+
+void UserSettings::setSharedDataSource(SharedDataSource source)
+{
+    QSettings settings;
+    settings.beginGroup(kGroupGeneral);
+    settings.setValue(kSharedDataSourceKey, sharedDataSourceToString(source));
+    settings.endGroup();
+}
+
+QString UserSettings::sharedDataSourceToString(SharedDataSource source)
+{
+    return source == SharedDataSource::BrickSuiteHost
+        ? QStringLiteral("bricksuite-host") : QStringLiteral("this-computer");
+}
+
 int UserSettings::resultsPerPage() const
 {
     QSettings settings;

src/settings/UserSettings.h

@@ -24,6 +24,8 @@
 #include <QDateTime>
 #include <QString>
 
+#include "../services/application/SharedDataSource.h"
+
 class UserSettings
 {
 public:
@@ -34,6 +36,10 @@ class UserSettings
     Theme theme() const;
     void setTheme(Theme theme);
 
+    SharedDataSource sharedDataSource() const;
+    void setSharedDataSource(SharedDataSource source);
+    static QString sharedDataSourceToString(SharedDataSource source);
+
     int resultsPerPage() const;
     void setResultsPerPage(int resultsPerPage);