small fixes for image hierarchy export, zip still doesn't download

1 files changed, 3 insertions, 2 deletions

diff --git a/src/server/ApiManagers/DownloadManager.ts b/src/server/ApiManagers/DownloadManager.ts
index 2280739fc..d9808704b 100644
--- a/src/server/ApiManagers/DownloadManager.ts
+++ b/src/server/ApiManagers/DownloadManager.ts
@@ -7,6 +7,7 @@ import { Database } from "../database";
 import * as path from "path";
 import { DashUploadUtils, SizeSuffix } from "../DashUploadUtils";
 import { publicDirectory } from "..";
+import { serverPathToFile, Directory } from "./UploadManager";
 
 export type Hierarchy = { [id: string]: string | Hierarchy };
 export type ZipMutator = (file: Archiver.Archiver) => void | Promise<void>;
@@ -245,9 +246,9 @@ async function writeHierarchyRecursive(file: Archiver.Archiver, hierarchy: Hiera
         if (typeof result === "string") {
             let path: string;
             let matches: RegExpExecArray | null;
-            if ((matches = /\:1050\/files\/(upload\_[\da-z]{32}.*)/g.exec(result)) !== null) {
+            if ((matches = /\:1050\/files\/images\/(upload\_[\da-z]{32}.*)/g.exec(result)) !== null) {
                 // image already exists on our server
-                path = `${__dirname}/public/files/${matches[1]}`;
+                path = serverPathToFile(Directory.images, matches[1]);
             } else {
                 // the image doesn't already exist on our server (may have been dragged
                 // and dropped in the browser and thus hosted remotely) so we upload it