Restore backup download

- Fix git fs promises usage

Author: Phoscur

README.md

@@ -19,7 +19,6 @@ Fix regressions, lost features:
 - Likes
 - Preview while running
 - Glacier Backup
-- Github Backup Downloads
 - Destructive Rotation
 - Misc commands: Cancel?!
 - Local FFMpeg when Github disabled

package.json

@@ -13,7 +13,8 @@
     "watch": "tsx watch --env-file=.env src/main.ts",
     "test": "tsx --env-file=.env src/test.ts",
     "test-sunmoon": "tsx --env-file=.env src/services/SunMoonTime.ts",
-    "test-df": "tsx watch src/lib/df.ts"
+    "test-df": "tsx watch src/lib/df.ts",
+    "download-backup": "tsx --env-file=.env src/downloadBackups.ts"
   },
   "repository": {
     "type": "git",

src/downloadBackups.ts

@@ -0,0 +1,27 @@
+import { Injector } from '@joist/di';
+import { Logger, consoleInjector, Repository, FileSystem } from './services/index.js';
+
+// defineEnvironment
+const injector = new Injector([], consoleInjector);
+const logger = injector.get(Logger);
+const fs = injector.get(FileSystem);
+const repo = injector.get(Repository);
+
+const DAY_MS = 24 * 60 * 60 * 1000;
+
+async function main() {
+  // TODO? restore await InventoryStorage.create(`${process.env.CONTENT_STORAGE_NAME_PREFIX}`);
+  for (let d = 7; d > 0; d--) {
+    const yesterday = new Date(Date.now() - DAY_MS * d).toISOString().slice(0, 10);
+    const repoName = `${process.env.CONTENT_STORAGE_NAME_PREFIX}-${yesterday}`;
+    try {
+      await repo.checkout(repoName);
+      await fs.setupPath(repoName);
+      logger.log('Storage has', (await fs.list()).length - 1, 'files in', repoName);
+    } catch (error: any) {
+      logger.log('Failed to checkout repo:', repoName, error?.message);
+    }
+  }
+}
+
+main();

src/services/Director.ts

@@ -74,6 +74,11 @@ export class Director {
     return this.#fs().setupPath(name);
   }
 
+  async switchRepo(name: string, checkout = true) {
+    if (checkout) await this.#repo().checkout(name);
+    return this.#switchPath(name);
+  }
+
   async photo(presetName: string) {
     const logger = this.#logger();
     const camera = this.#camera();

src/services/FileSystem.ts

@@ -86,7 +86,7 @@ export class FileSystem {
 
   async list() {
     const list = await readdir(this.path);
-    this.#logger().log('[Storage] List:\n °', list.join('\n ° '));
+    // this.#logger().log('[Storage] List:\n °', list.join('\n ° '));
     return list;
   }
 

src/services/Git.ts

@@ -2,7 +2,7 @@ import axios from 'axios';
 import sodium from 'libsodium-wrappers';
 import git from 'isomorphic-git';
 import http from 'isomorphic-git/http/node/index.js';
-import fs from 'fs/promises';
+import { promises } from 'fs';
 import { Octokit } from '@octokit/rest';
 import { inject, injectable } from '@joist/di';
 import { FileSystem } from './FileSystem.js';
@@ -61,22 +61,23 @@ export class Git {
 
   /**
    * Attempt `git clone` including checkout
+   * @returns {Promise<boolean>} success
    */
-  async checkout(repo: string) {
+  async checkout(repo: string, branch = this.ref) {
     const { log } = this.#logger();
     const dir = this.#fs().getAbsolutePath(repo);
     try {
       log('Checking out:', this.publicUrlPrefix + repo);
       await this.git.clone({
-        fs,
+        fs: { promises },
         dir,
         http,
         url: this.privateUrlPrefix + repo,
         singleBranch: true,
         depth: 1,
       });
       log('Successfully cloned:', dir);
-      await this.branch(this.ref);
+      if (branch) await this.branch(this.ref);
       return true;
     } catch (err: any) {
       log('Checkout failed:', dir, err?.message);
@@ -93,23 +94,24 @@ export class Git {
    */
   async log() {
     const dir = this.#fs().absolutePath;
-    return this.git.log({ fs, dir });
+    return this.git.log({ fs: { promises }, dir });
   }
+
   async status(filepath: string) {
     const dir = this.#fs().absolutePath;
-    return this.git.status({ fs, dir, filepath });
+    return this.git.status({ fs: { promises }, dir, filepath });
   }
 
   async add(fileName: string) {
     const dir = this.#fs().absolutePath;
-    await this.git.add({ fs, dir, filepath: fileName });
+    await this.git.add({ fs: { promises }, dir, filepath: fileName });
   }
 
   async branch(name: string) {
     const logger = this.#logger();
     const dir = this.#fs().absolutePath;
     try {
-      await this.git.branch({ fs, dir, ref: name, checkout: true });
+      await this.git.branch({ fs: { promises }, dir, ref: name, checkout: true });
     } catch (e: any) {
       if (e?.code === 'AlreadyExistsError') {
         logger.log(`Branch "${name}" already exists`);
@@ -123,7 +125,7 @@ export class Git {
 
   async commit(message: string) {
     const dir = this.#fs().absolutePath;
-    return this.git.commit({ fs, dir, message, author: this.author });
+    return this.git.commit({ fs: { promises }, dir, message, author: this.author });
   }
 
   /**
@@ -132,7 +134,7 @@ export class Git {
   async push() {
     const dir = this.#fs().absolutePath;
     return this.git.push({
-      fs,
+      fs: { promises },
       dir,
       http,
       // ref: this.ref,

src/services/Producer.ts

@@ -13,6 +13,12 @@ export class Producer {
   #director = inject(Director);
   #hd = inject(Hardware);
 
+  async timelapse(chat: MessengerChat) {
+    const director = this.#director();
+    await director.setupPublicRepo(director.repoTimelapse);
+    await director.timelapse('default', { count: 100, intervalMS: 2000 });
+  }
+
   scheduleDailySunset(chat: MessengerChat) {
     const director = this.#director();
     director.scheduleSunset(

src/services/Repository.ts

@@ -36,6 +36,13 @@ export class Repository {
     await fs.setupPath(repo);
   }
 
+  /**
+   * Download an existing repository
+   */
+  async checkout(repo: string) {
+    return this.#git().checkout(repo);
+  }
+
   async upload(file: string) {
     const git = this.#git();
     await git.upload(file);

sunset-backup.bat

@@ -1,7 +1,7 @@
 @echo off
 echo Run Sunset Backup now...
 echo =================================================================================================================
-cmd /c ts-node -r dotenv/config %USERPROFILE%/Projects/philo/src/lib/storage/downloadGithubRepos.ts
+cmd /c node --env-file=.env %USERPROFILE%/Projects/philo/dist/downloadBackups.js
 echo =================================================================================================================
 echo Done. Press any key to close!
 pause>nul