Add custom recipe creator

2 files changed, 61 insertions, 22 deletions

diff --git a/app/Controllers/Http/RecipeController.js b/app/Controllers/Http/RecipeController.js
index 641f4ef..407379e 100644
--- a/app/Controllers/Http/RecipeController.js
+++ b/app/Controllers/Http/RecipeController.js
@@ -4,9 +4,27 @@ const Recipe = use('App/Models/Recipe');
 const Helpers = use('Helpers')
 const Drive = use('Drive')
 const fetch = require('node-fetch');
+const targz = require('targz');
 const path = require('path');
+const fs = require('fs');
+
+const compress = (src, dest) => {
+  return new Promise((resolve, reject) => {
+    targz.compress({
+      src,
+      dest
+    }, function (err) {
+      if (err) {
+        reject(err);
+      } else {
+        resolve(dest);
+      }
+    });
+  })
+}
 
 class RecipeController {
+  // List official and custom recipes
   async list({
     response
   }) {
@@ -26,19 +44,29 @@ class RecipeController {
     return response.send(recipes)
   }
 
+  // Create a new recipe using the new.html page
   async create({
     request,
     response
   }) {
     const data = request.all();
 
-    const pkg = request.file('package')
+    // Check for invalid characters
+    if (/\.{1,}/.test(data.id) || /\/{1,}/.test(data.id)) {
+      return response.send('Invalid recipe name. Your recipe name may not contain "." or "/"');
+    }
 
-    await pkg.move(path.join(Helpers.appRoot(), '/recipes/'), {
-      name: data.id + '.tar.gz',
-      overwrite: false
-    })
+    // Move uploaded files to temporary path
+    const files = request.file('files')
+    await files.moveAll(Helpers.tmpPath('recipe'))
 
+    // Compress files to .tar.gz file
+    compress(
+      Helpers.tmpPath('recipe'), 
+      path.join(Helpers.appRoot(), '/recipes/' + data.id + '.tar.gz')
+    );
+
+    // Create recipe in db
     await Recipe.create({
       name: data.name,
       recipeId: data.id,
@@ -56,23 +84,25 @@ class RecipeController {
     return response.send('Created new recipe')
   }
 
+  // Search official and custom recipes
   async search({
-      request,
-      response
+    request,
+    response
   }) {
     const needle = request.input('needle')
 
+    // Get results
     const remoteResults = JSON.parse(await (await fetch('https://api.franzinfra.com/v1/recipes/search?needle=' + needle)).text());
     const localResultsArray = (await Recipe.query().where('name', 'LIKE', '%' + needle + '%').fetch()).toJSON();
     const localResults = localResultsArray.map(recipe => ({
-        "id": recipe.recipeId,
-        "name": recipe.name,
-        ...JSON.parse(recipe.data)
+      "id": recipe.recipeId,
+      "name": recipe.name,
+      ...JSON.parse(recipe.data)
     }))
 
     const results = [
-        ...localResults,
-        ...remoteResults,
+      ...localResults,
+      ...remoteResults,
     ]
 
     return response.send(results);
@@ -86,16 +116,16 @@ class RecipeController {
   }) {
     const service = params.recipe;
 
-    // Chack for invalid characters
-    if (/\.{1,}/.test(service) || /\/{1,}/.test(service)) {
-        return response.send('Invalid recipe name');
+    // Check for invalid characters
+    if (/\.{1,}/.test(service) || /\/{1,}/.test(service)) {
+      return response.send('Invalid recipe name');
     }
 
     // Check if recipe exists in recipes folder
     if (await Drive.exists(service + '.tar.gz')) {
-        response.send(await Drive.get(service + '.tar.gz'))
+      response.send(await Drive.get(service + '.tar.gz'))
     } else {
-        response.redirect('https://api.franzinfra.com/v1/recipes/download/' + service)
+      response.redirect('https://api.franzinfra.com/v1/recipes/download/' + service)
     }
   }
 }
diff --git a/app/Controllers/Http/UserController.js b/app/Controllers/Http/UserController.js
index 062e16f..f78f28d 100644
--- a/app/Controllers/Http/UserController.js
+++ b/app/Controllers/Http/UserController.js
@@ -13,11 +13,20 @@ class UserController {
     session
   }) {
     const data = request.only(['firstname', 'email', 'password']);
-    const user = await User.create({
-      email: data.email,
-      password: data.password,
-      username: data.firstname
-    });
+
+    try {
+      const user = await User.create({
+        email: data.email,
+        password: data.password,
+        username: data.firstname
+      });
+    } catch(e) {
+      return response.status(401).send({
+        "message": "E-Mail Address already in use",
+        "status": 401
+      })
+    }
+    
     const token = await auth.generate(user)
 
     return response.send({