Merge branch 'develop' into reload-crashed-service

2 files changed, 22 insertions, 4 deletions

diff --git a/src/models/Recipe.js b/src/models/Recipe.js
index 43a3450b1..9971df77c 100644
--- a/src/models/Recipe.js
+++ b/src/models/Recipe.js
@@ -1,7 +1,8 @@
+import emailParser from 'address-rfc2822';
+
 export default class Recipe {
   id = '';
   name = '';
-  author = '';
   description = '';
   version = '1.0';
   path = '';
@@ -25,12 +26,13 @@ export default class Recipe {
     }
 
     if (!data.id) {
-      throw Error('Recipe requires Id');
+      // Franz 4 recipes do not have an Id
+      throw Error(`Recipe '${data.name}' requires Id`);
     }
 
     this.id = data.id || this.id;
     this.name = data.name || this.name;
-    this.author = data.author || this.author;
+    this.rawAuthor = data.author || this.author;
     this.description = data.description || this.description;
     this.version = data.version || this.version;
     this.path = data.path;
@@ -49,4 +51,15 @@ export default class Recipe {
 
     this.message = data.config.message || this.message;
   }
+
+  get author() {
+    try {
+      const addresses = emailParser.parse(this.rawAuthor);
+      return addresses.map(a => ({ email: a.address, name: a.phrase }));
+    } catch (err) {
+      console.warn(`Not a valid author for ${this.name}`);
+    }
+
+    return [];
+  }
 }
diff --git a/src/models/Service.js b/src/models/Service.js
index 89d6748b5..c7276821a 100644
--- a/src/models/Service.js
+++ b/src/models/Service.js
@@ -58,7 +58,12 @@ export default class Service {
 
   @computed get url() {
     if (this.recipe.hasCustomUrl && this.customUrl) {
-      let url = normalizeUrl(this.customUrl);
+      let url;
+      try {
+        url = normalizeUrl(this.customUrl);
+      } catch (err) {
+        console.error(`Service (${this.recipe.name}): '${this.customUrl}' is not a valid Url.`);
+      }
 
       if (typeof this.recipe.buildUrl === 'function') {
         url = this.recipe.buildUrl(url);