refactor: add option to deploy to set instance path

Voxelum · Sep 3, 2020 · 582b692 · 582b692
1 parent 3eb438c
commit 582b692
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 9 deletions.
diff --git a/src/main/service/DiagnoseService.ts b/src/main/service/DiagnoseService.ts
@@ -190,7 +190,7 @@ export default class DiagnoseService extends Service {
                         if (!resource) {
                             throw new Error('Cannot find custom skin loader event we try to download it!');
                         }
-                        await this.instanceResourceService.deploy([resource]);
+                        await this.instanceResourceService.deploy({ resources: [resource] });
                     }
                 } else {
                     if (!fabricLoader) {
@@ -207,7 +207,7 @@ export default class DiagnoseService extends Service {
                         if (!resource) {
                             throw new Error('Cannot find custom skin loader event we try to download it!');
                         }
-                        await this.instanceResourceService.deploy([resource]);
+                        await this.instanceResourceService.deploy({ resources: [resource] });
                     }
                 }
             },

diff --git a/src/main/service/InstanceResourceService.ts b/src/main/service/InstanceResourceService.ts
@@ -7,6 +7,14 @@ import { basename, join } from 'path';
 import ResourceService from './ResourceService';
 import Service, { Inject, MutationTrigger, Singleton } from './Service';
 
+export interface DeployOptions {
+    resources: Resource[];
+    /**
+     * The instance path to deploy. This will be the current path by default.
+     */
+    path?: string;
+}
+
 export default class InstanceResourceService extends Service {
     @Inject('ResourceService')
     private resourceService!: ResourceService;
@@ -118,12 +126,12 @@ export default class InstanceResourceService extends Service {
         }
     }
 
-    async deploy(resources: Resource[]) {
+    async deploy({ resources, path = this.state.instance.path }: DeployOptions) {
         let promises: Promise<void>[] = [];
-        this.log(`Deploy ${resources.length} to ${this.state.instance.path}`);
+        this.log(`Deploy ${resources.length} to ${path}`);
         for (let resource of resources) {
-            let path = join(this.state.instance.path, resource.domain, basename(resource.path));
-            promises.push(link(resource.path, path).catch(() => copyFile(resource.path, path)));
+            const resourcePath = join(path, resource.domain, basename(resource.path));
+            promises.push(link(resource.path, resourcePath).catch(() => copyFile(resource.path, resourcePath)));
         }
         await Promise.all(promises);
     }
@@ -135,7 +143,7 @@ export default class InstanceResourceService extends Service {
         const toBeDeploiedPacks = allPacks.filter(p => !deploiedPacks.find((r) => r.hash === p.hash));
         this.log(`Deploying ${toBeDeploiedPacks.length} resource packs`);
 
-        await this.deploy(toBeDeploiedPacks);
+        await this.deploy({ resources: toBeDeploiedPacks });
     }
 
     async undeploy(resources: InstanceResource[]) {

diff --git a/src/renderer/hooks/useInstanceMod.ts b/src/renderer/hooks/useInstanceMod.ts
@@ -156,7 +156,7 @@ export function useInstanceMods() {
         const disabled = items.filter(m => !m.enabled);
 
         return Promise.all([
-            deploy(enabled.map(m => m.resource)),
+            deploy({ resources: enabled.map(m => m.resource) }),
             undeploy(disabled.map(m => m.resource as InstanceResource)),
         ]);
     }

diff --git a/src/renderer/windows/main/hooks/useIssues.ts b/src/renderer/windows/main/hooks/useIssues.ts
@@ -34,7 +34,7 @@ export function useIssueHandler() {
     register('requireFabricAPI', () => {
         let fabric = resources.value.find((r) => r.type === 'fabric' && r.metadata.id === 'fabric');
         if (fabric) {
-            deploy([fabric]);
+            deploy({ resources: [fabric] });
         } else {
             replace('/curseforge/mc-mods/306612');
         }