[CP-3909][App Refactor][Kompakt] Manage Files - export (download) (#2746)

Author: dkarski

apps/app/electron-builder.yml

@@ -19,6 +19,9 @@ win:
   icon: ./resources/icons/icon.ico
   target:
     - nsis
+  extraFiles:
+    - from: ./resources/MtpFileTransfer.exe
+      to: resources/MtpFileTransfer.exe
 nsis:
   artifactName: Mudita-Center.${ext}
   uninstallDisplayName: ${productName}

apps/app/resources/MtpFileTransfer.exe

@@ -364,6 +364,7 @@
   "manageFiles.progressWarning.secondLineText": "to close them if you have them open.",
   "manageFiles.refreshButton.text": "Refresh",
   "manageFiles.selection.delete": "Delete",
+  "manageFiles.selection.download": "Export",
   "manageFiles.selection.selectedCount": "{count, plural, =-1 {All files} =0 {No files} one {# file} other {# files}} selected",
   "manageFiles.summary.usedLabel": "Used:",
   "manageFiles.uploadSuccess.toast.text": "{fileCount, plural, one {# file transferred} other {# files transferred}}",

libs/app-localize/utils/src/lib/locales/en-US.json

@@ -6,23 +6,32 @@
 import { spawn } from "child_process"
 import * as readline from "readline"
 import path from "path"
+import fs from "node:fs"
 import { MTPError } from "app-mtp/models"
 
+const PREFIX_LOG = `[app-mtp/dotnet-mtp]`
+
 const getExecPath = () => {
-  if (process.env["NODE_ENV"] === "production" && process.resourcesPath) {
-    return path.join(process.resourcesPath, "MtpFileTransfer.exe")
-  } else {
-    return path.join(
-      process.cwd().replace("apps\\mudita-center", ""),
-      "apps/mudita-center/resources/MtpFileTransfer.exe"
+  try {
+    const buildExecPath = path.join(process.resourcesPath, "MtpFileTransfer.exe")
+    const localExecPath = path.join(
+      process.cwd().replace("apps\\app", ""),
+      "apps/app/resources/MtpFileTransfer.exe"
     )
+
+    if (fs.existsSync(buildExecPath)) {
+      return buildExecPath
+    } else {
+      return localExecPath
+    }
+  } catch (error) {
+    console.error(`${PREFIX_LOG} Error determining exec path: ${error}`)
+    return ""
   }
 }
 
 const exePath = getExecPath()
 
-const PREFIX_LOG = `[app-mtp/dotnet-mtp]`
-
 export async function runCommand(
   request: object,
   stdOutHandler: (line: string) => void,

libs/app-mtp/main/src/lib/dotnet-mtp/utils/handle-command.ts

@@ -15,20 +15,16 @@ export const initAppMtp = (ipcMain: IpcMain, appMtp: AppMtp) => {
   ipcMain.handle(
     AppMtpIpcEvents.GetMtpDeviceId,
     async (_, portInfo: Partial<PortInfo>) => {
-      if (!portInfo.serialNumber && !portInfo.pnpId) {
-        return undefined
-      }
       const devices = await appMtp.getDevices()
       const device = devices.find((device) => {
         switch (process.platform) {
           case "darwin":
           case "linux":
             return portInfo.serialNumber === device.id
-          case "win32":
-            return (
-              mapToCoreUsbId(portInfo.pnpId ?? "", "\\") ===
-              mapToCoreUsbId(device.id)
-            )
+          case "win32": {
+            const pnpId = `USB\\VID_${portInfo.vendorId}&PID_${portInfo.productId}\\${portInfo.serialNumber}`
+            return mapToCoreUsbId(pnpId, "\\") === mapToCoreUsbId(device.id)
+          }
           default:
             throw new Error(`Unsupported platform: ${process.platform}`)
         }

libs/app-mtp/main/src/lib/init-app-mtp.ts

@@ -81,6 +81,7 @@ export enum IconType {
   Support = "support",
   ThinFail = "thin-fail",
   Trash = "trash",
+  Upload = "upload",
 }
 
 export enum IconSize {

libs/app-theme/models/src/lib/components/icon.ts

@@ -83,6 +83,7 @@ import StarFilled from "./svg/star-filled.svg?react"
 import Support from "./svg/support.svg?react"
 import ThinFail from "./svg/thin-fail.svg?react"
 import Trash from "./svg/trash.svg?react"
+import Upload from "./svg/upload.svg?react"
 
 export const icons = {
   [IconType.AirplaneMode]: AirplaneMode,
@@ -162,4 +163,5 @@ export const icons = {
   [IconType.Support]: Support,
   [IconType.ThinFail]: ThinFail,
   [IconType.Trash]: Trash,
+  [IconType.Upload]: Upload,
 } as const satisfies Record<IconType, typeof Svg>

libs/app-theme/ui/src/lib/icon/icons.ts

@@ -131,13 +131,13 @@ export class AppFileSystemGuard {
       return false
     }
 
+    const targetPath = Array.isArray(options.fileAbsolutePath)
+      ? path.join(...options.fileAbsolutePath)
+      : options.fileAbsolutePath
+
     let targetRealPath: string
     try {
-      targetRealPath = this.resolveRealPath(
-        Array.isArray(options.fileAbsolutePath)
-          ? path.join(...options.fileAbsolutePath)
-          : options.fileAbsolutePath
-      )
+      targetRealPath = this.resolveRealPathAllowNonExisting(targetPath)
     } catch {
       return false
     }
@@ -147,7 +147,9 @@ export class AppFileSystemGuard {
         const grantedStats = fs.lstatSync(grantedRealPath)
 
         if (grantedStats.isFile()) {
-          if (targetRealPath === grantedRealPath) return true
+          if (targetRealPath === grantedRealPath) {
+            return true
+          }
           continue
         }
 
@@ -166,6 +168,17 @@ export class AppFileSystemGuard {
     return false
   }
 
+  private resolveRealPathAllowNonExisting(targetPath: string): string {
+    if (fs.existsSync(targetPath)) {
+      return this.resolveRealPath(targetPath)
+    }
+
+    const parentDir = path.dirname(targetPath)
+    const parentRealPath = this.resolveRealPath(parentDir)
+
+    return path.join(parentRealPath, path.basename(targetPath))
+  }
+
   private resolveRealPath(inputPath: string): string {
     return fs.realpathSync.native(inputPath)
   }

libs/app-theme/ui/src/lib/icon/svg/upload.svg

@@ -46,7 +46,7 @@ export interface AppFileSystemWriteFileOptions
     encoding?: BufferEncoding | string
     writeAsJson?: boolean
   }
-  data: Buffer | Record<string, unknown>
+  data: Buffer | string | Record<string, unknown>
 }
 
 export interface AppFileSystemReadFileOptions