summaryrefslogtreecommitdiffstats
path: root/js/app
diff options
context:
space:
mode:
authorBernhard Posselt <nukeawhale@gmail.com>2013-04-19 12:31:54 +0200
committerBernhard Posselt <nukeawhale@gmail.com>2013-04-19 12:31:54 +0200
commit67e00e798d85d897e4793077aa14bcb4fb3d1765 (patch)
tree1a808c1a9a2330ffc5f201bcf62fb546cc658a7d /js/app
parented3990b46bcb048963bbfcb567656e82d8686796 (diff)
added javascript for uploading google reader json files
Diffstat (limited to 'js/app')
-rw-r--r--js/app/controllers/settingscontroller.coffee12
-rw-r--r--js/app/services/businesslayer/feedbusinesslayer.coffee16
-rw-r--r--js/app/services/persistence.coffee8
3 files changed, 36 insertions, 0 deletions
diff --git a/js/app/controllers/settingscontroller.coffee b/js/app/controllers/settingscontroller.coffee
index a1632a761..ef282c900 100644
--- a/js/app/controllers/settingscontroller.coffee
+++ b/js/app/controllers/settingscontroller.coffee
@@ -37,4 +37,16 @@ angular.module('News').controller 'SettingsController',
console.error error
$scope.error = true
+
+ $scope.importGoogleReader = (fileContent) =>
+ $scope.jsonError = false
+ ShowAll.setShowAll(true)
+
+ try
+ parsedJSON = JSON.parse(fileContent)
+ FeedBusinessLayer.importGoogleReader(parsedJSON)
+ catch error
+ console.error error
+ $scope.jsonError = true
+
] \ No newline at end of file
diff --git a/js/app/services/businesslayer/feedbusinesslayer.coffee b/js/app/services/businesslayer/feedbusinesslayer.coffee
index f02252618..a2fa0df3e 100644
--- a/js/app/services/businesslayer/feedbusinesslayer.coffee
+++ b/js/app/services/businesslayer/feedbusinesslayer.coffee
@@ -172,6 +172,22 @@ FeedModel, NewLoading, _ExistsError, Utils) ->
@_persistence.updateFeed(feed.id)
+ importGoogleReader: (json) ->
+ url = 'http://owncloud/googlereader' # hardcoded
+
+ if angular.isUndefined(@_feedModel.getByUrl(url))
+ feed =
+ title: 'Google Reader'
+ url: url
+ folderId: 0
+ unreadCount: 0
+ faviconLink: 'url('+@_utils.imagePath('core', 'loading.gif')+')'
+
+ @_feedModel.add(feed)
+
+ @_persistence.importGoogleReader(json)
+
+
return new FeedBusinessLayer(ShowAll, FeedModel, Persistence, ActiveFeed,
FeedType, ItemModel, NewLoading, Utils)
diff --git a/js/app/services/persistence.coffee b/js/app/services/persistence.coffee
index 06945f433..88d1d18cc 100644
--- a/js/app/services/persistence.coffee
+++ b/js/app/services/persistence.coffee
@@ -248,6 +248,14 @@ $rootScope) ->
@_request.post 'news_feeds_update', params
+ importGoogleReader: (json) ->
+ params =
+ data:
+ json: json
+
+ @_request.post 'news_feeds_import_googlereader', params
+
+
###
FOLDER CONTROLLER
###