Support upload of existing discs (sort of) See #488

Author: mattgodbolt

index.html

@@ -622,6 +622,10 @@ <h5 class="modal-title" id="google-driveModalLabel">
               <div>
                 <form class="well" role="form" action="#">
                   <input type="text" placeholder="Create disc..." autofocus class="disc-name" />
+                  <label class="checkbox-inline">
+                    <input type="checkbox" class="create-from-existing" value="" />
+                    Use current disc image
+                  </label>
                   <button type="submit" class="btn btn-secondary create-button">Create</button>
                 </form>
               </div>
@@ -654,7 +658,7 @@ <h5 class="modal-title loading" id="loadingModalLabel"></h5>
               Google Drive requires you to authorize jsbeeb to access your files by logging in.<br />
               Please click Authorize to open a Google Drive pop-up to authenticate and give permission to jsbeeb.
               <form class="well" role="form" action="#">
-                <button type="submit" class="btn btn-secondary create-button">Authorize</button>
+                <button type="submit" class="btn btn-secondary">Authorize</button>
               </form>
             </div>
           </div>

src/google-drive.js

@@ -128,11 +128,8 @@ export class GoogleDriveLoader {
         });
     }
 
-    async create(fdc, name) {
+    async create(fdc, name, data) {
         console.log(`Google Drive: creating disc image: '${name}'`);
-        const byteSize = utils.discImageSize(name).byteSize;
-        const data = new Uint8Array(byteSize);
-        utils.setDiscName(data, name);
         const response = await this.saveFile(name, data);
         const meta = response.result;
         return { fileId: meta.id, disc: this.makeDisc(fdc, data, meta) };

src/main.js

@@ -1019,16 +1019,29 @@ $.each(availableImages, function (i, image) {
 
 $("#google-drive form").on("submit", async function (e) {
     e.preventDefault();
-    const text = $("#google-drive .disc-name").val();
-    if (!text) return;
+    let name = $("#google-drive .disc-name").val();
+    if (!name) return;
 
     popupLoading("Connecting to Google Drive");
     $googleDriveModal.hide();
-    popupLoading("Creating '" + text + "' on Google Drive");
+    popupLoading("Creating '" + name + "' on Google Drive");
+
+    let data;
+    if ($("#google-drive .create-from-existing").prop("checked")) {
+        const disc = processor.fdc.drives[0].disc;
+        data = toSsdOrDsd(disc);
+        name = name.substring(0, name.lastIndexOf(".")) + (disc.isDoubleSided ? ".dsd" : ".ssd");
+        console.log(`Saving existing disc: ${name}`);
+    } else {
+        const byteSize = utils.discImageSize(name).byteSize;
+        data = new Uint8Array(byteSize);
+        utils.setDiscName(data, name);
+        console.log(`Creating blank: ${name}`);
+    }
 
     try {
-        const result = await googleDrive.create(processor.fdc, text);
-        setDisc1Image("gd:" + result.fileId + "/" + text);
+        const result = await googleDrive.create(processor.fdc, name, data);
+        setDisc1Image("gd:" + result.fileId + "/" + name);
         processor.fdc.loadDisc(0, result.disc);
         loadingFinished();
     } catch (error) {