Refactored uTorrentService -> torrentServerService

psychowood · Apr 25, 2016 · 35c3b60 · 35c3b60
1 parent 0f6724f
commit 35c3b60
Show file tree

Hide file tree

Showing 8 changed files with 47 additions and 47 deletions.
diff --git a/app/scripts/app.js b/app/scripts/app.js
@@ -76,7 +76,7 @@ angular
         };
       })
     */
-    .controller('NavController', function($scope, uTorrentService, $http, $cookies, $log, $translate, translationsLoader, $rootScope) {
+    .controller('NavController', function($scope, torrentServerService, $http, $cookies, $log, $translate, translationsLoader, $rootScope) {
 
         translationsLoader('getoptions').then(function(options) {
             var langId, lang;
@@ -215,11 +215,11 @@ angular
 
         $scope.updatedVersion = $cookies.get('updatedVersion');
 
-        uTorrentService.init().then(function() {
-            var ts = uTorrentService.actions().getsettings();
+        torrentServerService.init().then(function() {
+            var ts = torrentServerService.actions().getsettings();
             ts.$promise.then(function() {
-                $rootScope.features = uTorrentService.supports;
-                $rootScope.serverVersion = uTorrentService.getVersion();
+                $rootScope.features = torrentServerService.supports;
+                $rootScope.serverVersion = torrentServerService.getVersion();
             });
             return ts;
         }, function() {

diff --git a/app/scripts/controllers/about.js b/app/scripts/controllers/about.js
@@ -8,6 +8,6 @@
  * Controller of the ngTorrentUiApp
  */
  angular.module('ngTorrentUiApp')
- .controller('AboutCtrl', function ($scope,uTorrentService) {
- 	$scope.url = uTorrentService.url;
+ .controller('AboutCtrl', function ($scope,torrentServerService) {
+ 	$scope.url = torrentServerService.url;
  });
diff --git a/app/scripts/controllers/details-dialog.js b/app/scripts/controllers/details-dialog.js
@@ -8,7 +8,7 @@
  * Controller of the ngTorrentUiApp
  */
 angular.module('ngTorrentUiApp')
-    .controller('DetailsDialogCtrl', function($scope, torrent, uTorrentService, toastr, $translate, $window) {
+    .controller('DetailsDialogCtrl', function($scope, torrent, torrentServerService, toastr, $translate, $window) {
         $scope.hasSelection = false;
 
         $scope.filters = {
@@ -57,7 +57,7 @@ angular.module('ngTorrentUiApp')
                     fileIndexes.push(torrent.files[i].hash);
                 }
             }
-            uTorrentService.filePriority().set({
+            torrentServerService.filePriority().set({
                 hash: torrent.hash,
                 priority: $scope.priorityToSet,
                 f: fileIndexes

diff --git a/app/scripts/controllers/issue-reporter.js b/app/scripts/controllers/issue-reporter.js
@@ -8,15 +8,15 @@
  * Controller of the ngTorrentUiApp
  */
 angular.module('ngTorrentUiApp')
-    .controller('IssueReporterCtrl', function($scope, uTorrentService, $window) {
+    .controller('IssueReporterCtrl', function($scope, torrentServerService, $window) {
         var newIssueBaseUrl = 'https://github.com/psychowood/ng-torrent-ui/issues/new/';
         var newMailBaseUrl = 'mailto:ng' + 'torrent' + 'ui' + '@' + 'gmail.com';
         $scope.newIssueUrl = newIssueBaseUrl;
-        // uTorrentService.init().then(function(){
+        // torrentServerService.init().then(function(){
         // });
 
         var getBody = function() {
-            var version = uTorrentService.getVersion();
+            var version = torrentServerService.getVersion();
             return 'Describe your issue here' +
                 '%0A' +
                 '%0A' +

diff --git a/app/scripts/controllers/main.js b/app/scripts/controllers/main.js
@@ -9,7 +9,7 @@
  * Controller of the ngTorrentUiApp
  */
 angular.module('ngTorrentUiApp')
-    .controller('TorrentsCtrl', function($scope, $window, $uibModal, $filter, $timeout, $log, uTorrentService, Torrent, toastr, $cookies) {
+    .controller('TorrentsCtrl', function($scope, $window, $uibModal, $filter, $timeout, $log, torrentServerService, Torrent, toastr, $cookies) {
 
         $scope.headerHeight = 350;
         // On window resize => resize the app
@@ -71,7 +71,7 @@ angular.module('ngTorrentUiApp')
         $scope.filteredtorrents = [];
         $scope.selectedtorrents = [];
 
-        var torrentsMap = uTorrentService.cacheMap;
+        var torrentsMap = torrentServerService.cacheMap;
         var reloadTimeout;
         $scope.autoreloadTimeout = 5000;
         $scope.autoreloadEnabled = ($scope.autoreloadTimeout > 0);
@@ -125,14 +125,14 @@ angular.module('ngTorrentUiApp')
         $scope.addTorrentFilesOrUrl = function(urlOrFiles) {
             var add = function(dir, subpath) {
                 if (typeof urlOrFiles === 'string') {
-                    uTorrentService.addTorrentUrl(urlOrFiles, dir, subpath).then(function() {
+                    torrentServerService.addTorrentUrl(urlOrFiles, dir, subpath).then(function() {
                         toastr.info('Torrent added succesfully', null, {
                             timeOut: 1000
                         });
                         $scope.newtorrent = '';
                     });
                 } else {
-                    if (uTorrentService.uploadTorrent) {
+                    if (torrentServerService.uploadTorrent) {
                         var i, success = 0;
                         var callback = function( /* data, status, headers, config */ ) {
                             success++;
@@ -145,17 +145,17 @@ angular.module('ngTorrentUiApp')
                         };
                         for (i = 0; i < urlOrFiles.length; i++) {
                             var file = urlOrFiles[i];
-                            uTorrentService.uploadTorrent(file, dir, subpath).success(callback);
+                            torrentServerService.uploadTorrent(file, dir, subpath).success(callback);
                         }
                     } else {
-                        toastr.warning('Files upload not supported for ' + uTorrentService.getVersion(), null, {
+                        toastr.warning('Files upload not supported for ' + torrentServerService.getVersion(), null, {
                             timeOut: 2500
                         });
                     }
                 }
             };
-            if (uTorrentService.supports.getDownloadDirectories === true) {
-                uTorrentService.getDownloadDirectories().then(function(directories) {
+            if (torrentServerService.supports.getDownloadDirectories === true) {
+                torrentServerService.getDownloadDirectories().then(function(directories) {
                     $scope.directories = directories;
 
                     var modalInstance = $uibModal.open({
@@ -220,7 +220,7 @@ angular.module('ngTorrentUiApp')
                 return;
             }
 
-            var service = uTorrentService.actions()[action];
+            var service = torrentServerService.actions()[action];
 
             if (service) {
                 var ts = service({
@@ -242,7 +242,7 @@ angular.module('ngTorrentUiApp')
         $scope.setLabel = function(value, item) {
             var hashes = getSelectedHashes(item);
 
-            var service = uTorrentService.setLabel;
+            var service = torrentServerService.setLabel;
             $scope.labelToSet = '';
 
             if (service) {
@@ -294,7 +294,7 @@ angular.module('ngTorrentUiApp')
             modalInstance.result.then(function(starredItems) {
                 var obj = angular.toJson(starredItems);
                 $cookies.put('starredItems', obj);
-                //uTorrentService.setSetting('webui.ngtorrentui.favorites',obj);
+                //torrentServerService.setSetting('webui.ngtorrentui.favorites',obj);
                 $scope.starredItems = starredItems;
             }, function() {
 
@@ -584,7 +584,7 @@ angular.module('ngTorrentUiApp')
             $timeout.cancel(reloadTimeout);
             $log.info('reload torrents');
             //var reloadingMsg = toastr.info('Refreshing torrents...',null,{timeOut: 0});
-            var ts = uTorrentService.torrents().list();
+            var ts = torrentServerService.torrents().list();
 
             //var ptn = $window.ptn;
 
@@ -646,7 +646,7 @@ angular.module('ngTorrentUiApp')
                         $scope.torrents.push(value);
                     });
                     $scope.doFilter();
-                    uTorrentService.cacheMap = torrentsMap;
+                    torrentServerService.cacheMap = torrentsMap;
                     $scope.selectedtorrents = getSelectedAndUpdateGlobals($scope.torrents);
                 } else {
                     $log.debug('no changes');
@@ -827,7 +827,7 @@ angular.module('ngTorrentUiApp')
 
         $scope.$on('$destroy', function() {});
 
-        uTorrentService.init().then(function() {
+        torrentServerService.init().then(function() {
             $scope.reload();
         }, function() {
             $log.error('error', arguments);

diff --git a/app/scripts/controllers/settings.js b/app/scripts/controllers/settings.js
@@ -8,7 +8,7 @@
  * Controller of the ngTorrentUiApp
  */
 angular.module('ngTorrentUiApp')
-    .controller('SettingsCtrl', function($scope, uTorrentService, $log, $translate, toastr, $timeout, $cookies) {
+    .controller('SettingsCtrl', function($scope, torrentServerService, $log, $translate, toastr, $timeout, $cookies) {
 
         var settings = {
             conf: [],
@@ -29,7 +29,7 @@ angular.module('ngTorrentUiApp')
                 case STARRED_ITEMS:
                     {
                         webcookie.ngtorrentui[STARRED_ITEMS] = $scope[STARRED_ITEMS];
-                        uTorrentService.setSetting('webui.cookie', angular.toJson(webcookie));
+                        torrentServerService.setSetting('webui.cookie', angular.toJson(webcookie));
                     }
                     break;
             }
@@ -171,8 +171,8 @@ angular.module('ngTorrentUiApp')
             return result;
         };
 
-        uTorrentService.init().then(function() {
-            var set = uTorrentService.actions().getsettings();
+        torrentServerService.init().then(function() {
+            var set = torrentServerService.actions().getsettings();
             set.$promise.then(function() {
                 var i;
                 var values = set.sort(function(a, b) {
@@ -210,7 +210,7 @@ angular.module('ngTorrentUiApp')
         });
 
         $scope.saveSetting = function(setting) {
-            var service = uTorrentService.setSetting;
+            var service = torrentServerService.setSetting;
 
             $log.debug('save setting', setting);
 

diff --git a/app/scripts/services/utorrentservice.js b/app/scripts/services/utorrentservice.js
@@ -2,9 +2,9 @@
 
 /**
  * @ngdoc service
- * @name ngTorrentUiApp.uTorrentService
+ * @name ngTorrentUiApp.torrentServerService
  * @description
- * # uTorrentService
+ * # torrentServerService for uTorrent
  * Factory in the ngTorrentUiApp.
  */
 angular.module('ngTorrentUiApp')
@@ -356,7 +356,7 @@ angular.module('ngTorrentUiApp')
          */
         return Torrent;
     })
-    .service('uTorrentService', function($http, $resource, $log, $upload, $q) {
+    .service('torrentServerService', function($http, $resource, $log, $upload, $q) {
 
         var loading = null;
         var data = {
@@ -376,7 +376,7 @@ angular.module('ngTorrentUiApp')
             }
         };
 
-        var uTorrentService = {
+        var torrentServerService = {
             cacheMap: {},
             conf: data,
             init: function() {
@@ -561,12 +561,12 @@ angular.module('ngTorrentUiApp')
                                 };
                                 settings.push(val);
                             }
-                            uTorrentService.settings = settings;
-                            uTorrentService.supports = {};
+                            torrentServerService.settings = settings;
+                            torrentServerService.supports = {};
                             if (parseInt(data.build) > 25406) { //Features supported from uTorrent 3+
-                                uTorrentService.supports.getDownloadDirectories = true;
-                                uTorrentService.supports.torrentAddedDate = true;
-                                uTorrentService.supports.torrentCompletedDate = true;
+                                torrentServerService.supports.getDownloadDirectories = true;
+                                torrentServerService.supports.torrentAddedDate = true;
+                                torrentServerService.supports.torrentCompletedDate = true;
                             }
                             return settings;
                         }
@@ -586,7 +586,7 @@ angular.module('ngTorrentUiApp')
                 });
             },
             setSetting: function(setting, value) {
-                return uTorrentService.setSettings([
+                return torrentServerService.setSettings([
                     [setting, value]
                 ]);
             },
@@ -646,5 +646,5 @@ angular.module('ngTorrentUiApp')
 
             }
         };
-        return uTorrentService;
+        return torrentServerService;
     });
diff --git a/test/spec/services/utorrentservice.js b/test/spec/services/utorrentservice.js
@@ -1,18 +1,18 @@
 'use strict';
 
-describe('Service: uTorrentService', function () {
+describe('Service: torrentServerService', function () {
 
   // load the service's module
   beforeEach(module('ngTorrentUiApp'));
 
   // instantiate service
-  var uTorrentService;
-  beforeEach(inject(function (_uTorrentService_) {
-    uTorrentService = _uTorrentService_;
+  var torrentServerService;
+  beforeEach(inject(function (_torrentServerService_) {
+    torrentServerService = _torrentServerService_;
   }));
 
   it('should do something', function () {
-    expect(!!uTorrentService).toBe(true);
+    expect(!!torrentServerService).toBe(true);
   });
 
 });