From 91c45bad71e5a1604385588dc52b0ddc11a17a56 Mon Sep 17 00:00:00 2001 From: Ruud Date: Thu, 2 May 2013 15:13:57 +0200 Subject: [PATCH] Move source url to api --- couchpotato/core/_base/updater/main.py | 7 +------ couchpotato/core/providers/movie/couchpotatoapi/main.py | 12 ++++++++++-- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/couchpotato/core/_base/updater/main.py b/couchpotato/core/_base/updater/main.py index 2bcfef3..44ceebd 100644 --- a/couchpotato/core/_base/updater/main.py +++ b/couchpotato/core/_base/updater/main.py @@ -254,8 +254,6 @@ class GitUpdater(BaseUpdater): class SourceUpdater(BaseUpdater): - update_url = 'https://couchpota.to/updates/source.php?repo=%s&name=%s&branch=%s' - def __init__(self): # Create version file in cache @@ -263,13 +261,10 @@ class SourceUpdater(BaseUpdater): if not os.path.isfile(self.version_file): self.createFile(self.version_file, json.dumps(self.latestCommit())) - addEvent('app.load', self.doUpdate) - def doUpdate(self): try: - url = self.update_url % (self.repo_user, self.repo_name, self.branch) - download_data = json.loads(self.urlopen(url)) + download_data = fireEvent('cp.source_url', repo = self.repo_user, repo_name = self.repo_name, branch = self.branch, single = True) destination = os.path.join(Env.get('cache_dir'), self.update_version.get('hash')) + '.' + download_data.get('type') extracted_path = os.path.join(Env.get('cache_dir'), 'temp_updater') diff --git a/couchpotato/core/providers/movie/couchpotatoapi/main.py b/couchpotato/core/providers/movie/couchpotatoapi/main.py index 8415c2d..d942da1 100644 --- a/couchpotato/core/providers/movie/couchpotatoapi/main.py +++ b/couchpotato/core/providers/movie/couchpotatoapi/main.py @@ -19,19 +19,27 @@ class CouchPotatoApi(MovieProvider): 'is_movie': 'https://couchpota.to/api/ismovie/%s/', 'eta': 'https://couchpota.to/api/eta/%s/', 'suggest': 'https://couchpota.to/api/suggest/', + 'updater': 'https://couchpota.to/api/updater/?%s', } http_time_between_calls = 0 api_version = 1 def __init__(self): - #addApiView('movie.suggest', self.suggestView) - addEvent('movie.info', self.getInfo, priority = 1) addEvent('movie.search', self.search, priority = 1) addEvent('movie.release_date', self.getReleaseDate) addEvent('movie.suggest', self.suggest) addEvent('movie.is_movie', self.isMovie) + addEvent('cp.source_url', self.getSourceUrl) + + def getSourceUrl(self, repo = None, repo_name = None, branch = None): + return self.getJsonData(self.urls['updater'] % tryUrlencode({ + 'repo': repo, + 'name': repo_name, + 'branch': branch, + }), headers = self.getRequestHeaders()) + def search(self, q, limit = 12): return self.getJsonData(self.urls['search'] % tryUrlencode(q), headers = self.getRequestHeaders())