Skip to content

Simplified provider assignments #2116

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ebkr wants to merge 1 commit into
base: develop
Choose a base branch
from
+68 −64
Open

Simplified provider assignments #2116

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions quasar.config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ export default defineConfig((ctx) => {
// --> boot files are part of "main.js"
// https://v2.quasar.dev/quasar-cli-vite/boot-files
boot: [
'providers',
'i18n',
// 'axios',
'floating-vue'
Expand Down
52 changes: 1 addition & 51 deletions src/App.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,53 +16,25 @@
<script lang="ts" setup>
import 'bulma-steps/dist/js/bulma-steps.min.js';
import ManagerSettings from './r2mm/manager/ManagerSettings';
import ProfileProvider from './providers/ror2/model_implementation/ProfileProvider';
import ProfileImpl from './r2mm/model_implementation/ProfileImpl';
import LogOutput from './r2mm/data/LogOutput';
import LogOutputProvider from './providers/ror2/data/LogOutputProvider';
import ThunderstoreDownloaderProvider from './providers/ror2/downloading/ThunderstoreDownloaderProvider';
import BetterThunderstoreDownloader from './r2mm/downloading/BetterThunderstoreDownloader';
import PathResolver from './r2mm/manager/PathResolver';
import path from './providers/node/path/path';
import ThemeManager from './r2mm/manager/ThemeManager';
import 'bulma-switch/dist/css/bulma-switch.min.css';
import LoggerProvider, { LogSeverity } from './providers/ror2/logging/LoggerProvider';
import ManagerInformation from './_managerinf/ManagerInformation';
import LocalModInstallerProvider from './providers/ror2/installing/LocalModInstallerProvider';
import LocalModInstaller from './r2mm/installing/LocalModInstaller';
import { Logger } from './r2mm/logging/Logger';
import InstallationRules from './r2mm/installing/InstallationRules';
import FileUtils from './utils/FileUtils';
import LinkProvider from './providers/components/LinkProvider';
import LinkImpl from './r2mm/component_override/LinkImpl';
import FsProvider from './providers/generic/file/FsProvider';
import { DataFolderProvider } from './providers/ror2/system/DataFolderProvider';
import { DataFolderProviderImpl } from './r2mm/system/DataFolderProviderImpl';
import InteractionProvider from './providers/ror2/system/InteractionProvider';
import InteractionProviderImpl from './r2mm/system/InteractionProviderImpl';
import ZipProvider from './providers/generic/zip/ZipProvider';
import AdmZipProvider from './providers/generic/zip/AdmZipProvider';
import ManagerSettingsMigration from './r2mm/manager/ManagerSettingsMigration';
import BindLoaderImpl from './providers/components/loaders/bind_impls/BindLoaderImpl';
import PlatformInterceptorProvider from './providers/generic/game/platform_interceptor/PlatformInterceptorProvider';
import PlatformInterceptorImpl from './providers/generic/game/platform_interceptor/PlatformInterceptorImpl';
import ProfileInstallerProvider from './providers/ror2/installing/ProfileInstallerProvider';
import InstallationRules from './r2mm/installing/InstallationRules';
import GenericProfileInstaller from './r2mm/installing/profile_installers/GenericProfileInstaller';
import ErrorModal from './components/modals/ErrorModal.vue';
import { provideStoreImplementation } from './providers/generic/store/StoreProvider';
import baseStore from './store';
import { onMounted, ref, watchEffect } from 'vue';
import { useUtilityComposable } from './components/composables/UtilityComposable';
import { useQuasar } from 'quasar';
import { NodeFsImplementation } from './providers/node/fs/NodeFsImplementation';
import { useRouter } from 'vue-router';
import { ProtocolProviderImplementation } from './providers/generic/protocol/ProtocolProviderImplementation';
import { provideProtocolImplementation } from './providers/generic/protocol/ProtocolProvider';
import BreadcrumbNavigator from 'components/breadcrumbs/BreadcrumbNavigator.vue';

const store = baseStore;
const router = useRouter();
provideStoreImplementation(() => store);

const quasar = useQuasar();

Expand All @@ -82,28 +54,6 @@ const {

const visible = ref<boolean>(false);

FsProvider.provide(() => NodeFsImplementation);

ProfileProvider.provide(() => new ProfileImpl());
LogOutputProvider.provide(() => LogOutput.getSingleton());

const betterThunderstoreDownloader = new BetterThunderstoreDownloader();
ThunderstoreDownloaderProvider.provide(() => betterThunderstoreDownloader);

ZipProvider.provide(() => new AdmZipProvider());
LocalModInstallerProvider.provide(() => new LocalModInstaller());
ProfileInstallerProvider.provide(() => new GenericProfileInstaller());
LoggerProvider.provide(() => new Logger());
LinkProvider.provide(() => new LinkImpl());
InteractionProvider.provide(() => new InteractionProviderImpl());
DataFolderProvider.provide(() => new DataFolderProviderImpl());

PlatformInterceptorProvider.provide(() => new PlatformInterceptorImpl());

provideProtocolImplementation(() => ProtocolProviderImplementation)

BindLoaderImpl.bind();

onMounted(async () => {
const settings: ManagerSettings = await store.dispatch('resetActiveGame');

Expand Down
13 changes: 0 additions & 13 deletions src/AppWrapper.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,19 +9,6 @@ import App from "./App.vue";
import SettingsLoader from "./components/SettingsLoader.vue";
import R2Error from "./model/errors/R2Error";
import LinkProvider from './providers/components/LinkProvider';
import { providePathImplementation } from './providers/node/path/path';
import { NodePathImplementation } from './providers/node/path/NodePathImplementation';
import { provideChildProcessImplementation } from './providers/node/child_process/child_process';
import { NodeChildProcessImplementation } from './providers/node/child_process/ChildProcessImplementation';
import {provideOsImplementation} from "./providers/node/os/os";
import {NodeOsImplementation} from "./providers/node/os/NodeOsImplementation";
import { provideBufferImplementation } from './providers/node/buffer/buffer';
import { NodeBufferImplementation } from './providers/node/buffer/BufferImplementation';

providePathImplementation(() => NodePathImplementation);
provideChildProcessImplementation(() => NodeChildProcessImplementation);
provideOsImplementation(() => NodeOsImplementation);
provideBufferImplementation(() => NodeBufferImplementation);

function logError(error: R2Error) {
console.error(error.name, error.message, error.stack);
Expand Down
66 changes: 66 additions & 0 deletions src/boot/providers.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,66 @@
import { defineBoot } from '#q-app/wrappers';
import { NodePathImplementation } from '../providers/node/path/NodePathImplementation';
import { providePathImplementation } from '../providers/node/path/path';
import { NodeChildProcessImplementation } from '../providers/node/child_process/ChildProcessImplementation';
import { provideChildProcessImplementation } from '../providers/node/child_process/child_process';
import { NodeOsImplementation } from '../providers/node/os/NodeOsImplementation';
import { provideOsImplementation } from '../providers/node/os/os';
import { NodeBufferImplementation } from '../providers/node/buffer/BufferImplementation';
import { provideBufferImplementation } from '../providers/node/buffer/buffer';
import { provideStoreImplementation } from '../providers/generic/store/StoreProvider';
import baseStore from '../store';
import FsProvider from '../providers/generic/file/FsProvider';
import { NodeFsImplementation } from '../providers/node/fs/NodeFsImplementation';
import ProfileProvider from '../providers/ror2/model_implementation/ProfileProvider';
import ProfileImpl from '../r2mm/model_implementation/ProfileImpl';
import LogOutput from '../r2mm/data/LogOutput';
import LogOutputProvider from '../providers/ror2/data/LogOutputProvider';
import ThunderstoreDownloaderProvider from '../providers/ror2/downloading/ThunderstoreDownloaderProvider';
import BetterThunderstoreDownloader from '../r2mm/downloading/BetterThunderstoreDownloader';
import ZipProvider from '../providers/generic/zip/ZipProvider';
import AdmZipProvider from '../providers/generic/zip/AdmZipProvider';
import LocalModInstallerProvider from '../providers/ror2/installing/LocalModInstallerProvider';
import LocalModInstaller from '../r2mm/installing/LocalModInstaller';
import ProfileInstallerProvider from '../providers/ror2/installing/ProfileInstallerProvider';
import GenericProfileInstaller from '../r2mm/installing/profile_installers/GenericProfileInstaller';
import LoggerProvider from '../providers/ror2/logging/LoggerProvider';
import { Logger } from '../r2mm/logging/Logger';
import LinkProvider from '../providers/components/LinkProvider';
import LinkImpl from '../r2mm/component_override/LinkImpl';
import InteractionProvider from '../providers/ror2/system/InteractionProvider';
import InteractionProviderImpl from '../r2mm/system/InteractionProviderImpl';
import { DataFolderProvider } from '../providers/ror2/system/DataFolderProvider';
import { DataFolderProviderImpl } from '../r2mm/system/DataFolderProviderImpl';
import PlatformInterceptorProvider from '../providers/generic/game/platform_interceptor/PlatformInterceptorProvider';
import PlatformInterceptorImpl from '../providers/generic/game/platform_interceptor/PlatformInterceptorImpl';
import { provideProtocolImplementation } from '../providers/generic/protocol/ProtocolProvider';
import { ProtocolProviderImplementation } from '../providers/generic/protocol/ProtocolProviderImplementation';
import BindLoaderImpl from '../providers/components/loaders/bind_impls/BindLoaderImpl';

export default defineBoot(() => {
providePathImplementation(() => NodePathImplementation);
provideChildProcessImplementation(() => NodeChildProcessImplementation);
provideOsImplementation(() => NodeOsImplementation);
provideBufferImplementation(() => NodeBufferImplementation);
provideStoreImplementation(() => baseStore);
FsProvider.provide(() => NodeFsImplementation);
ProfileProvider.provide(() => new ProfileImpl());
LogOutputProvider.provide(() => LogOutput.getSingleton());
provideThunderstoreDownloadImplementation();
ZipProvider.provide(() => new AdmZipProvider());
LocalModInstallerProvider.provide(() => new LocalModInstaller());
ProfileInstallerProvider.provide(() => new GenericProfileInstaller());
LoggerProvider.provide(() => new Logger());
LinkProvider.provide(() => new LinkImpl());
InteractionProvider.provide(() => new InteractionProviderImpl());
DataFolderProvider.provide(() => new DataFolderProviderImpl());
PlatformInterceptorProvider.provide(() => new PlatformInterceptorImpl());
provideProtocolImplementation(() => ProtocolProviderImplementation);

BindLoaderImpl.bind();
});

function provideThunderstoreDownloadImplementation() {
const betterThunderstoreDownloader = new BetterThunderstoreDownloader();
ThunderstoreDownloaderProvider.provide(() => betterThunderstoreDownloader);
}
Loading