From fcce56c0837e66913872ed0a63ff43771f6f664a Mon Sep 17 00:00:00 2001 From: Ruud Date: Mon, 12 Sep 2011 21:51:14 +0200 Subject: [PATCH] Updater css Size calc --- couchpotato/core/event.py | 3 --- couchpotato/core/plugins/movie/static/movie.css | 3 ++- couchpotato/core/plugins/movie/static/movie.js | 2 ++ couchpotato/core/providers/base.py | 8 ++++---- couchpotato/static/style/main.css | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/couchpotato/core/event.py b/couchpotato/core/event.py index f1be5822..ecbf7db3 100644 --- a/couchpotato/core/event.py +++ b/couchpotato/core/event.py @@ -27,9 +27,6 @@ def addEvent(name, handler, priority = 0): return h - if name == 'app.initialize': - print 'test', priority - e.handle(createHandle, priority = priority) def removeEvent(name, handler): diff --git a/couchpotato/core/plugins/movie/static/movie.css b/couchpotato/core/plugins/movie/static/movie.css index ff5fd6a9..067ebfd7 100644 --- a/couchpotato/core/plugins/movie/static/movie.css +++ b/couchpotato/core/plugins/movie/static/movie.css @@ -1,6 +1,7 @@ /* @override http://localhost:5000/static/movie_plugin/movie.css http://192.168.1.20:5000/static/movie_plugin/movie.css + http://127.0.0.1:5000/static/movie_plugin/movie.css */ .movies { @@ -186,7 +187,7 @@ width: 120px; } .movies .options .releases .name { - width: 420px; + width: 360px; overflow: hidden; text-align: left; padding: 0 10px; diff --git a/couchpotato/core/plugins/movie/static/movie.js b/couchpotato/core/plugins/movie/static/movie.js index ca90223c..98d7c51e 100644 --- a/couchpotato/core/plugins/movie/static/movie.js +++ b/couchpotato/core/plugins/movie/static/movie.js @@ -223,6 +223,7 @@ var ReleaseAction = new Class({ new Element('div.item.head').adopt( new Element('span.name', {'text': 'Release name'}), new Element('span.quality', {'text': 'Quality'}), + new Element('span.size', {'text': 'Size (MB)'}), new Element('span.age', {'text': 'Age'}), new Element('span.score', {'text': 'Score'}), new Element('span.provider', {'text': 'Provider'}) @@ -234,6 +235,7 @@ var ReleaseAction = new Class({ }).adopt( new Element('span.name', {'text': self.get(release, 'name'), 'title': self.get(release, 'name')}), new Element('span.quality', {'text': release.quality.label}), + new Element('span.size', {'text': (self.get(release, 'size') || 'unknown')}), new Element('span.age', {'text': self.get(release, 'age')}), new Element('span.score', {'text': self.get(release, 'score')}), new Element('span.provider', {'text': self.get(release, 'provider')}), diff --git a/couchpotato/core/providers/base.py b/couchpotato/core/providers/base.py index 7e08440c..332a9896 100644 --- a/couchpotato/core/providers/base.py +++ b/couchpotato/core/providers/base.py @@ -76,19 +76,19 @@ class YarrProvider(Provider): def parseSize(self, size): sizeRaw = size.lower() - size = re.sub(r'[^0-9.]', '', size).strip() + size = float(re.sub(r'[^0-9.]', '', size).strip()) for s in self.sizeGb: if s in sizeRaw: - return float(size) * 1024 + return int(size) * 1024 for s in self.sizeMb: if s in sizeRaw: - return float(size) + return int(size) for s in self.sizeKb: if s in sizeRaw: - return float(size) / 1024 + return int(size) / 1024 return 0 diff --git a/couchpotato/static/style/main.css b/couchpotato/static/style/main.css index 232a8c7d..93e97876 100644 --- a/couchpotato/static/style/main.css +++ b/couchpotato/static/style/main.css @@ -213,7 +213,7 @@ form { color: #b1d8dc; } - .header .message { + .header .message.update { text-align: center; position: relative; top: -70px;