fix #2973 -- duplicate of 2018-07-12-091218.ipynb is 2018-07-12-91219.ipynb, but should be 2018-07-12-091219.ipynb

Author: williamstein

src/packages/util/misc.test.ts

@@ -321,3 +321,25 @@ test 123`;
     expect(t).toEqual("foo");
   });
 });
+
+describe("suggest_duplicate_filename", () => {
+  const dup = misc.suggest_duplicate_filename;
+  it("works with numbers", () => {
+    expect(dup("filename-1.test")).toBe("filename-2.test");
+    expect(dup("filename-99.test")).toBe("filename-100.test");
+    expect(dup("filename_99.test")).toBe("filename_100.test");
+  });
+  it("handles leading zeros", () => {
+    // handles leading 0's properly: https://github.com/sagemathinc/cocalc/issues/2973
+    expect(dup("filename_001.test")).toBe("filename_002.test");
+  });
+  it("works also without", () => {
+    expect(dup("filename-test")).toBe("filename-test-1");
+    expect(dup("filename-xxx.test")).toBe("filename-xxx-1.test");
+    expect(dup("bla")).toBe("bla-1");
+    expect(dup("foo.bar")).toBe("foo-1.bar");
+  });
+  it("also works with weird corner cases", () => {
+    expect(dup("asdf-")).toBe("asdf--1");
+  });
+});

src/packages/util/misc.ts

@@ -2047,6 +2047,7 @@ export function tab_to_path(name: string): string | undefined {
 // suggest a new filename when duplicating it as follows:
 // strip extension, split at '_' or '-' if it exists
 // try to parse a number, if it works, increment it, etc.
+// Handle leading zeros for the number (see https://github.com/sagemathinc/cocalc/issues/2973)
 export function suggest_duplicate_filename(name: string): string {
   let ext;
   ({ name, ext } = separate_file_extension(name));
@@ -2059,9 +2060,13 @@ export function suggest_duplicate_filename(name: string): string {
       name.slice(0, idx + 1),
       name.slice(idx + 1),
     ]);
-    const num = parseInt(ending);
+    // Pad the number with leading zeros to maintain the original length
+    const paddedEnding = ending.padStart(ending.length, "0");
+    const num = parseInt(paddedEnding);
     if (!Number.isNaN(num)) {
-      new_name = `${prefix}${num + 1}`;
+      // Increment the number and pad it back to the original length
+      const newNum = (num + 1).toString().padStart(ending.length, "0");
+      new_name = `${prefix}${newNum}`;
     }
   }
   if (new_name == null) {