fix: preserve local files with extensions on re-init (#32)

Author: fivecar

src/index.ts

@@ -263,22 +263,15 @@ export default class DownloadQueue {
     }
 
     // Delete any files that don't have a spec
-    const orphanedFiles = dirFilenames.filter(
-      filename => !this.specs.some(spec => spec.id === filename)
+    const orphanedFiles = dirFilenames.map(splitFilenameFromExtension).filter(
+      // Remember that spec.id doesn't have an extension! So use basename.
+      ([basename]) => !this.specs.some(spec => spec.id === basename)
     );
     if (orphanedFiles.length) {
       await Promise.all(
-        orphanedFiles.map(filename => {
+        orphanedFiles.map(([basename, ext]) => {
           try {
-            const parts = filename.split(".");
-
-            if (parts.length > 1) {
-              // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-              const extension = parts.pop()!;
-
-              return RNFS.unlink(this.pathFromId(parts.join("."), extension));
-            }
-            return RNFS.unlink(this.pathFromId(filename, ""));
+            return RNFS.unlink(this.pathFromId(basename, ext));
           } catch {
             // Ignore errors
           }
@@ -910,6 +903,18 @@ export default class DownloadQueue {
   }
 }
 
+function splitFilenameFromExtension(filename: string): [string, string] {
+  const parts = filename.split(".");
+
+  if (parts.length > 1) {
+    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+    const extension = parts.pop()!;
+
+    return [parts.join("."), extension];
+  }
+  return [filename, ""];
+}
+
 function roundToNextMinute(timestamp: number) {
   return Math.ceil(timestamp / 60000) * 60000;
 }

test/index.spec.ts

@@ -266,7 +266,7 @@ describe("DownloadQueue", () => {
       expect(unlink).toHaveBeenCalledTimes(2);
     });
 
-    it("doesn't delete files that have specs on init", async () => {
+    it("doesn't delete files without extensions that have specs on init", async () => {
       const queue = new DownloadQueue();
 
       (readdir as jest.Mock).mockImplementation(() => ["foo", "bar"]);
@@ -286,6 +286,26 @@ describe("DownloadQueue", () => {
       expect(unlink).toHaveBeenCalledTimes(1);
     });
 
+    it("doesn't delete files with extensions that have specs on init", async () => {
+      const queue = new DownloadQueue();
+
+      (readdir as jest.Mock).mockImplementation(() => ["foo.mp3", "bar.mp3"]);
+
+      await kvfs.write("/mydomain/foo", {
+        id: "foo",
+        url: "http://foo.com/a.mp3",
+        path: `${RNFS.DocumentDirectoryPath}/DownloadQueue/mydomain/foo.mp3`,
+        createTime: Date.now() - 1000,
+      });
+      await queue.init({ domain: "mydomain" });
+      expect(unlink).toHaveBeenCalledWith(
+        expect.stringMatching(
+          `${RNFS.DocumentDirectoryPath}/DownloadQueue/mydomain/bar.mp3`
+        )
+      );
+      expect(unlink).toHaveBeenCalledTimes(1);
+    });
+
     it("revives still-downloading specs from previous launches", async () => {
       const queue = new DownloadQueue();
       const handlers: DownloadQueueHandlers = {