Shipping recipe files directly with Ferdi

4 files changed, 36 insertions, 7 deletions

diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 000000000..5a8d15f8f
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "recipes"]
+        path = recipes
+        url = https://github.com/getferdi/recipes
diff --git a/gulpfile.babel.js b/gulpfile.babel.js
index c0400bdac..43ebaa20a 100644
--- a/gulpfile.babel.js
+++ b/gulpfile.babel.js
@@ -28,6 +28,10 @@ const paths = {
   tmp: '.tmp',
   dictionaries: 'dictionaries',
   package: `out/${config.version}`,
+  recipes: {
+    src: 'recipes/*.tar.gz',
+    dest: 'build/recipes/',
+  },
   html: {
     src: 'src/**/*.html',
     dest: 'build/',
@@ -178,6 +182,11 @@ export function dictionaries(done) {
   });
 }
 
+export function recipes() {
+  return gulp.src(paths.recipes.src, { since: gulp.lastRun(recipes) })
+    .pipe(gulp.dest(paths.recipes.dest));
+}
+
 export function sign(done) {
   _shell(`codesign --verbose=4 --deep --strict --force --sign "${process.env.SIGNING_IDENTITY}" "${__dirname}/node_modules/electron/dist/Electron.app"`, done);
 }
@@ -185,7 +194,7 @@ export function sign(done) {
 const build = gulp.series(
   clean,
   gulp.parallel(mvSrc, mvPackageJson, mvLernaPackages),
-  gulp.parallel(html, scripts, styles),
+  gulp.parallel(html, scripts, styles, recipes),
   dictionaries,
 );
 export { build };
diff --git a/recipes b/recipes
new file mode 160000
+Subproject bd8c25be7961d167d315e76276627306b2379dc
diff --git a/src/api/server/ServerApi.js b/src/api/server/ServerApi.js
index 3d973e586..663c2716f 100644
--- a/src/api/server/ServerApi.js
+++ b/src/api/server/ServerApi.js
@@ -13,6 +13,7 @@ import UserModel from '../../models/User';
 import OrderModel from '../../models/Order';
 
 import { sleep } from '../../helpers/async-helpers';
+import { asarPath } from '../../helpers/asar-helpers';
 
 import { API } from '../../environment';
 import apiBase from '../apiBase';
@@ -369,14 +370,30 @@ export default class ServerApi {
     try {
       const recipesDirectory = path.join(app.getPath('userData'), 'recipes');
       const recipeTempDirectory = path.join(recipesDirectory, 'temp', recipeId);
-      const archivePath = path.join(recipeTempDirectory, 'recipe.tar.gz');
-      const packageUrl = `${apiBase()}/recipes/download/${recipeId}`;
+      const tempArchivePath = path.join(recipeTempDirectory, 'recipe.tar.gz');
+
+      const internalRecipesDirectory = asarPath(path.join(__dirname, '../../', 'recipes'));
+      const internalRecipeFile = path.join(internalRecipesDirectory, `${recipeId}.tar.gz`);
 
       fs.ensureDirSync(recipeTempDirectory);
-      const res = await fetch(packageUrl);
-      debug('Recipe downloaded', recipeId);
-      const buffer = await res.buffer();
-      fs.writeFileSync(archivePath, buffer);
+
+      let archivePath;
+
+      if (await fs.exists(internalRecipeFile)) {
+        console.log('[ServerApi::getRecipePackage] Using internal recipe file');
+        archivePath = internalRecipeFile;
+      } else {
+        console.log('[ServerApi::getRecipePackage] Downloading recipe from server');
+        archivePath = tempArchivePath;
+
+        const packageUrl = `${apiBase()}/recipes/download/${recipeId}`;
+
+        const res = await fetch(packageUrl);
+        debug('Recipe downloaded', recipeId);
+        const buffer = await res.buffer();
+        fs.writeFileSync(archivePath, buffer);
+      }
+      console.log(archivePath);
 
       await sleep(10);