aboutsummaryrefslogtreecommitdiff
path: root/src/client/apis/google_docs/GooglePhotosClientUtils.ts
diff options
context:
space:
mode:
Diffstat (limited to 'src/client/apis/google_docs/GooglePhotosClientUtils.ts')
-rw-r--r--src/client/apis/google_docs/GooglePhotosClientUtils.ts82
1 files changed, 40 insertions, 42 deletions
diff --git a/src/client/apis/google_docs/GooglePhotosClientUtils.ts b/src/client/apis/google_docs/GooglePhotosClientUtils.ts
index 757031fec..07a2708ec 100644
--- a/src/client/apis/google_docs/GooglePhotosClientUtils.ts
+++ b/src/client/apis/google_docs/GooglePhotosClientUtils.ts
@@ -1,3 +1,5 @@
+/* eslint-disable no-use-before-define */
+import Photos = require('googlephotos');
import { AssertionError } from 'assert';
import { EditorState } from 'prosemirror-state';
import { ClientUtils } from '../../../ClientUtils';
@@ -5,14 +7,12 @@ import { Doc, DocListCastAsync, Opt } from '../../../fields/Doc';
import { Id } from '../../../fields/FieldSymbols';
import { RichTextField } from '../../../fields/RichTextField';
import { RichTextUtils } from '../../../fields/RichTextUtils';
-import { Cast, StrCast } from '../../../fields/Types';
-import { ImageField } from '../../../fields/URLField';
+import { Cast, ImageCast, StrCast } from '../../../fields/Types';
import { MediaItem, NewMediaItemResult } from '../../../server/apis/google/SharedTypes';
import { Networking } from '../../Network';
import { DocUtils, Docs, DocumentOptions } from '../../documents/Documents';
import { FormattedTextBox } from '../../views/nodes/formattedText/FormattedTextBox';
import { GoogleAuthenticationManager } from '../GoogleAuthenticationManager';
-import Photos = require('googlephotos');
export namespace GooglePhotos {
const endpoint = async () => new Photos(await GoogleAuthenticationManager.Instance.fetchOrGenerateAccessToken());
@@ -76,17 +76,16 @@ export namespace GooglePhotos {
export const CollectionToAlbum = async (options: AlbumCreationOptions): Promise<Opt<AlbumCreationResult>> => {
const { collection, title, descriptionKey, tag } = options;
const dataDocument = Doc.GetProto(collection);
- const images = ((await DocListCastAsync(dataDocument.data)) || []).filter(doc => Cast(doc.data, ImageField));
+ const images = ((await DocListCastAsync(dataDocument.data)) || []).filter(doc => ImageCast(doc.data));
if (!images || !images.length) {
return undefined;
}
- const resolved = title ? title : StrCast(collection.title) || `Dash Collection (${collection[Id]}`;
+ const resolved = title || StrCast(collection.title) || `Dash Collection (${collection[Id]}`;
const { id, productUrl } = await Create.Album(resolved);
const response = await Transactions.UploadImages(images, { id }, descriptionKey);
if (response) {
const { results, failed } = response;
- let index: Opt<number>;
- while ((index = failed.pop()) !== undefined) {
+ for (let index = failed.pop(); index !== undefined; index = failed.pop()) {
Doc.RemoveDocFromList(dataDocument, 'data', images.splice(index, 1)[0]);
}
const mediaItems: MediaItem[] = results.map(item => item.mediaItem);
@@ -97,13 +96,12 @@ export namespace GooglePhotos {
for (let i = 0; i < images.length; i++) {
const image = Doc.GetProto(images[i]);
const mediaItem = mediaItems[i];
- if (!mediaItem) {
- continue;
+ if (mediaItem) {
+ image.googlePhotosId = mediaItem.id;
+ image.googlePhotosAlbumUrl = productUrl;
+ image.googlePhotosUrl = mediaItem.productUrl || mediaItem.baseUrl;
+ idMapping[mediaItem.id] = image;
}
- image.googlePhotosId = mediaItem.id;
- image.googlePhotosAlbumUrl = productUrl;
- image.googlePhotosUrl = mediaItem.productUrl || mediaItem.baseUrl;
- idMapping[mediaItem.id] = image;
}
collection.googlePhotosAlbumUrl = productUrl;
collection.googlePhotosIdMapping = idMapping;
@@ -114,6 +112,7 @@ export namespace GooglePhotos {
Transactions.AddTextEnrichment(collection, `Find me at ${ClientUtils.prepend(`/doc/${collection[Id]}?sharing=true`)}`);
return { albumId: id, mediaItems };
}
+ return undefined;
};
}
@@ -124,7 +123,7 @@ export namespace GooglePhotos {
await GoogleAuthenticationManager.Instance.fetchOrGenerateAccessToken();
const response = await Query.ContentSearch(requested);
const uploads = await Transactions.WriteMediaItemsToServer(response);
- const children = uploads.map((upload: Transactions.UploadInformation) => Docs.Create.ImageDocument(ClientUtils.fileUrl(upload.fileNames.clean) /*, {"data_contentSize":upload.contentSize}*/));
+ const children = uploads.map((upload: Transactions.UploadInformation) => Docs.Create.ImageDocument(ClientUtils.fileUrl(upload.fileNames.clean) /* , {"data_contentSize":upload.contentSize} */));
const options = { _width: 500, _height: 500 };
return constructor(children, options);
};
@@ -144,7 +143,7 @@ export namespace GooglePhotos {
const images = (await DocListCastAsync(collection.data))!.map(Doc.GetProto);
images?.forEach(image => tagMapping.set(image[Id], ContentCategories.NONE));
const values = Object.values(ContentCategories).filter(value => value !== ContentCategories.NONE);
- for (const value of values) {
+ values.forEach(async value => {
const searched = (await ContentSearch({ included: [value] }))?.mediaItems?.map(({ id }) => id);
searched?.forEach(async id => {
const image = await Cast(idMapping[id], Doc);
@@ -154,7 +153,7 @@ export namespace GooglePhotos {
!tags?.includes(value) && tagMapping.set(key, tags + delimiter + value);
}
});
- }
+ });
images?.forEach(image => {
const concatenated = tagMapping.get(image[Id])!;
const tags = concatenated.split(delimiter);
@@ -200,9 +199,10 @@ export namespace GooglePhotos {
export const AlbumSearch = async (albumId: string, pageSize = 100): Promise<MediaItem[]> => {
const photos = await endpoint();
const mediaItems: MediaItem[] = [];
- let nextPageTokenStored: Opt<string> = undefined;
+ let nextPageTokenStored: Opt<string>;
const found = 0;
do {
+ // eslint-disable-next-line no-await-in-loop
const response: any = await photos.mediaItems.search(albumId, pageSize, nextPageTokenStored);
mediaItems.push(...response.mediaItems);
nextPageTokenStored = response.nextPageToken;
@@ -222,7 +222,7 @@ export namespace GooglePhotos {
excluded.length && excluded.forEach(category => contentFilter.addExcludedContentCategories(category));
filters.setContentFilter(contentFilter);
- const date = options.date;
+ const { date } = options;
if (date) {
const dateFilter = new photos.DateFilter();
if (date instanceof Date) {
@@ -240,15 +240,11 @@ export namespace GooglePhotos {
});
};
- export const GetImage = async (mediaItemId: string): Promise<Transactions.MediaItem> => {
- return (await endpoint()).mediaItems.get(mediaItemId);
- };
+ export const GetImage = async (mediaItemId: string): Promise<Transactions.MediaItem> => (await endpoint()).mediaItems.get(mediaItemId);
}
namespace Create {
- export const Album = async (title: string) => {
- return (await endpoint()).albums.create(title);
- };
+ export const Album = async (title: string) => (await endpoint()).albums.create(title);
}
export namespace Transactions {
@@ -278,6 +274,7 @@ export namespace GooglePhotos {
return enrichmentItem.id;
}
}
+ return undefined;
};
export const WriteMediaItemsToServer = async (body: { mediaItems: any[] }): Promise<UploadInformation[]> => {
@@ -291,9 +288,12 @@ export namespace GooglePhotos {
return undefined;
}
const baseUrls: string[] = await Promise.all(
- response.results.map(item => {
- return new Promise<string>(resolve => Query.GetImage(item.mediaItem.id).then(item => resolve(item.baseUrl)));
- })
+ response.results.map(
+ item =>
+ new Promise<string>(resolve => {
+ Query.GetImage(item.mediaItem.id).then(item => resolve(item.baseUrl));
+ })
+ )
);
return baseUrls;
};
@@ -303,27 +303,25 @@ export namespace GooglePhotos {
failed: number[];
}
- export const UploadImages = async (sources: Doc[], album?: AlbumReference, descriptionKey = 'caption'): Promise<Opt<ImageUploadResults>> => {
+ export const UploadImages = async (sources: Doc[], albumIn?: AlbumReference, descriptionKey = 'caption'): Promise<Opt<ImageUploadResults>> => {
await GoogleAuthenticationManager.Instance.fetchOrGenerateAccessToken();
- if (album && 'title' in album) {
- album = await Create.Album(album.title);
- }
+ const album = albumIn && 'title' in albumIn ? await Create.Album(albumIn.title) : albumIn;
const media: MediaInput[] = [];
- for (const source of sources) {
- const data = Cast(Doc.GetProto(source).data, ImageField);
- if (!data) {
- return;
- }
- const url = data.url.href;
- const target = Doc.MakeEmbedding(source);
- const description = parseDescription(target, descriptionKey);
- await DocUtils.makeCustomViewClicked(target, Docs.Create.FreeformDocument);
- media.push({ url, description });
- }
+ sources
+ .filter(source => ImageCast(Doc.GetProto(source).data))
+ .forEach(async source => {
+ const data = ImageCast(Doc.GetProto(source).data);
+ const url = data.url.href;
+ const target = Doc.MakeEmbedding(source);
+ const description = parseDescription(target, descriptionKey);
+ await DocUtils.makeCustomViewClicked(target, Docs.Create.FreeformDocument);
+ media.push({ url, description });
+ });
if (media.length) {
const results = await Networking.PostToServer('/googlePhotosMediaPost', { media, album });
return results;
}
+ return undefined;
};
const parseDescription = (document: Doc, descriptionKey: string) => {
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2025-10-06 07:59:05 +0000