Commit f16d36a8 authored by echel0n's avatar echel0n
Browse files

Merge branch 'release/9.3.83'

parents 834d9de2 7891d450
# Changelog
- * 69efb12 - 2018-10-13: Release v9.3.82
- * c242871 - 2018-10-13: Release v9.3.83
- * 83e5033 - 2018-10-13: Fixed issue with adding shows from Trakt and IMDB not showing
- * 256f26b - 2018-10-13: Pre-Release v9.3.83.dev1
- * 2aa5b96 - 2018-10-13: Testing fix for "unsupported operand type" during BTN provider search
- * 536c3ba - 2018-10-13: Release v9.3.82
- * a120b3e - 2018-10-13: Fixed issue with re-scanning existing show episodes that do not contain the show name in the filename
- * a216e2b - 2018-10-13: Fixed issue with displaying provider icons for custom providers
- * f29e97d - 2018-10-12: Release v9.3.81
......
......@@ -208,13 +208,14 @@ def pickBestResult(results, show):
# quality definition video file size constraints check
try:
quality_size = sickrage.app.config.quality_sizes[cur_result.quality]
file_size = float(cur_result.size / 1000000)
if file_size > quality_size:
raise Exception(
"Ignoring " + cur_result.name + " with size: {} based on quality size filter: {}".format(
file_size, quality_size)
)
if cur_result.size:
quality_size = sickrage.app.config.quality_sizes[cur_result.quality]
file_size = float(cur_result.size / 1000000)
if file_size > quality_size:
raise Exception(
"Ignoring " + cur_result.name + " with size: {} based on quality size filter: {}".format(
file_size, quality_size)
)
except Exception as e:
sickrage.app.log.info(str(e))
continue
......
......@@ -39,10 +39,7 @@
</div>
<div class="card-body">
<% imdb_tt = {show.imdbid for show in sickrage.app.showlist if show.imdbid} %>
<div class="loading-spinner text-center">
<i class="fas fa-10x fa-spinner fa-spin fa-fw"></i>
</div>
<div class="show-grid mx-auto d-none">
<div class="show-grid mx-auto">
% if not popular_shows:
<div class="trakt_show" style="width:100%; margin-top:20px">
<p class="red-text">
......
......@@ -79,10 +79,7 @@
<p class="red-text">${_('Trakt API did not return any results, please check your config.')}
</div>
% else:
<div class="loading-spinner text-center">
<i class="fas fa-10x fa-spinner fa-spin fa-fw"></i>
</div>
<div class="show-grid mx-auto d-none">
<div class="show-grid mx-auto">
% for cur_show in trakt_shows:
<% indexer_id = cur_show.ids['tvdb'] %>
<% show_url = 'http://www.trakt.tv/shows/%s' % cur_show.ids['slug'] %>
......
......@@ -2,8 +2,8 @@ msgid ""
msgstr ""
"Project-Id-Version: sickragetv\n"
"Report-Msgid-Bugs-To: [email protected]\n"
"POT-Creation-Date: 2018-10-13 16:06-0700\n"
"PO-Revision-Date: 2018-10-13 23:06\n"
"POT-Creation-Date: 2018-10-13 18:52-0700\n"
"PO-Revision-Date: 2018-10-14 01:52\n"
"Last-Translator: echel0n <[email protected]>\n"
"Language-Team: Arabic\n"
"MIME-Version: 1.0\n"
......@@ -89,7 +89,7 @@ msgstr "تقليم التاريخ"
msgid "Are you sure you want to trim all download history older than 30 days ?"
msgstr "هل أنت متأكد من أنك تريد تقليم كل حمل التاريخ الأقدم من 30 يوما؟"
#: sickrage/core/webserver/views/home/trakt_shows.mako:114 src/js/core.js:2171
#: sickrage/core/webserver/views/home/trakt_shows.mako:111 src/js/core.js:2171
msgid "Remove Show"
msgstr "إزالة عرض"
......@@ -5018,16 +5018,16 @@ msgstr "Asc"
msgid "Desc"
msgstr "تنازلي"
#: sickrage/core/webserver/views/home/imdb_shows.mako:49
#: sickrage/core/webserver/views/home/imdb_shows.mako:46
msgid "Fetching of IMDB Data failed. Are you online?"
msgstr "فشل في إحضار بيانات IMDB. هل أنت على الإنترنت؟"
#: sickrage/core/webserver/views/home/imdb_shows.mako:50
#: sickrage/core/webserver/views/home/imdb_shows.mako:47
msgid "Exception:"
msgstr "استثناء:"
#: sickrage/core/webserver/views/home/imdb_shows.mako:88
#: sickrage/core/webserver/views/home/trakt_shows.mako:111
#: sickrage/core/webserver/views/home/imdb_shows.mako:85
#: sickrage/core/webserver/views/home/trakt_shows.mako:108
msgid "Add Show"
msgstr "إضافة عرض"
......
......@@ -2,8 +2,8 @@ msgid ""
msgstr ""
"Project-Id-Version: sickragetv\n"
"Report-Msgid-Bugs-To: [email protected]\n"
"POT-Creation-Date: 2018-10-13 16:06-0700\n"
"PO-Revision-Date: 2018-10-13 23:06\n"
"POT-Creation-Date: 2018-10-13 18:52-0700\n"
"PO-Revision-Date: 2018-10-14 01:52\n"
"Last-Translator: echel0n <[email protected]>\n"
"Language-Team: Catalan\n"
"MIME-Version: 1.0\n"
......@@ -89,7 +89,7 @@ msgstr "Retallar la història"
msgid "Are you sure you want to trim all download history older than 30 days ?"
msgstr "Són vostè segur que vol retallar tot descarregar història més de 30 dies?"
#: sickrage/core/webserver/views/home/trakt_shows.mako:114 src/js/core.js:2171
#: sickrage/core/webserver/views/home/trakt_shows.mako:111 src/js/core.js:2171
msgid "Remove Show"
msgstr "Treure Mostra el"
......@@ -5018,16 +5018,16 @@ msgstr "ASC"
msgid "Desc"
msgstr "Desc"
#: sickrage/core/webserver/views/home/imdb_shows.mako:49
#: sickrage/core/webserver/views/home/imdb_shows.mako:46
msgid "Fetching of IMDB Data failed. Are you online?"
msgstr "Obtenció d'IMDB dades ha fallat. Esteu en línia?"
#: sickrage/core/webserver/views/home/imdb_shows.mako:50
#: sickrage/core/webserver/views/home/imdb_shows.mako:47
msgid "Exception:"
msgstr "Excepció:"
#: sickrage/core/webserver/views/home/imdb_shows.mako:88
#: sickrage/core/webserver/views/home/trakt_shows.mako:111
#: sickrage/core/webserver/views/home/imdb_shows.mako:85
#: sickrage/core/webserver/views/home/trakt_shows.mako:108
msgid "Add Show"
msgstr "Afegir Mostra el"
......
......@@ -2,8 +2,8 @@ msgid ""
msgstr ""
"Project-Id-Version: sickragetv\n"
"Report-Msgid-Bugs-To: [email protected]\n"
"POT-Creation-Date: 2018-10-13 16:06-0700\n"
"PO-Revision-Date: 2018-10-13 23:07\n"
"POT-Creation-Date: 2018-10-13 18:52-0700\n"
"PO-Revision-Date: 2018-10-14 01:52\n"
"Last-Translator: echel0n <[email protected]>\n"
"Language-Team: Czech\n"
"MIME-Version: 1.0\n"
......@@ -89,7 +89,7 @@ msgstr "Střih historie"
msgid "Are you sure you want to trim all download history older than 30 days ?"
msgstr "Jsou si jisti, že chcete oříznout všechny stáhnout historie starší než 30 dnů?"
#: sickrage/core/webserver/views/home/trakt_shows.mako:114 src/js/core.js:2171
#: sickrage/core/webserver/views/home/trakt_shows.mako:111 src/js/core.js:2171
msgid "Remove Show"
msgstr "Odstranit Show"
......@@ -5018,16 +5018,16 @@ msgstr "ASC"
msgid "Desc"
msgstr "DESC"
#: sickrage/core/webserver/views/home/imdb_shows.mako:49
#: sickrage/core/webserver/views/home/imdb_shows.mako:46
msgid "Fetching of IMDB Data failed. Are you online?"
msgstr "Načítání z IMDB dat se nezdařilo. Jste online?"
#: sickrage/core/webserver/views/home/imdb_shows.mako:50
#: sickrage/core/webserver/views/home/imdb_shows.mako:47
msgid "Exception:"
msgstr "Výjimka:"
#: sickrage/core/webserver/views/home/imdb_shows.mako:88
#: sickrage/core/webserver/views/home/trakt_shows.mako:111
#: sickrage/core/webserver/views/home/imdb_shows.mako:85
#: sickrage/core/webserver/views/home/trakt_shows.mako:108
msgid "Add Show"
msgstr "Přidat Zobrazit"
......
......@@ -2,8 +2,8 @@ msgid ""
msgstr ""
"Project-Id-Version: sickragetv\n"
"Report-Msgid-Bugs-To: [email protected]\n"
"POT-Creation-Date: 2018-10-13 16:06-0700\n"
"PO-Revision-Date: 2018-10-13 23:07\n"
"POT-Creation-Date: 2018-10-13 18:52-0700\n"
"PO-Revision-Date: 2018-10-14 01:52\n"
"Last-Translator: echel0n <[email protected]>\n"
"Language-Team: Danish\n"
"MIME-Version: 1.0\n"
......@@ -89,7 +89,7 @@ msgstr "Trim historie"
msgid "Are you sure you want to trim all download history older than 30 days ?"
msgstr "Er du sikker på du vil trimme alle overførselsoversigt ældre end 30 dage?"
#: sickrage/core/webserver/views/home/trakt_shows.mako:114 src/js/core.js:2171
#: sickrage/core/webserver/views/home/trakt_shows.mako:111 src/js/core.js:2171
msgid "Remove Show"
msgstr "Fjerne Show"
......@@ -5018,16 +5018,16 @@ msgstr "ASC"
msgid "Desc"
msgstr "/ / Beskr"
#: sickrage/core/webserver/views/home/imdb_shows.mako:49
#: sickrage/core/webserver/views/home/imdb_shows.mako:46
msgid "Fetching of IMDB Data failed. Are you online?"
msgstr "Hentning af IMDB Data mislykkedes. Er du online?"
#: sickrage/core/webserver/views/home/imdb_shows.mako:50
#: sickrage/core/webserver/views/home/imdb_shows.mako:47
msgid "Exception:"
msgstr "Undtagelse:"
#: sickrage/core/webserver/views/home/imdb_shows.mako:88
#: sickrage/core/webserver/views/home/trakt_shows.mako:111
#: sickrage/core/webserver/views/home/imdb_shows.mako:85
#: sickrage/core/webserver/views/home/trakt_shows.mako:108
msgid "Add Show"
msgstr "Tilføje Show"
......
......@@ -2,8 +2,8 @@ msgid ""
msgstr ""
"Project-Id-Version: sickragetv\n"
"Report-Msgid-Bugs-To: [email protected]\n"
"POT-Creation-Date: 2018-10-13 16:06-0700\n"
"PO-Revision-Date: 2018-10-13 23:07\n"
"POT-Creation-Date: 2018-10-13 18:52-0700\n"
"PO-Revision-Date: 2018-10-14 01:53\n"
"Last-Translator: echel0n <[email protected]>\n"
"Language-Team: German\n"
"MIME-Version: 1.0\n"
......@@ -89,7 +89,7 @@ msgstr "Schneiden Sie Geschichte"
msgid "Are you sure you want to trim all download history older than 30 days ?"
msgstr "Sind Sie sicher, dass Sie alle zuschneiden möchten Geschichte älter als 30 Tage download?"
#: sickrage/core/webserver/views/home/trakt_shows.mako:114 src/js/core.js:2171
#: sickrage/core/webserver/views/home/trakt_shows.mako:111 src/js/core.js:2171
msgid "Remove Show"
msgstr "Entfernen Sie Show"
......@@ -5018,16 +5018,16 @@ msgstr "ASC"
msgid "Desc"
msgstr "DESC"
#: sickrage/core/webserver/views/home/imdb_shows.mako:49
#: sickrage/core/webserver/views/home/imdb_shows.mako:46
msgid "Fetching of IMDB Data failed. Are you online?"
msgstr "Fehler beim Abrufen der IMDB Daten. Sind Sie online?"
#: sickrage/core/webserver/views/home/imdb_shows.mako:50
#: sickrage/core/webserver/views/home/imdb_shows.mako:47
msgid "Exception:"
msgstr "Ausnahme:"
#: sickrage/core/webserver/views/home/imdb_shows.mako:88
#: sickrage/core/webserver/views/home/trakt_shows.mako:111
#: sickrage/core/webserver/views/home/imdb_shows.mako:85
#: sickrage/core/webserver/views/home/trakt_shows.mako:108
msgid "Add Show"
msgstr "-Show hinzufügen"
......
......@@ -2,8 +2,8 @@ msgid ""
msgstr ""
"Project-Id-Version: sickragetv\n"
"Report-Msgid-Bugs-To: [email protected]\n"
"POT-Creation-Date: 2018-10-13 16:06-0700\n"
"PO-Revision-Date: 2018-10-13 23:07\n"
"POT-Creation-Date: 2018-10-13 18:52-0700\n"
"PO-Revision-Date: 2018-10-14 01:53\n"
"Last-Translator: echel0n <[email protected]>\n"
"Language-Team: Greek\n"
"MIME-Version: 1.0\n"
......@@ -89,7 +89,7 @@ msgstr "Τελειώματα ιστορία"
msgid "Are you sure you want to trim all download history older than 30 days ?"
msgstr "Είναι βέβαιοι ότι θέλετε να τακτοποιήσει όλων κατεβάσετε ιστορία που είναι παλαιότερες από 30 ημέρες;"
#: sickrage/core/webserver/views/home/trakt_shows.mako:114 src/js/core.js:2171
#: sickrage/core/webserver/views/home/trakt_shows.mako:111 src/js/core.js:2171
msgid "Remove Show"
msgstr "Καταργήσετε Show"
......@@ -5018,16 +5018,16 @@ msgstr "ASC"
msgid "Desc"
msgstr "Desc"
#: sickrage/core/webserver/views/home/imdb_shows.mako:49
#: sickrage/core/webserver/views/home/imdb_shows.mako:46
msgid "Fetching of IMDB Data failed. Are you online?"
msgstr "Απέτυχε η ανάκτηση δεδομένων IMDB. Είστε σε απευθείας σύνδεση;"
#: sickrage/core/webserver/views/home/imdb_shows.mako:50
#: sickrage/core/webserver/views/home/imdb_shows.mako:47
msgid "Exception:"
msgstr "Εξαίρεση:"
#: sickrage/core/webserver/views/home/imdb_shows.mako:88
#: sickrage/core/webserver/views/home/trakt_shows.mako:111
#: sickrage/core/webserver/views/home/imdb_shows.mako:85
#: sickrage/core/webserver/views/home/trakt_shows.mako:108
msgid "Add Show"
msgstr "Προσθήκη Εμφάνιση"
......
......@@ -2,8 +2,8 @@ msgid ""
msgstr ""
"Project-Id-Version: sickragetv\n"
"Report-Msgid-Bugs-To: [email protected]\n"
"POT-Creation-Date: 2018-10-13 16:06-0700\n"
"PO-Revision-Date: 2018-10-13 23:07\n"
"POT-Creation-Date: 2018-10-13 18:52-0700\n"
"PO-Revision-Date: 2018-10-14 01:53\n"
"Last-Translator: echel0n <[email protected]>\n"
"Language-Team: English\n"
"MIME-Version: 1.0\n"
......@@ -89,7 +89,7 @@ msgstr "Trim History"
msgid "Are you sure you want to trim all download history older than 30 days ?"
msgstr "Are you sure you want to trim all download history older than 30 days ?"
#: sickrage/core/webserver/views/home/trakt_shows.mako:114 src/js/core.js:2171
#: sickrage/core/webserver/views/home/trakt_shows.mako:111 src/js/core.js:2171
msgid "Remove Show"
msgstr "Remove Show"
......@@ -5018,16 +5018,16 @@ msgstr "Asc"
msgid "Desc"
msgstr "Desc"
#: sickrage/core/webserver/views/home/imdb_shows.mako:49
#: sickrage/core/webserver/views/home/imdb_shows.mako:46
msgid "Fetching of IMDB Data failed. Are you online?"
msgstr "Fetching of IMDB Data failed. Are you online?"
#: sickrage/core/webserver/views/home/imdb_shows.mako:50
#: sickrage/core/webserver/views/home/imdb_shows.mako:47
msgid "Exception:"
msgstr "Exception:"
#: sickrage/core/webserver/views/home/imdb_shows.mako:88
#: sickrage/core/webserver/views/home/trakt_shows.mako:111
#: sickrage/core/webserver/views/home/imdb_shows.mako:85
#: sickrage/core/webserver/views/home/trakt_shows.mako:108
msgid "Add Show"
msgstr "Add Show"
......
......@@ -2,8 +2,8 @@ msgid ""
msgstr ""
"Project-Id-Version: sickragetv\n"
"Report-Msgid-Bugs-To: [email protected]\n"
"POT-Creation-Date: 2018-10-13 16:06-0700\n"
"PO-Revision-Date: 2018-10-13 23:09\n"
"POT-Creation-Date: 2018-10-13 18:52-0700\n"
"PO-Revision-Date: 2018-10-14 01:54\n"
"Last-Translator: echel0n <[email protected]>\n"
"Language-Team: Spanish\n"
"MIME-Version: 1.0\n"
......@@ -89,7 +89,7 @@ msgstr "Historia del ajuste"
msgid "Are you sure you want to trim all download history older than 30 days ?"
msgstr "¿Está usted seguro de que desea recortar a todos descarga más de 30 días de la historia?"
#: sickrage/core/webserver/views/home/trakt_shows.mako:114 src/js/core.js:2171
#: sickrage/core/webserver/views/home/trakt_shows.mako:111 src/js/core.js:2171
msgid "Remove Show"
msgstr "Quitar Mostrar"
......@@ -5018,16 +5018,16 @@ msgstr "ASC"
msgid "Desc"
msgstr "DESC"
#: sickrage/core/webserver/views/home/imdb_shows.mako:49
#: sickrage/core/webserver/views/home/imdb_shows.mako:46
msgid "Fetching of IMDB Data failed. Are you online?"
msgstr "Obtención de datos de IMDB no. ¿Es online?"
#: sickrage/core/webserver/views/home/imdb_shows.mako:50
#: sickrage/core/webserver/views/home/imdb_shows.mako:47
msgid "Exception:"
msgstr "Excepción:"
#: sickrage/core/webserver/views/home/imdb_shows.mako:88
#: sickrage/core/webserver/views/home/trakt_shows.mako:111
#: sickrage/core/webserver/views/home/imdb_shows.mako:85
#: sickrage/core/webserver/views/home/trakt_shows.mako:108
msgid "Add Show"
msgstr "Añadir espectáculo"
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment