Merge pull request #463 from 3846masa/feature/fetch-album-by-id

Add fetchAlbumById method and CLI option for using albumId

README.md

@@ -49,7 +49,7 @@ $ npm install -g upload-gphotos
 ## Usage
 
 ```
-$ upload-gphotos file [...] [--no-output-json] [--quiet] [-r retry] [-u username] [-p password] [-a albumname]
+$ upload-gphotos file [...] [--no-output-json] [--quiet] [-r retry] [-u username] [-p password] [-a albumname] [--aid albumid]
 ```
 
 ## Library

src/GPhotos.ts

@@ -33,6 +33,12 @@ class GPhotos {
     }
   }
 
+  async fetchAlbumoById({ id }: { id: string }): Promise<GPhotosAlbum> {
+    const album = new GPhotosAlbum({ id, type: 'album' }, { requestor: this.requestor });
+    await album.getInfo();
+    return album;
+  }
+
   async fetchAlbumList({
     cursor,
   }: {

src/GPhotosAlbum.ts

@@ -1,5 +1,6 @@
 import util from 'util';
 import { Nullable } from 'option-t/cjs/Nullable';
+import { isNotUndefined } from 'option-t/cjs/Undefinable';
 import { Maybe, isNullOrUndefined } from 'option-t/cjs/Maybe';
 
 import { Requestor } from './Requestor';
@@ -21,6 +22,7 @@ class GPhotosAlbum {
 
   static parseInfo(data: any): GPhotosAlbumInfo {
     const info = data.pop()['72930366'];
+
     return {
       id: data.shift(),
       type: 'album',
@@ -40,8 +42,35 @@ class GPhotosAlbum {
     this.requestor = requestor;
   }
 
-  async getInfo(): Promise<Required<GPhotosAlbumInfo>> {
-    return this.info as Required<GPhotosAlbumInfo>;
+  async getInfo({ force }: { force: boolean } = { force: false }): Promise<Required<GPhotosAlbumInfo>> {
+    if (!force && isNotUndefined(this.info.title)) {
+      return this.info as Required<GPhotosAlbumInfo>;
+    }
+
+    const {
+      snAcKc: [, , , info],
+    } = await this.requestor.sendBatchExecute<{
+      snAcKc: [unknown, unknown, unknown, any];
+    }>({
+      queries: {
+        snAcKc: [this.id, null, null, null, 0],
+      },
+    });
+
+    const parsedInfo: Required<GPhotosAlbumInfo> = {
+      id: this.id,
+      type: 'album',
+      title: info[1],
+      period: {
+        from: new Date(info[2][0]),
+        to: new Date(info[2][1]),
+      },
+      itemsCount: info[21],
+      isShared: info[8] === true,
+    };
+
+    this.info = parsedInfo;
+    return parsedInfo;
   }
 
   async append(...photoList: GPhotosPhoto[]): Promise<void> {

src/cli/index.ts

@@ -6,7 +6,6 @@ import Configstore from 'configstore';
 import { CookieJar } from 'tough-cookie';
 import pRetry from 'p-retry';
 import ora from 'ora';
-import { Nullable, isNull } from 'option-t/cjs/Nullable';
 
 import { GPhotos, GPhotosAlbum } from '../';
 import { LIBRARY_NAME } from '../constants';
@@ -70,9 +69,14 @@ if (yargs.argv.version) {
   conf.set('jar', encoded.encoded);
   conf.set('iv', encoded.iv.toString('base64'));
 
-  const albumMap: Map<string, Nullable<GPhotosAlbum>> = new Map();
+  const albumList: Array<GPhotosAlbum> = [];
   for (const albumName of yargs.argv.album) {
-    albumMap.set(albumName, await gphotos.searchAlbum({ title: albumName }));
+    albumList.push(
+      (await gphotos.searchAlbum({ title: albumName })) || (await gphotos.createAlbum({ title: albumName })),
+    );
+  }
+  for (const albumId of yargs.argv['album-id']) {
+    albumList.push(await gphotos.fetchAlbumoById({ id: albumId }));
   }
 
   for (const filepath of files) {
@@ -104,11 +108,7 @@ if (yargs.argv.version) {
       },
     );
 
-    for (let [albumName, album] of albumMap.entries()) {
-      if (isNull(album)) {
-        album = await gphotos.createAlbum({ title: albumName });
-        albumMap.set(albumName, album);
-      }
+    for (const album of albumList) {
       await album.append(photo);
     }
 

src/cli/yargs.ts

@@ -9,10 +9,11 @@ const yargs = _yargs
   .usage(
     `
 Upload-GPhotos ${packageInfo.version}
-Usage: upload-gphotos file [...] [--no-output-json] [--quiet] [-r retry] [-u username] [-p password] [-a albumname]
+Usage: upload-gphotos file [...] [--no-output-json] [--quiet] [-r retry] [-u username] [-p password] [-a albumname] [--aid albumid]
   `.trim(),
   )
   .help('help')
+  .strict()
   .options({
     retry: {
       alias: 'r',
@@ -34,7 +35,13 @@ Usage: upload-gphotos file [...] [--no-output-json] [--quiet] [-r retry] [-u use
       alias: 'a',
       type: 'array',
       default: [] as string[],
-      desc: 'An albums to put uploaded files.',
+      desc: 'The names of albums to put uploaded files.',
+    },
+    'album-id': {
+      alias: 'aid',
+      type: 'array',
+      default: [] as string[],
+      desc: 'The ids of albums to put uploaded files.',
     },
     quiet: {
       type: 'boolean',