From 77785173bf79b3b11ba8106c1a636a91533405bf Mon Sep 17 00:00:00 2001
From: Nicholas Orr <nicholas.orr@zxgen.net>
Date: Wed, 29 Apr 2015 01:31:04 +0800
Subject: [PATCH] Add direct URL to files

Ability to download files directly via pre-configured webserver. Simply
supply the base URL and links will be added to each file in the details
section.
---
 configuration.js       |  3 ++-
 css/download.css       |  3 +++
 index.html             | 21 ++++++++++++++++++++-
 js/ctrls/main.js       |  8 ++++++++
 js/filters/url.js      |  4 ++++
 js/init.js             |  2 +-
 js/services/rpc/rpc.js |  3 +++
 7 files changed, 41 insertions(+), 3 deletions(-)
 create mode 100644 js/filters/url.js

diff --git a/configuration.js b/configuration.js
index 8d1d9a9..e845075 100644
--- a/configuration.js
+++ b/configuration.js
@@ -12,7 +12,8 @@ angular
   /*-----------------------------*/
   // user: '*YOUR_USERNAME*',
   // pass: '*YOUR_SECRET_PASS*'
-  }
+  },
+  directURL: ''                   // If supplied, links will be created to enable direct download from the aria2 server, requires appropriate webserver to be configured
 })
 .constant('$enable', {
 
diff --git a/css/download.css b/css/download.css
index 2f42954..6b9c24d 100755
--- a/css/download.css
+++ b/css/download.css
@@ -100,3 +100,6 @@
   overflow: hidden;
   text-overflow: ellipsis;
 }
+.download-files a {
+  color: #fff;
+}
diff --git a/index.html b/index.html
index b5a3da8..bf7d97c 100755
--- a/index.html
+++ b/index.html
@@ -44,6 +44,7 @@
   <script src="js/directives/fselect.js"></script>
 
   <script src="js/filters/bytes.js"></script>
+  <script src="js/filters/url.js"></script>
 
   <script src="js/services/deps.js"></script>
   <script src="js/services/base64.js"></script>
@@ -584,7 +585,10 @@
             <li class="label label-default" title="Download Path"><i class="fa fa-fw fa-folder-open">&nbsp;</i> <span class="download-dir">{{download.dir}}</span></li>
           </ul>
           <ul class="download-files hidden-phone download-item">
-            <li class="label label-default" ng-repeat="file in download.files" ng-class="{'label-success': file.selected}">{{file.relpath}} ({{file.fmtLength}})</li>
+            <li class="label label-default" ng-repeat="file in download.files" ng-class="{'label-success': file.selected}">
+              <a ng-if="hasDirectURL()" ng-click="$event.stopPropagation()" ng-href="{{getDirectURL()}}{{file.relpath | encodeURI}}" target="download">{{file.relpath}} ({{file.fmtLength}})</a>
+              <span ng-if="!hasDirectURL()">{{file.relpath}} ({{file.fmtLength}})</span>
+            </li>
           </ul>
           <div ng-show="hasStatus(download, 'active')" class="download-item hidden-phone">
             <div class="download-graph" dspeed="download.downloadSpeed" uspeed="download.uploadSpeed" xticks="7" yticks="7"  dgraph draw="!download.collapsed"></div>
@@ -988,6 +992,21 @@ http://ex1.com/f2.mp4 http://ex2.com/f2.mp4 --out=file2.mp4
           </div>
         </div>
       </fieldset>
+
+      <fieldset>
+        <legend>Direct Download</legend>
+        <div class="form-group">
+          <label class="col-sm-3 control-label">Enter base URL (optional):</label>
+          <div class="col-sm-9 controls">
+            <input type="text" class="form-control input-xlarge"
+              ng-model="connection.conf.directURL"/>
+            <p class="help-block">
+              If supplied, links will be created to enable direct download from the
+              aria2 server, requires appropriate webserver to be configured
+            </p>
+          </div>
+        </div>
+      </fieldset>
     </form>
   </div>
   <div class="modal-footer">
diff --git a/js/ctrls/main.js b/js/ctrls/main.js
index eb4e5b2..bb5dcba 100755
--- a/js/ctrls/main.js
+++ b/js/ctrls/main.js
@@ -357,6 +357,14 @@ function(
 		return downloads;
 	}
 
+	scope.hasDirectURL = function() {
+		return rpc.getDirectURL() != '';
+	}
+
+	scope.getDirectURL = function() {
+		return rpc.getDirectURL();
+	}
+
 	// convert the donwload form aria2 to once used by the view,
 	// minor additions of some fields and checks
 	scope.getCtx = function(d, ctx) {
diff --git a/js/filters/url.js b/js/filters/url.js
new file mode 100644
index 0000000..19485e9
--- /dev/null
+++ b/js/filters/url.js
@@ -0,0 +1,4 @@
+angular.module('webui.filters.url', ["webui.services.utils"])
+.filter('encodeURI', function() {
+  return window.encodeURIComponent;
+});
diff --git a/js/init.js b/js/init.js
index 126cafe..7ac8b76 100755
--- a/js/init.js
+++ b/js/init.js
@@ -3,7 +3,7 @@ var webui = angular.module('webui', [
   'webui.services.configuration', 'webui.services.rpc',
   'webui.services.modals', 'webui.services.alerts',
   'webui.services.settings', 'webui.services.settings.filters',
-  'webui.filters.bytes',
+  'webui.filters.bytes','webui.filters.url',
   'webui.directives.chunkbar', 'webui.directives.dgraph', 'webui.directives.fselect',
   'webui.ctrls.download', 'webui.ctrls.nav', 'webui.ctrls.modal', 'webui.ctrls.alert',
   'webui.ctrls.props',
diff --git a/js/services/rpc/rpc.js b/js/services/rpc/rpc.js
index 7269033..d234c7f 100644
--- a/js/services/rpc/rpc.js
+++ b/js/services/rpc/rpc.js
@@ -171,6 +171,9 @@ function(syscall, time, alerts, utils, rootScope, uri, authconf) {
     // get current configuration being used
     getConfiguration: function() { return currentConf },
 
+    // get currently configured directURL
+    getDirectURL : function() { return currentConf.directURL },
+    
     // syscall is done only once, delay is optional
     // and pass true to only dispatch it in the global timeout
     // which can be used to batch up once calls