google doc fixes

3 files changed, 9 insertions, 13 deletions

diff --git a/src/new_fields/RichTextUtils.ts b/src/new_fields/RichTextUtils.ts
index c50f8cc48..2fedac53e 100644
--- a/src/new_fields/RichTextUtils.ts
+++ b/src/new_fields/RichTextUtils.ts
@@ -123,9 +123,7 @@ export namespace RichTextUtils {
                 const objects = Object.keys(inlineObjects).map(objectId => inlineObjects[objectId]);
                 const mediaItems: MediaItem[] = objects.map(object => {
                     const embeddedObject = object.inlineObjectProperties!.embeddedObject!;
-                    const baseUrl = embeddedObject.imageProperties!.contentUri!;
-                    const filename = `upload_${Utils.GenerateGuid()}.png`;
-                    return { baseUrl, filename };
+                    return { baseUrl: embeddedObject.imageProperties!.contentUri! };
                 });
 
                 const uploads = await Networking.PostToServer("/googlePhotosMediaDownload", { mediaItems });
@@ -136,11 +134,11 @@ export namespace RichTextUtils {
 
                 for (let i = 0; i < objects.length; i++) {
                     const object = objects[i];
-                    const { fileNames } = uploads[i];
+                    const { clientAccessPath } = uploads[i];
                     const embeddedObject = object.inlineObjectProperties!.embeddedObject!;
                     const size = embeddedObject.size!;
                     const width = size.width!.magnitude!;
-                    const url = Utils.fileUrl(fileNames.clean);
+                    const url = Utils.prepend(clientAccessPath);
 
                     inlineObjectMap.set(object.objectId!, {
                         title: embeddedObject.title || `Imported Image from ${document.title}`,
@@ -156,7 +154,6 @@ export namespace RichTextUtils {
 
         interface MediaItem {
             baseUrl: string;
-            filename: string;
         }
 
         export const Import = async (documentId: GoogleApiClientUtils.Docs.DocumentId, textNote: Doc): Promise<Opt<GoogleApiClientUtils.Docs.ImportResult>> => {
diff --git a/src/scraping/buxton/final/BuxtonImporter.ts b/src/scraping/buxton/final/BuxtonImporter.ts
index 66d1e761a..6e3c66690 100644
--- a/src/scraping/buxton/final/BuxtonImporter.ts
+++ b/src/scraping/buxton/final/BuxtonImporter.ts
@@ -285,7 +285,7 @@ async function writeImages(zip: any): Promise<string[]> {
             continue;
         }
 
-        const ext = `.${type}`;
+        const ext = `.${type}`.toLowerCase();
         const generatedFileName = `upload_${Utils.GenerateGuid()}${ext}`;
 
         await DashUploadUtils.outputResizedImages(streamImage, imageDir, generatedFileName, ext);
diff --git a/src/server/ApiManagers/GooglePhotosManager.ts b/src/server/ApiManagers/GooglePhotosManager.ts
index 1727cc5a6..157f6bdca 100644
--- a/src/server/ApiManagers/GooglePhotosManager.ts
+++ b/src/server/ApiManagers/GooglePhotosManager.ts
@@ -21,7 +21,6 @@ interface GooglePhotosUploadFailure {
 }
 interface MediaItem {
     baseUrl: string;
-    filename: string;
 }
 interface NewMediaItem {
     description: string;
@@ -83,12 +82,12 @@ export default class GooglePhotosManager extends ApiManager {
             method: Method.POST,
             subscription: "/googlePhotosMediaDownload",
             secureHandler: async ({ req, res }) => {
-                const contents: { mediaItems: MediaItem[] } = req.body;
+                const { mediaItems } = req.body as { mediaItems: MediaItem[] };
                 let failed = 0;
-                if (contents) {
+                if (mediaItems) {
                     const completed: Opt<DashUploadUtils.ImageUploadInformation>[] = [];
-                    for (const item of contents.mediaItems) {
-                        const results = await DashUploadUtils.InspectImage(item.baseUrl);
+                    for (const { baseUrl } of mediaItems) {
+                        const results = await DashUploadUtils.InspectImage(baseUrl);
                         if (results instanceof Error) {
                             failed++;
                             continue;
@@ -96,7 +95,7 @@ export default class GooglePhotosManager extends ApiManager {
                         const { contentSize, ...attributes } = results;
                         const found: Opt<DashUploadUtils.ImageUploadInformation> = await Database.Auxiliary.QueryUploadHistory(contentSize);
                         if (!found) {
-                            const upload = await DashUploadUtils.UploadInspectedImage({ contentSize, ...attributes }, item.filename, prefix).catch(error => _error(res, downloadError, error));
+                            const upload = await DashUploadUtils.UploadInspectedImage({ contentSize, ...attributes }, undefined, prefix).catch(error => _error(res, downloadError, error));
                             if (upload) {
                                 completed.push(upload);
                                 await Database.Auxiliary.LogUpload(upload);