Merge pull request #925 from Martii/Issue-432otherNotices

Readd other notices back in

Auto-merge... retested on local pro as well.

Author: Martii

libs/modelParser.js

@@ -184,6 +184,11 @@ var parseScript = function (aScript) {
   var icon = null;
   var supportURL = null;
 
+  var downloadURL = null;
+  var downloadUtf = null;
+  var rAnySourceUrl = new RegExp('^https?://(?:openuserjs\.org|localhost:' +
+    (process.env.PORT || 8080) + ')/(?:install|scr/scripts)\/(.+?)/(.+?)((?:\.min)?\.user\.js)$');
+
   // Temporaries
   var htmlStub = null;
 
@@ -199,6 +204,7 @@ var parseScript = function (aScript) {
 
   var folders = null;
 
+  var matches = null;
 
   if (!aScript) {
     return;
@@ -362,6 +368,39 @@ var parseScript = function (aScript) {
     script.isUpdated = true;
   }
 
+  // Download Url
+  downloadURL = findMeta(script.meta, 'UserScript.downloadURL.0.value');
+  if (downloadURL) {
+    try {
+      downloadUtf = decodeURIComponent(downloadURL);
+
+    } catch (aE) {
+      script.hasInvalidDownloadURL = true;
+      script.showMinficationNotices = true;
+
+    } finally {
+      if (!script.hasInvalidDownloadURL)  {
+        matches = downloadUtf.match(rAnySourceUrl);
+
+        if (matches) {
+          if (matches[1].toLowerCase() === script.authorSlug.toLowerCase() &&
+            matches[2] === script.nameSlug) {
+
+            if (matches[3] === '.user.js') {
+              script.hasAlternateDownloadURL = true;
+            }
+          } else {
+            script.hasAlternateDownloadURL = true;
+            script.showMinficationNotices = true;
+          }
+        } else {
+          script.hasAlternateDownloadURL = true;
+          script.showMinficationNotices = true;
+        }
+      }
+    }
+  }
+
   return script;
 };
 parseModelFnMap.Script = parseScript;

views/includes/scriptPageHeader.html

@@ -12,15 +12,25 @@ <h2 class="page-heading">
       <ul class="dropdown-menu">
         <li>
           <div class="btn-group btn-group-justified">
-            <a href="{{{script.scriptInstallPageXUrl}}}.min.user.js" class="btn btn-{{#script.showMinficationNotices}}warning{{/script.showMinficationNotices}}{{^script.showMinficationNotices}}primary{{/script.showMinficationNotices}}" title="EXPERIMENTAL INSTALLATION FORKING"><i class="fa fa-fw fa-download"></i> Install with minification</a>
+            <a href="{{{script.scriptInstallPageXUrl}}}.min.user.js" class="btn btn-{{#script.showMinficationNotices}}warning{{/script.showMinficationNotices}}{{^script.showMinficationNotices}}primary{{/script.showMinficationNotices}}" title="EXPERIMENTAL INSTALLATION FORKING"><i class="fa fa-fw fa-download"></i> Install {{#script.hasAlternateDownloadURL}}once {{/script.hasAlternateDownloadURL}} with minification</a>
           </div>
           {{#script.showMinficationNotices}}
           <div class="alert alert-warning" role="alert">
+            {{#script.hasInvalidDownloadURL}}
+              <p>
+                <i class="fa fa-fw fa-exclamation"></i> Invalid download target
+              </p>
+            {{/script.hasInvalidDownloadURL}}
             {{#script.hasUnstableMinify}}
               <p>
                 <i class="fa fa-fw fa-exclamation-triangle"></i> The script author suggests that minification of this script may be unstable.
               <p>
             {{/script.hasUnstableMinify}}
+            {{#script.hasAlternateDownloadURL}}
+              <p>
+                <i class="fa fa-fw fa-exclamation-triangle"></i> Alternate download target.
+              </p>
+            {{/script.hasAlternateDownloadURL}}
           </div>
           {{/script.showMinficationNotices}}
         </li>