diff --git a/SickChill.py b/SickChill.py index 361a79e2fb..c259472a9d 100755 --- a/SickChill.py +++ b/SickChill.py @@ -31,12 +31,12 @@ setup_gettext() mimetypes.add_type("text/css", ".css") +# noinspection SpellCheckingInspection mimetypes.add_type("application/sfont", ".otf") +# noinspection SpellCheckingInspection mimetypes.add_type("application/sfont", ".ttf") mimetypes.add_type("application/javascript", ".js") mimetypes.add_type("application/font-woff", ".woff") -# Not sure about this one, but we also have halflings in .woff, so I think it won't matter -# mimetypes.add_type("application/font-woff2", ".woff2") from configobj import ConfigObj @@ -332,7 +332,9 @@ def shutdown(self, event): popen_list = [sys.executable, settings.MY_FULLNAME] if popen_list and not settings.NO_RESTART: popen_list += settings.MY_ARGS + # noinspection SpellCheckingInspection if "--nolaunch" not in popen_list: + # noinspection SpellCheckingInspection popen_list += ["--nolaunch"] logger.info("Restarting SickChill with {options}".format(options=popen_list)) # shutdown the logger to make sure it's released the logfile BEFORE it restarts SC. diff --git a/sickchill/gui/slick/views/home.mako b/sickchill/gui/slick/views/home.mako index 306be3944a..aa07f34662 100644 --- a/sickchill/gui/slick/views/home.mako +++ b/sickchill/gui/slick/views/home.mako @@ -59,11 +59,13 @@ % endif % for cur_show_list in sorted_show_lists: + % if cur_show_list[1]:
<%include file="/inc_home_show_list.mako" args="curListType=cur_show_list[0], myShowList=cur_show_list[1]" />
+ % endif % endfor diff --git a/sickchill/locale/af_ZA/LC_MESSAGES/messages.po b/sickchill/locale/af_ZA/LC_MESSAGES/messages.po index 5aec76afd7..2343603e1f 100644 --- a/sickchill/locale/af_ZA/LC_MESSAGES/messages.po +++ b/sickchill/locale/af_ZA/LC_MESSAGES/messages.po @@ -5697,7 +5697,7 @@ msgstr "Program Lys" #: sickchill/oldbeard/show_queue.py:390 msgid "" -"Show in {showDir} has no name on {indexer}, probably searched with the " +"Show in {show_dir} has no name on {indexer}, probably searched with the " "wrong language. Delete .nfo and add manually in the correct language." msgstr "" @@ -5895,7 +5895,7 @@ msgid "Skipped" msgstr "" #: sickchill/oldbeard/show_queue.py:377 -msgid "Skipping initial creation of {showDir} due to config.ini setting" +msgid "Skipping initial creation of {show_dir} due to config.ini setting" msgstr "" #: sickchill/gui/slick/views/config.mako:250 @@ -6508,7 +6508,7 @@ msgid "The old status had a quality in it, using that: " msgstr "" #: sickchill/oldbeard/show_queue.py:478 -msgid "The show in {showDir} is already in your show list, skipping" +msgid "The show in {show_dir} is already in your show list, skipping" msgstr "" #: sickchill/gui/slick/views/config_notifications.mako:1306 @@ -7061,7 +7061,7 @@ msgid "Unable to create subtitles folder {subs_new_path}" msgstr "" #: sickchill/oldbeard/show_queue.py:381 -msgid "Unable to create the folder {showDir}, can't add the show" +msgid "Unable to create the folder {show_dir}, can't add the show" msgstr "" #: sickchill/views/manage/add_shows.py:632 @@ -7108,7 +7108,7 @@ msgid "Unable to force an update on scene numbering of the show." msgstr "" #: sickchill/oldbeard/show_queue.py:361 -msgid "Unable to get a show {showDir}, can't add the show" +msgid "Unable to get a show {show_dir}, can't add the show" msgstr "" #: sickchill/oldbeard/helpers.py:1448 @@ -9540,4 +9540,3 @@ msgstr "" #: sickchill/views/home.py:1280 msgid "{show_name} has been {paused_resumed}" msgstr "" - diff --git a/sickchill/locale/ar_SA/LC_MESSAGES/messages.po b/sickchill/locale/ar_SA/LC_MESSAGES/messages.po index 6c424e79a4..2013aeaa10 100644 --- a/sickchill/locale/ar_SA/LC_MESSAGES/messages.po +++ b/sickchill/locale/ar_SA/LC_MESSAGES/messages.po @@ -5830,7 +5830,7 @@ msgstr "قائمة المسلسلات" #: sickchill/oldbeard/show_queue.py:390 msgid "" -"Show in {showDir} has no name on {indexer}, probably searched with the " +"Show in {show_dir} has no name on {indexer}, probably searched with the " "wrong language. Delete .nfo and add manually in the correct language." msgstr "" @@ -6030,7 +6030,7 @@ msgid "Skipped" msgstr "" #: sickchill/oldbeard/show_queue.py:377 -msgid "Skipping initial creation of {showDir} due to config.ini setting" +msgid "Skipping initial creation of {show_dir} due to config.ini setting" msgstr "" #: sickchill/gui/slick/views/config.mako:250 @@ -6651,7 +6651,7 @@ msgid "The old status had a quality in it, using that: " msgstr "" #: sickchill/oldbeard/show_queue.py:478 -msgid "The show in {showDir} is already in your show list, skipping" +msgid "The show in {show_dir} is already in your show list, skipping" msgstr "" #: sickchill/gui/slick/views/config_notifications.mako:1306 @@ -7215,7 +7215,7 @@ msgstr "غير قادر على إنشاء المجلد {show_dir}، لا يمك #: sickchill/oldbeard/show_queue.py:381 #, fuzzy #| msgid "Unable to create the folder {show_dir}, can't add the show" -msgid "Unable to create the folder {showDir}, can't add the show" +msgid "Unable to create the folder {show_dir}, can't add the show" msgstr "غير قادر على إنشاء المجلد {show_dir}، لا يمكن إضافة المسلسل" #: sickchill/views/manage/add_shows.py:632 @@ -7264,7 +7264,7 @@ msgstr "غير قادر على فرض التحديث على (استثناءات #: sickchill/oldbeard/show_queue.py:361 #, fuzzy #| msgid "Unable to create the folder {show_dir}, can't add the show" -msgid "Unable to get a show {showDir}, can't add the show" +msgid "Unable to get a show {show_dir}, can't add the show" msgstr "غير قادر على إنشاء المجلد {show_dir}، لا يمكن إضافة المسلسل" #: sickchill/oldbeard/helpers.py:1448 @@ -9712,4 +9712,3 @@ msgstr "{show_name} قد تم {deleted_trashed} {was_deleted}" #: sickchill/views/home.py:1280 msgid "{show_name} has been {paused_resumed}" msgstr "{show_name} قد تم{paused_resumed}" - diff --git a/sickchill/locale/bg_BG/LC_MESSAGES/messages.po b/sickchill/locale/bg_BG/LC_MESSAGES/messages.po index d6721c4e50..0fd394e708 100644 --- a/sickchill/locale/bg_BG/LC_MESSAGES/messages.po +++ b/sickchill/locale/bg_BG/LC_MESSAGES/messages.po @@ -5966,7 +5966,7 @@ msgstr "Предаването е пропуснато" #: sickchill/oldbeard/show_queue.py:390 msgid "" -"Show in {showDir} has no name on {indexer}, probably searched with the " +"Show in {show_dir} has no name on {indexer}, probably searched with the " "wrong language. Delete .nfo and add manually in the correct language." msgstr "" @@ -6168,7 +6168,7 @@ msgid "Skipped" msgstr "Предаването е пропуснато" #: sickchill/oldbeard/show_queue.py:377 -msgid "Skipping initial creation of {showDir} due to config.ini setting" +msgid "Skipping initial creation of {show_dir} due to config.ini setting" msgstr "" #: sickchill/gui/slick/views/config.mako:250 @@ -6795,7 +6795,7 @@ msgid "The old status had a quality in it, using that: " msgstr "Стария статус съдържа данни за качество, ще използвам тях: " #: sickchill/oldbeard/show_queue.py:478 -msgid "The show in {showDir} is already in your show list, skipping" +msgid "The show in {show_dir} is already in your show list, skipping" msgstr "" #: sickchill/gui/slick/views/config_notifications.mako:1306 @@ -7381,7 +7381,7 @@ msgstr "Не успя да създаде папка за надписи {0}" #: sickchill/oldbeard/show_queue.py:381 #, fuzzy #| msgid "Unable to create the folder {show_dir}, can't add the show" -msgid "Unable to create the folder {showDir}, can't add the show" +msgid "Unable to create the folder {show_dir}, can't add the show" msgstr "" "Не може да бъде създадена папката {show_dir}, сериалът не може да бъде " "добавен" @@ -7438,7 +7438,7 @@ msgstr "Неуспешна принудителна актуализация н #: sickchill/oldbeard/show_queue.py:361 #, fuzzy #| msgid "Unable to create the folder {show_dir}, can't add the show" -msgid "Unable to get a show {showDir}, can't add the show" +msgid "Unable to get a show {show_dir}, can't add the show" msgstr "" "Не може да бъде създадена папката {show_dir}, сериалът не може да бъде " "добавен" @@ -9943,4 +9943,3 @@ msgstr "{show_name} беше {deleted_trashed} {was_deleted}" #: sickchill/views/home.py:1280 msgid "{show_name} has been {paused_resumed}" msgstr "{show_name} беше {paused_resumed}" - diff --git a/sickchill/locale/ca_ES/LC_MESSAGES/messages.po b/sickchill/locale/ca_ES/LC_MESSAGES/messages.po index b4e014384d..ed7815403e 100644 --- a/sickchill/locale/ca_ES/LC_MESSAGES/messages.po +++ b/sickchill/locale/ca_ES/LC_MESSAGES/messages.po @@ -5683,7 +5683,7 @@ msgstr "Mostrar llistat" #: sickchill/oldbeard/show_queue.py:390 msgid "" -"Show in {showDir} has no name on {indexer}, probably searched with the " +"Show in {show_dir} has no name on {indexer}, probably searched with the " "wrong language. Delete .nfo and add manually in the correct language." msgstr "" @@ -5881,7 +5881,7 @@ msgid "Skipped" msgstr "" #: sickchill/oldbeard/show_queue.py:377 -msgid "Skipping initial creation of {showDir} due to config.ini setting" +msgid "Skipping initial creation of {show_dir} due to config.ini setting" msgstr "" #: sickchill/gui/slick/views/config.mako:250 @@ -6486,7 +6486,7 @@ msgid "The old status had a quality in it, using that: " msgstr "" #: sickchill/oldbeard/show_queue.py:478 -msgid "The show in {showDir} is already in your show list, skipping" +msgid "The show in {show_dir} is already in your show list, skipping" msgstr "" #: sickchill/gui/slick/views/config_notifications.mako:1306 @@ -7037,7 +7037,7 @@ msgid "Unable to create subtitles folder {subs_new_path}" msgstr "" #: sickchill/oldbeard/show_queue.py:381 -msgid "Unable to create the folder {showDir}, can't add the show" +msgid "Unable to create the folder {show_dir}, can't add the show" msgstr "" #: sickchill/views/manage/add_shows.py:632 @@ -7084,7 +7084,7 @@ msgid "Unable to force an update on scene numbering of the show." msgstr "" #: sickchill/oldbeard/show_queue.py:361 -msgid "Unable to get a show {showDir}, can't add the show" +msgid "Unable to get a show {show_dir}, can't add the show" msgstr "" #: sickchill/oldbeard/helpers.py:1448 @@ -9494,4 +9494,3 @@ msgstr "" #: sickchill/views/home.py:1280 msgid "{show_name} has been {paused_resumed}" msgstr "" - diff --git a/sickchill/locale/cs_CZ/LC_MESSAGES/messages.po b/sickchill/locale/cs_CZ/LC_MESSAGES/messages.po index b2d46a973e..97ecdc37ae 100644 --- a/sickchill/locale/cs_CZ/LC_MESSAGES/messages.po +++ b/sickchill/locale/cs_CZ/LC_MESSAGES/messages.po @@ -5856,7 +5856,7 @@ msgstr "Seznam seriálů" #: sickchill/oldbeard/show_queue.py:390 msgid "" -"Show in {showDir} has no name on {indexer}, probably searched with the " +"Show in {show_dir} has no name on {indexer}, probably searched with the " "wrong language. Delete .nfo and add manually in the correct language." msgstr "" @@ -6056,7 +6056,7 @@ msgid "Skipped" msgstr "" #: sickchill/oldbeard/show_queue.py:377 -msgid "Skipping initial creation of {showDir} due to config.ini setting" +msgid "Skipping initial creation of {show_dir} due to config.ini setting" msgstr "" #: sickchill/gui/slick/views/config.mako:250 @@ -6677,7 +6677,7 @@ msgid "The old status had a quality in it, using that: " msgstr "" #: sickchill/oldbeard/show_queue.py:478 -msgid "The show in {showDir} is already in your show list, skipping" +msgid "The show in {show_dir} is already in your show list, skipping" msgstr "" #: sickchill/gui/slick/views/config_notifications.mako:1306 @@ -7239,7 +7239,7 @@ msgid "Unable to create subtitles folder {subs_new_path}" msgstr "" #: sickchill/oldbeard/show_queue.py:381 -msgid "Unable to create the folder {showDir}, can't add the show" +msgid "Unable to create the folder {show_dir}, can't add the show" msgstr "" #: sickchill/views/manage/add_shows.py:632 @@ -7286,7 +7286,7 @@ msgid "Unable to force an update on scene numbering of the show." msgstr "Nelze vynutit aktualizaci číslování dílů seriálu." #: sickchill/oldbeard/show_queue.py:361 -msgid "Unable to get a show {showDir}, can't add the show" +msgid "Unable to get a show {show_dir}, can't add the show" msgstr "" #: sickchill/oldbeard/helpers.py:1448 @@ -9736,4 +9736,3 @@ msgstr "{show_name} byl {deleted_trashed} {was_deleted}" #: sickchill/views/home.py:1280 msgid "{show_name} has been {paused_resumed}" msgstr "{show_name} byl {paused_resumed}" - diff --git a/sickchill/locale/da_DK/LC_MESSAGES/messages.po b/sickchill/locale/da_DK/LC_MESSAGES/messages.po index f01d5c38fa..be4b1a879a 100644 --- a/sickchill/locale/da_DK/LC_MESSAGES/messages.po +++ b/sickchill/locale/da_DK/LC_MESSAGES/messages.po @@ -5837,7 +5837,7 @@ msgstr "Serie Liste" #: sickchill/oldbeard/show_queue.py:390 msgid "" -"Show in {showDir} has no name on {indexer}, probably searched with the " +"Show in {show_dir} has no name on {indexer}, probably searched with the " "wrong language. Delete .nfo and add manually in the correct language." msgstr "" @@ -6037,7 +6037,7 @@ msgid "Skipped" msgstr "" #: sickchill/oldbeard/show_queue.py:377 -msgid "Skipping initial creation of {showDir} due to config.ini setting" +msgid "Skipping initial creation of {show_dir} due to config.ini setting" msgstr "" #: sickchill/gui/slick/views/config.mako:250 @@ -6658,7 +6658,7 @@ msgid "The old status had a quality in it, using that: " msgstr "" #: sickchill/oldbeard/show_queue.py:478 -msgid "The show in {showDir} is already in your show list, skipping" +msgid "The show in {show_dir} is already in your show list, skipping" msgstr "" #: sickchill/gui/slick/views/config_notifications.mako:1306 @@ -7222,7 +7222,7 @@ msgstr "Ikke i stand til at oprette folderen {show_dir}, kan ikke tilføje serie #: sickchill/oldbeard/show_queue.py:381 #, fuzzy #| msgid "Unable to create the folder {show_dir}, can't add the show" -msgid "Unable to create the folder {showDir}, can't add the show" +msgid "Unable to create the folder {show_dir}, can't add the show" msgstr "Ikke i stand til at oprette folderen {show_dir}, kan ikke tilføje serien" #: sickchill/views/manage/add_shows.py:632 @@ -7275,7 +7275,7 @@ msgstr "" #: sickchill/oldbeard/show_queue.py:361 #, fuzzy #| msgid "Unable to create the folder {show_dir}, can't add the show" -msgid "Unable to get a show {showDir}, can't add the show" +msgid "Unable to get a show {show_dir}, can't add the show" msgstr "Ikke i stand til at oprette folderen {show_dir}, kan ikke tilføje serien" #: sickchill/oldbeard/helpers.py:1448 @@ -9729,4 +9729,3 @@ msgstr "{show_name} blev {deleted_trashed} {was_deleted}" #: sickchill/views/home.py:1280 msgid "{show_name} has been {paused_resumed}" msgstr "{show_name} blev {paused_resumed}" - diff --git a/sickchill/locale/de_DE/LC_MESSAGES/messages.po b/sickchill/locale/de_DE/LC_MESSAGES/messages.po index fc2e3413e9..7cab32ae01 100644 --- a/sickchill/locale/de_DE/LC_MESSAGES/messages.po +++ b/sickchill/locale/de_DE/LC_MESSAGES/messages.po @@ -5861,7 +5861,7 @@ msgstr "Serienliste" #: sickchill/oldbeard/show_queue.py:390 msgid "" -"Show in {showDir} has no name on {indexer}, probably searched with the " +"Show in {show_dir} has no name on {indexer}, probably searched with the " "wrong language. Delete .nfo and add manually in the correct language." msgstr "" @@ -6061,7 +6061,7 @@ msgid "Skipped" msgstr "" #: sickchill/oldbeard/show_queue.py:377 -msgid "Skipping initial creation of {showDir} due to config.ini setting" +msgid "Skipping initial creation of {show_dir} due to config.ini setting" msgstr "" #: sickchill/gui/slick/views/config.mako:250 @@ -6686,7 +6686,7 @@ msgid "The old status had a quality in it, using that: " msgstr "" #: sickchill/oldbeard/show_queue.py:478 -msgid "The show in {showDir} is already in your show list, skipping" +msgid "The show in {show_dir} is already in your show list, skipping" msgstr "" #: sickchill/gui/slick/views/config_notifications.mako:1306 @@ -7268,7 +7268,7 @@ msgstr "" #: sickchill/oldbeard/show_queue.py:381 #, fuzzy #| msgid "Unable to create the folder {show_dir}, can't add the show" -msgid "Unable to create the folder {showDir}, can't add the show" +msgid "Unable to create the folder {show_dir}, can't add the show" msgstr "" "Kann den Ordner {show_dir} nicht erstellen, Serie kann nicht hinzugefügt " "werden" @@ -7325,7 +7325,7 @@ msgstr "" #: sickchill/oldbeard/show_queue.py:361 #, fuzzy #| msgid "Unable to create the folder {show_dir}, can't add the show" -msgid "Unable to get a show {showDir}, can't add the show" +msgid "Unable to get a show {show_dir}, can't add the show" msgstr "" "Kann den Ordner {show_dir} nicht erstellen, Serie kann nicht hinzugefügt " "werden" @@ -9787,4 +9787,3 @@ msgstr "{show_name} wurde {deleted_trashed}{was_deleted}" #: sickchill/views/home.py:1280 msgid "{show_name} has been {paused_resumed}" msgstr "{show_name} wurde {paused_resumed}" - diff --git a/sickchill/locale/el_GR/LC_MESSAGES/messages.po b/sickchill/locale/el_GR/LC_MESSAGES/messages.po index 937665181c..97fc8585c2 100644 --- a/sickchill/locale/el_GR/LC_MESSAGES/messages.po +++ b/sickchill/locale/el_GR/LC_MESSAGES/messages.po @@ -5665,7 +5665,7 @@ msgstr "Εμφάνιση Λίστας" #: sickchill/oldbeard/show_queue.py:390 msgid "" -"Show in {showDir} has no name on {indexer}, probably searched with the " +"Show in {show_dir} has no name on {indexer}, probably searched with the " "wrong language. Delete .nfo and add manually in the correct language." msgstr "" @@ -5863,7 +5863,7 @@ msgid "Skipped" msgstr "" #: sickchill/oldbeard/show_queue.py:377 -msgid "Skipping initial creation of {showDir} due to config.ini setting" +msgid "Skipping initial creation of {show_dir} due to config.ini setting" msgstr "" #: sickchill/gui/slick/views/config.mako:250 @@ -6474,7 +6474,7 @@ msgid "The old status had a quality in it, using that: " msgstr "" #: sickchill/oldbeard/show_queue.py:478 -msgid "The show in {showDir} is already in your show list, skipping" +msgid "The show in {show_dir} is already in your show list, skipping" msgstr "" #: sickchill/gui/slick/views/config_notifications.mako:1306 @@ -7033,7 +7033,7 @@ msgid "Unable to create subtitles folder {subs_new_path}" msgstr "" #: sickchill/oldbeard/show_queue.py:381 -msgid "Unable to create the folder {showDir}, can't add the show" +msgid "Unable to create the folder {show_dir}, can't add the show" msgstr "" #: sickchill/views/manage/add_shows.py:632 @@ -7082,7 +7082,7 @@ msgstr "" "του show." #: sickchill/oldbeard/show_queue.py:361 -msgid "Unable to get a show {showDir}, can't add the show" +msgid "Unable to get a show {show_dir}, can't add the show" msgstr "" #: sickchill/oldbeard/helpers.py:1448 @@ -9492,4 +9492,3 @@ msgstr "{show_name} έχει {deleted_trashed} {was_deleted}" #: sickchill/views/home.py:1280 msgid "{show_name} has been {paused_resumed}" msgstr "{show_name} έχει {paused_resumed}" - diff --git a/sickchill/locale/en_GB/LC_MESSAGES/messages.po b/sickchill/locale/en_GB/LC_MESSAGES/messages.po index 408cb8d9cd..0ab068d83f 100644 --- a/sickchill/locale/en_GB/LC_MESSAGES/messages.po +++ b/sickchill/locale/en_GB/LC_MESSAGES/messages.po @@ -5851,7 +5851,7 @@ msgstr "Show List" #: sickchill/oldbeard/show_queue.py:390 msgid "" -"Show in {showDir} has no name on {indexer}, probably searched with the " +"Show in {show_dir} has no name on {indexer}, probably searched with the " "wrong language. Delete .nfo and add manually in the correct language." msgstr "" @@ -6051,7 +6051,7 @@ msgid "Skipped" msgstr "" #: sickchill/oldbeard/show_queue.py:377 -msgid "Skipping initial creation of {showDir} due to config.ini setting" +msgid "Skipping initial creation of {show_dir} due to config.ini setting" msgstr "" #: sickchill/gui/slick/views/config.mako:250 @@ -6672,7 +6672,7 @@ msgid "The old status had a quality in it, using that: " msgstr "" #: sickchill/oldbeard/show_queue.py:478 -msgid "The show in {showDir} is already in your show list, skipping" +msgid "The show in {show_dir} is already in your show list, skipping" msgstr "" #: sickchill/gui/slick/views/config_notifications.mako:1306 @@ -7236,7 +7236,7 @@ msgstr "Unable to create the folder {show_dir}, can't add the show" #: sickchill/oldbeard/show_queue.py:381 #, fuzzy #| msgid "Unable to create the folder {show_dir}, can't add the show" -msgid "Unable to create the folder {showDir}, can't add the show" +msgid "Unable to create the folder {show_dir}, can't add the show" msgstr "Unable to create the folder {show_dir}, can't add the show" #: sickchill/views/manage/add_shows.py:632 @@ -7285,7 +7285,7 @@ msgstr "Unable to force an update on scene numbering of the show." #: sickchill/oldbeard/show_queue.py:361 #, fuzzy #| msgid "Unable to create the folder {show_dir}, can't add the show" -msgid "Unable to get a show {showDir}, can't add the show" +msgid "Unable to get a show {show_dir}, can't add the show" msgstr "Unable to create the folder {show_dir}, can't add the show" #: sickchill/oldbeard/helpers.py:1448 @@ -9741,4 +9741,3 @@ msgstr "{show_name} has been {deleted_trashed} {was_deleted}" #: sickchill/views/home.py:1280 msgid "{show_name} has been {paused_resumed}" msgstr "{show_name} has been {paused_resumed}" - diff --git a/sickchill/locale/en_US/LC_MESSAGES/messages.po b/sickchill/locale/en_US/LC_MESSAGES/messages.po index 72d8898204..29ec29e238 100644 --- a/sickchill/locale/en_US/LC_MESSAGES/messages.po +++ b/sickchill/locale/en_US/LC_MESSAGES/messages.po @@ -5851,7 +5851,7 @@ msgstr "Show List" #: sickchill/oldbeard/show_queue.py:390 msgid "" -"Show in {showDir} has no name on {indexer}, probably searched with the " +"Show in {show_dir} has no name on {indexer}, probably searched with the " "wrong language. Delete .nfo and add manually in the correct language." msgstr "" @@ -6051,7 +6051,7 @@ msgid "Skipped" msgstr "" #: sickchill/oldbeard/show_queue.py:377 -msgid "Skipping initial creation of {showDir} due to config.ini setting" +msgid "Skipping initial creation of {show_dir} due to config.ini setting" msgstr "" #: sickchill/gui/slick/views/config.mako:250 @@ -6672,7 +6672,7 @@ msgid "The old status had a quality in it, using that: " msgstr "" #: sickchill/oldbeard/show_queue.py:478 -msgid "The show in {showDir} is already in your show list, skipping" +msgid "The show in {show_dir} is already in your show list, skipping" msgstr "" #: sickchill/gui/slick/views/config_notifications.mako:1306 @@ -7236,7 +7236,7 @@ msgstr "Unable to create the folder {show_dir}, can't add the show" #: sickchill/oldbeard/show_queue.py:381 #, fuzzy #| msgid "Unable to create the folder {show_dir}, can't add the show" -msgid "Unable to create the folder {showDir}, can't add the show" +msgid "Unable to create the folder {show_dir}, can't add the show" msgstr "Unable to create the folder {show_dir}, can't add the show" #: sickchill/views/manage/add_shows.py:632 @@ -7285,7 +7285,7 @@ msgstr "Unable to force an update on scene numbering of the show." #: sickchill/oldbeard/show_queue.py:361 #, fuzzy #| msgid "Unable to create the folder {show_dir}, can't add the show" -msgid "Unable to get a show {showDir}, can't add the show" +msgid "Unable to get a show {show_dir}, can't add the show" msgstr "Unable to create the folder {show_dir}, can't add the show" #: sickchill/oldbeard/helpers.py:1448 @@ -9741,4 +9741,3 @@ msgstr "{show_name} has been {deleted_trashed} {was_deleted}" #: sickchill/views/home.py:1280 msgid "{show_name} has been {paused_resumed}" msgstr "{show_name} has been {paused_resumed}" - diff --git a/sickchill/locale/es_ES/LC_MESSAGES/messages.po b/sickchill/locale/es_ES/LC_MESSAGES/messages.po index 0385d27f43..6d51b1e648 100644 --- a/sickchill/locale/es_ES/LC_MESSAGES/messages.po +++ b/sickchill/locale/es_ES/LC_MESSAGES/messages.po @@ -5874,7 +5874,7 @@ msgstr "Lista de series" #: sickchill/oldbeard/show_queue.py:390 msgid "" -"Show in {showDir} has no name on {indexer}, probably searched with the " +"Show in {show_dir} has no name on {indexer}, probably searched with the " "wrong language. Delete .nfo and add manually in the correct language." msgstr "" @@ -6074,7 +6074,7 @@ msgid "Skipped" msgstr "" #: sickchill/oldbeard/show_queue.py:377 -msgid "Skipping initial creation of {showDir} due to config.ini setting" +msgid "Skipping initial creation of {show_dir} due to config.ini setting" msgstr "" #: sickchill/gui/slick/views/config.mako:250 @@ -6697,7 +6697,7 @@ msgid "The old status had a quality in it, using that: " msgstr "" #: sickchill/oldbeard/show_queue.py:478 -msgid "The show in {showDir} is already in your show list, skipping" +msgid "The show in {show_dir} is already in your show list, skipping" msgstr "" #: sickchill/gui/slick/views/config_notifications.mako:1306 @@ -7269,7 +7269,7 @@ msgstr "No se pudo crear el directorio {show_dir}, no se pudo añadir la serie" #: sickchill/oldbeard/show_queue.py:381 #, fuzzy #| msgid "Unable to create the folder {show_dir}, can't add the show" -msgid "Unable to create the folder {showDir}, can't add the show" +msgid "Unable to create the folder {show_dir}, can't add the show" msgstr "No se pudo crear el directorio {show_dir}, no se pudo añadir la serie" #: sickchill/views/manage/add_shows.py:632 @@ -7324,7 +7324,7 @@ msgstr "" #: sickchill/oldbeard/show_queue.py:361 #, fuzzy #| msgid "Unable to create the folder {show_dir}, can't add the show" -msgid "Unable to get a show {showDir}, can't add the show" +msgid "Unable to get a show {show_dir}, can't add the show" msgstr "No se pudo crear el directorio {show_dir}, no se pudo añadir la serie" #: sickchill/oldbeard/helpers.py:1448 @@ -9796,4 +9796,3 @@ msgstr "{show_name} ha sido {deleted_trashed} {was_deleted}" #: sickchill/views/home.py:1280 msgid "{show_name} has been {paused_resumed}" msgstr "{show_name} ha sido {paused_resumed}" - diff --git a/sickchill/locale/et_EE/LC_MESSAGES/messages.po b/sickchill/locale/et_EE/LC_MESSAGES/messages.po index 55413bf9f7..0b207434ab 100644 --- a/sickchill/locale/et_EE/LC_MESSAGES/messages.po +++ b/sickchill/locale/et_EE/LC_MESSAGES/messages.po @@ -5729,7 +5729,7 @@ msgstr "Kuva loend" #: sickchill/oldbeard/show_queue.py:390 msgid "" -"Show in {showDir} has no name on {indexer}, probably searched with the " +"Show in {show_dir} has no name on {indexer}, probably searched with the " "wrong language. Delete .nfo and add manually in the correct language." msgstr "" @@ -5927,7 +5927,7 @@ msgid "Skipped" msgstr "" #: sickchill/oldbeard/show_queue.py:377 -msgid "Skipping initial creation of {showDir} due to config.ini setting" +msgid "Skipping initial creation of {show_dir} due to config.ini setting" msgstr "" #: sickchill/gui/slick/views/config.mako:250 @@ -6542,7 +6542,7 @@ msgid "The old status had a quality in it, using that: " msgstr "" #: sickchill/oldbeard/show_queue.py:478 -msgid "The show in {showDir} is already in your show list, skipping" +msgid "The show in {show_dir} is already in your show list, skipping" msgstr "" #: sickchill/gui/slick/views/config_notifications.mako:1306 @@ -7093,7 +7093,7 @@ msgid "Unable to create subtitles folder {subs_new_path}" msgstr "" #: sickchill/oldbeard/show_queue.py:381 -msgid "Unable to create the folder {showDir}, can't add the show" +msgid "Unable to create the folder {show_dir}, can't add the show" msgstr "" #: sickchill/views/manage/add_shows.py:632 @@ -7140,7 +7140,7 @@ msgid "Unable to force an update on scene numbering of the show." msgstr "" #: sickchill/oldbeard/show_queue.py:361 -msgid "Unable to get a show {showDir}, can't add the show" +msgid "Unable to get a show {show_dir}, can't add the show" msgstr "" #: sickchill/oldbeard/helpers.py:1448 @@ -9572,4 +9572,3 @@ msgstr "{show_name} on {deleted_trashed} {was_deleted}" #: sickchill/views/home.py:1280 msgid "{show_name} has been {paused_resumed}" msgstr "{show_name} on {paused_resumed}" - diff --git a/sickchill/locale/fa_IR/LC_MESSAGES/messages.po b/sickchill/locale/fa_IR/LC_MESSAGES/messages.po index 09ab1ba76a..34f55a969c 100644 --- a/sickchill/locale/fa_IR/LC_MESSAGES/messages.po +++ b/sickchill/locale/fa_IR/LC_MESSAGES/messages.po @@ -5497,7 +5497,7 @@ msgstr "" #: sickchill/oldbeard/show_queue.py:390 msgid "" -"Show in {showDir} has no name on {indexer}, probably searched with the " +"Show in {show_dir} has no name on {indexer}, probably searched with the " "wrong language. Delete .nfo and add manually in the correct language." msgstr "" @@ -5691,7 +5691,7 @@ msgid "Skipped" msgstr "" #: sickchill/oldbeard/show_queue.py:377 -msgid "Skipping initial creation of {showDir} due to config.ini setting" +msgid "Skipping initial creation of {show_dir} due to config.ini setting" msgstr "" #: sickchill/gui/slick/views/config.mako:250 @@ -6274,7 +6274,7 @@ msgid "The old status had a quality in it, using that: " msgstr "" #: sickchill/oldbeard/show_queue.py:478 -msgid "The show in {showDir} is already in your show list, skipping" +msgid "The show in {show_dir} is already in your show list, skipping" msgstr "" #: sickchill/gui/slick/views/config_notifications.mako:1306 @@ -6823,7 +6823,7 @@ msgid "Unable to create subtitles folder {subs_new_path}" msgstr "" #: sickchill/oldbeard/show_queue.py:381 -msgid "Unable to create the folder {showDir}, can't add the show" +msgid "Unable to create the folder {show_dir}, can't add the show" msgstr "" #: sickchill/views/manage/add_shows.py:632 @@ -6870,7 +6870,7 @@ msgid "Unable to force an update on scene numbering of the show." msgstr "" #: sickchill/oldbeard/show_queue.py:361 -msgid "Unable to get a show {showDir}, can't add the show" +msgid "Unable to get a show {show_dir}, can't add the show" msgstr "" #: sickchill/oldbeard/helpers.py:1448 @@ -9230,4 +9230,3 @@ msgstr "" #: sickchill/views/home.py:1280 msgid "{show_name} has been {paused_resumed}" msgstr "" - diff --git a/sickchill/locale/fi_FI/LC_MESSAGES/messages.po b/sickchill/locale/fi_FI/LC_MESSAGES/messages.po index 0c0b10844a..b7ffe3ee55 100644 --- a/sickchill/locale/fi_FI/LC_MESSAGES/messages.po +++ b/sickchill/locale/fi_FI/LC_MESSAGES/messages.po @@ -5779,7 +5779,7 @@ msgstr "Näytä lista" #: sickchill/oldbeard/show_queue.py:390 msgid "" -"Show in {showDir} has no name on {indexer}, probably searched with the " +"Show in {show_dir} has no name on {indexer}, probably searched with the " "wrong language. Delete .nfo and add manually in the correct language." msgstr "" @@ -5979,7 +5979,7 @@ msgid "Skipped" msgstr "" #: sickchill/oldbeard/show_queue.py:377 -msgid "Skipping initial creation of {showDir} due to config.ini setting" +msgid "Skipping initial creation of {show_dir} due to config.ini setting" msgstr "" #: sickchill/gui/slick/views/config.mako:250 @@ -6604,7 +6604,7 @@ msgid "The old status had a quality in it, using that: " msgstr "" #: sickchill/oldbeard/show_queue.py:478 -msgid "The show in {showDir} is already in your show list, skipping" +msgid "The show in {show_dir} is already in your show list, skipping" msgstr "" #: sickchill/gui/slick/views/config_notifications.mako:1306 @@ -7157,7 +7157,7 @@ msgid "Unable to create subtitles folder {subs_new_path}" msgstr "" #: sickchill/oldbeard/show_queue.py:381 -msgid "Unable to create the folder {showDir}, can't add the show" +msgid "Unable to create the folder {show_dir}, can't add the show" msgstr "" #: sickchill/views/manage/add_shows.py:632 @@ -7204,7 +7204,7 @@ msgid "Unable to force an update on scene numbering of the show." msgstr "" #: sickchill/oldbeard/show_queue.py:361 -msgid "Unable to get a show {showDir}, can't add the show" +msgid "Unable to get a show {show_dir}, can't add the show" msgstr "" #: sickchill/oldbeard/helpers.py:1448 @@ -9638,4 +9638,3 @@ msgstr "{show_name} on {deleted_trashed} {was_deleted}" #: sickchill/views/home.py:1280 msgid "{show_name} has been {paused_resumed}" msgstr "{show_name} {paused_resumed}" - diff --git a/sickchill/locale/fr_FR/LC_MESSAGES/messages.po b/sickchill/locale/fr_FR/LC_MESSAGES/messages.po index 011831ddab..d9f33619c3 100644 --- a/sickchill/locale/fr_FR/LC_MESSAGES/messages.po +++ b/sickchill/locale/fr_FR/LC_MESSAGES/messages.po @@ -6078,7 +6078,7 @@ msgstr "Série sautée" #| msgid "" "Show in {0} has no name on {1}, probably searched with the wrong " #| "language. Delete .nfo and add manually in the correct language." msgid "" -"Show in {showDir} has no name on {indexer}, probably searched with the " +"Show in {show_dir} has no name on {indexer}, probably searched with the " "wrong language. Delete .nfo and add manually in the correct language." msgstr "" "La série dans {0} n'a pas de nom sur {1}, probablement recherchée avec la" @@ -6285,7 +6285,7 @@ msgstr "Série sautée" #: sickchill/oldbeard/show_queue.py:377 #, fuzzy #| msgid "Skipping initial creation of {0} due to config.ini setting" -msgid "Skipping initial creation of {showDir} due to config.ini setting" +msgid "Skipping initial creation of {show_dir} due to config.ini setting" msgstr "" "La création initiale de {0} a été ignorée en raison du paramètre " "config.ini" @@ -6920,7 +6920,7 @@ msgstr "L'ancien statut avait une qualité définie, je l'utilise: " #: sickchill/oldbeard/show_queue.py:478 #, fuzzy #| msgid "The show in {0} is already in your show list, skipping" -msgid "The show in {showDir} is already in your show list, skipping" +msgid "The show in {show_dir} is already in your show list, skipping" msgstr "La série dans {0} est déjà dans votre liste de séries, passée" #: sickchill/gui/slick/views/config_notifications.mako:1306 @@ -7544,7 +7544,7 @@ msgstr "Impossible de créer le répertoire des sous-titres {0}" #: sickchill/oldbeard/show_queue.py:381 #, fuzzy #| msgid "Unable to create the folder {show_dir}, can't add the show" -msgid "Unable to create the folder {showDir}, can't add the show" +msgid "Unable to create the folder {show_dir}, can't add the show" msgstr "Impossible de créer le dossier {show_dir}, impossible d'ajouter la série" #: sickchill/views/manage/add_shows.py:632 @@ -7601,7 +7601,7 @@ msgstr "" #: sickchill/oldbeard/show_queue.py:361 #, fuzzy #| msgid "Unable to get a show {0}, can't add the show" -msgid "Unable to get a show {showDir}, can't add the show" +msgid "Unable to get a show {show_dir}, can't add the show" msgstr "Impossible d'obtenir une série {0}, impossible d'ajouter la série" #: sickchill/oldbeard/helpers.py:1448 @@ -10145,4 +10145,3 @@ msgstr "{show_name} a été {deleted_trashed} {was_deleted}" #: sickchill/views/home.py:1280 msgid "{show_name} has been {paused_resumed}" msgstr "{show_name} a été {paused_resumed}" - diff --git a/sickchill/locale/he_IL/LC_MESSAGES/messages.po b/sickchill/locale/he_IL/LC_MESSAGES/messages.po index 1dafe1fe46..11e1a3fdd5 100644 --- a/sickchill/locale/he_IL/LC_MESSAGES/messages.po +++ b/sickchill/locale/he_IL/LC_MESSAGES/messages.po @@ -5684,7 +5684,7 @@ msgstr "רשימת סדרות" #: sickchill/oldbeard/show_queue.py:390 msgid "" -"Show in {showDir} has no name on {indexer}, probably searched with the " +"Show in {show_dir} has no name on {indexer}, probably searched with the " "wrong language. Delete .nfo and add manually in the correct language." msgstr "" @@ -5882,7 +5882,7 @@ msgid "Skipped" msgstr "" #: sickchill/oldbeard/show_queue.py:377 -msgid "Skipping initial creation of {showDir} due to config.ini setting" +msgid "Skipping initial creation of {show_dir} due to config.ini setting" msgstr "" #: sickchill/gui/slick/views/config.mako:250 @@ -6493,7 +6493,7 @@ msgid "The old status had a quality in it, using that: " msgstr "" #: sickchill/oldbeard/show_queue.py:478 -msgid "The show in {showDir} is already in your show list, skipping" +msgid "The show in {show_dir} is already in your show list, skipping" msgstr "" #: sickchill/gui/slick/views/config_notifications.mako:1306 @@ -7046,7 +7046,7 @@ msgid "Unable to create subtitles folder {subs_new_path}" msgstr "" #: sickchill/oldbeard/show_queue.py:381 -msgid "Unable to create the folder {showDir}, can't add the show" +msgid "Unable to create the folder {show_dir}, can't add the show" msgstr "" #: sickchill/views/manage/add_shows.py:632 @@ -7093,7 +7093,7 @@ msgid "Unable to force an update on scene numbering of the show." msgstr "אינו מסוגל לאלץ עדכון מספור ה\"זירה\" של הסדרה." #: sickchill/oldbeard/show_queue.py:361 -msgid "Unable to get a show {showDir}, can't add the show" +msgid "Unable to get a show {show_dir}, can't add the show" msgstr "" #: sickchill/oldbeard/helpers.py:1448 @@ -9515,4 +9515,3 @@ msgstr "הסדרה {show_name} {deleted_trashed} {was_deleted}" #: sickchill/views/home.py:1280 msgid "{show_name} has been {paused_resumed}" msgstr "הסדרה {show_name} {paused_resumed}" - diff --git a/sickchill/locale/hr_HR/LC_MESSAGES/messages.po b/sickchill/locale/hr_HR/LC_MESSAGES/messages.po index 8e4f38f9be..749e5dd8a8 100644 --- a/sickchill/locale/hr_HR/LC_MESSAGES/messages.po +++ b/sickchill/locale/hr_HR/LC_MESSAGES/messages.po @@ -5498,7 +5498,7 @@ msgstr "" #: sickchill/oldbeard/show_queue.py:390 msgid "" -"Show in {showDir} has no name on {indexer}, probably searched with the " +"Show in {show_dir} has no name on {indexer}, probably searched with the " "wrong language. Delete .nfo and add manually in the correct language." msgstr "" @@ -5692,7 +5692,7 @@ msgid "Skipped" msgstr "" #: sickchill/oldbeard/show_queue.py:377 -msgid "Skipping initial creation of {showDir} due to config.ini setting" +msgid "Skipping initial creation of {show_dir} due to config.ini setting" msgstr "" #: sickchill/gui/slick/views/config.mako:250 @@ -6275,7 +6275,7 @@ msgid "The old status had a quality in it, using that: " msgstr "" #: sickchill/oldbeard/show_queue.py:478 -msgid "The show in {showDir} is already in your show list, skipping" +msgid "The show in {show_dir} is already in your show list, skipping" msgstr "" #: sickchill/gui/slick/views/config_notifications.mako:1306 @@ -6824,7 +6824,7 @@ msgid "Unable to create subtitles folder {subs_new_path}" msgstr "" #: sickchill/oldbeard/show_queue.py:381 -msgid "Unable to create the folder {showDir}, can't add the show" +msgid "Unable to create the folder {show_dir}, can't add the show" msgstr "" #: sickchill/views/manage/add_shows.py:632 @@ -6871,7 +6871,7 @@ msgid "Unable to force an update on scene numbering of the show." msgstr "" #: sickchill/oldbeard/show_queue.py:361 -msgid "Unable to get a show {showDir}, can't add the show" +msgid "Unable to get a show {show_dir}, can't add the show" msgstr "" #: sickchill/oldbeard/helpers.py:1448 @@ -9231,4 +9231,3 @@ msgstr "" #: sickchill/views/home.py:1280 msgid "{show_name} has been {paused_resumed}" msgstr "" - diff --git a/sickchill/locale/hu_HU/LC_MESSAGES/messages.po b/sickchill/locale/hu_HU/LC_MESSAGES/messages.po index 2d922a4070..f35a786cd4 100644 --- a/sickchill/locale/hu_HU/LC_MESSAGES/messages.po +++ b/sickchill/locale/hu_HU/LC_MESSAGES/messages.po @@ -5801,7 +5801,7 @@ msgstr "Műsor lista" #: sickchill/oldbeard/show_queue.py:390 msgid "" -"Show in {showDir} has no name on {indexer}, probably searched with the " +"Show in {show_dir} has no name on {indexer}, probably searched with the " "wrong language. Delete .nfo and add manually in the correct language." msgstr "" @@ -6001,7 +6001,7 @@ msgid "Skipped" msgstr "" #: sickchill/oldbeard/show_queue.py:377 -msgid "Skipping initial creation of {showDir} due to config.ini setting" +msgid "Skipping initial creation of {show_dir} due to config.ini setting" msgstr "" #: sickchill/gui/slick/views/config.mako:250 @@ -6626,7 +6626,7 @@ msgid "The old status had a quality in it, using that: " msgstr "" #: sickchill/oldbeard/show_queue.py:478 -msgid "The show in {showDir} is already in your show list, skipping" +msgid "The show in {show_dir} is already in your show list, skipping" msgstr "" #: sickchill/gui/slick/views/config_notifications.mako:1306 @@ -7187,7 +7187,7 @@ msgstr "" #: sickchill/oldbeard/show_queue.py:381 #, fuzzy #| msgid "Unable to create the folder {show_dir}, can't add the show" -msgid "Unable to create the folder {showDir}, can't add the show" +msgid "Unable to create the folder {show_dir}, can't add the show" msgstr "" "Nem sikerült létrehozni a(z) {show_dir} mappát, ezért a műsor hozzáadása " "sem lehetséges" @@ -7240,7 +7240,7 @@ msgstr "" #: sickchill/oldbeard/show_queue.py:361 #, fuzzy #| msgid "Unable to create the folder {show_dir}, can't add the show" -msgid "Unable to get a show {showDir}, can't add the show" +msgid "Unable to get a show {show_dir}, can't add the show" msgstr "" "Nem sikerült létrehozni a(z) {show_dir} mappát, ezért a műsor hozzáadása " "sem lehetséges" @@ -9682,4 +9682,3 @@ msgstr "{show_name} volt {deleted_trashed} {was_deleted}" #: sickchill/views/home.py:1280 msgid "{show_name} has been {paused_resumed}" msgstr "" - diff --git a/sickchill/locale/id_ID/LC_MESSAGES/messages.po b/sickchill/locale/id_ID/LC_MESSAGES/messages.po index b0a541ddf1..34718fc83d 100644 --- a/sickchill/locale/id_ID/LC_MESSAGES/messages.po +++ b/sickchill/locale/id_ID/LC_MESSAGES/messages.po @@ -5497,7 +5497,7 @@ msgstr "" #: sickchill/oldbeard/show_queue.py:390 msgid "" -"Show in {showDir} has no name on {indexer}, probably searched with the " +"Show in {show_dir} has no name on {indexer}, probably searched with the " "wrong language. Delete .nfo and add manually in the correct language." msgstr "" @@ -5691,7 +5691,7 @@ msgid "Skipped" msgstr "" #: sickchill/oldbeard/show_queue.py:377 -msgid "Skipping initial creation of {showDir} due to config.ini setting" +msgid "Skipping initial creation of {show_dir} due to config.ini setting" msgstr "" #: sickchill/gui/slick/views/config.mako:250 @@ -6274,7 +6274,7 @@ msgid "The old status had a quality in it, using that: " msgstr "" #: sickchill/oldbeard/show_queue.py:478 -msgid "The show in {showDir} is already in your show list, skipping" +msgid "The show in {show_dir} is already in your show list, skipping" msgstr "" #: sickchill/gui/slick/views/config_notifications.mako:1306 @@ -6823,7 +6823,7 @@ msgid "Unable to create subtitles folder {subs_new_path}" msgstr "" #: sickchill/oldbeard/show_queue.py:381 -msgid "Unable to create the folder {showDir}, can't add the show" +msgid "Unable to create the folder {show_dir}, can't add the show" msgstr "" #: sickchill/views/manage/add_shows.py:632 @@ -6870,7 +6870,7 @@ msgid "Unable to force an update on scene numbering of the show." msgstr "" #: sickchill/oldbeard/show_queue.py:361 -msgid "Unable to get a show {showDir}, can't add the show" +msgid "Unable to get a show {show_dir}, can't add the show" msgstr "" #: sickchill/oldbeard/helpers.py:1448 @@ -9230,4 +9230,3 @@ msgstr "" #: sickchill/views/home.py:1280 msgid "{show_name} has been {paused_resumed}" msgstr "" - diff --git a/sickchill/locale/is_IS/LC_MESSAGES/messages.po b/sickchill/locale/is_IS/LC_MESSAGES/messages.po index f52e7c3c0b..d522c399aa 100644 --- a/sickchill/locale/is_IS/LC_MESSAGES/messages.po +++ b/sickchill/locale/is_IS/LC_MESSAGES/messages.po @@ -5497,7 +5497,7 @@ msgstr "" #: sickchill/oldbeard/show_queue.py:390 msgid "" -"Show in {showDir} has no name on {indexer}, probably searched with the " +"Show in {show_dir} has no name on {indexer}, probably searched with the " "wrong language. Delete .nfo and add manually in the correct language." msgstr "" @@ -5691,7 +5691,7 @@ msgid "Skipped" msgstr "" #: sickchill/oldbeard/show_queue.py:377 -msgid "Skipping initial creation of {showDir} due to config.ini setting" +msgid "Skipping initial creation of {show_dir} due to config.ini setting" msgstr "" #: sickchill/gui/slick/views/config.mako:250 @@ -6274,7 +6274,7 @@ msgid "The old status had a quality in it, using that: " msgstr "" #: sickchill/oldbeard/show_queue.py:478 -msgid "The show in {showDir} is already in your show list, skipping" +msgid "The show in {show_dir} is already in your show list, skipping" msgstr "" #: sickchill/gui/slick/views/config_notifications.mako:1306 @@ -6823,7 +6823,7 @@ msgid "Unable to create subtitles folder {subs_new_path}" msgstr "" #: sickchill/oldbeard/show_queue.py:381 -msgid "Unable to create the folder {showDir}, can't add the show" +msgid "Unable to create the folder {show_dir}, can't add the show" msgstr "" #: sickchill/views/manage/add_shows.py:632 @@ -6870,7 +6870,7 @@ msgid "Unable to force an update on scene numbering of the show." msgstr "" #: sickchill/oldbeard/show_queue.py:361 -msgid "Unable to get a show {showDir}, can't add the show" +msgid "Unable to get a show {show_dir}, can't add the show" msgstr "" #: sickchill/oldbeard/helpers.py:1448 @@ -9230,4 +9230,3 @@ msgstr "" #: sickchill/views/home.py:1280 msgid "{show_name} has been {paused_resumed}" msgstr "" - diff --git a/sickchill/locale/it_IT/LC_MESSAGES/messages.po b/sickchill/locale/it_IT/LC_MESSAGES/messages.po index bffef93eec..d783e048dc 100644 --- a/sickchill/locale/it_IT/LC_MESSAGES/messages.po +++ b/sickchill/locale/it_IT/LC_MESSAGES/messages.po @@ -5847,7 +5847,7 @@ msgstr "Lista Serie TV" #: sickchill/oldbeard/show_queue.py:390 msgid "" -"Show in {showDir} has no name on {indexer}, probably searched with the " +"Show in {show_dir} has no name on {indexer}, probably searched with the " "wrong language. Delete .nfo and add manually in the correct language." msgstr "" @@ -6047,7 +6047,7 @@ msgid "Skipped" msgstr "" #: sickchill/oldbeard/show_queue.py:377 -msgid "Skipping initial creation of {showDir} due to config.ini setting" +msgid "Skipping initial creation of {show_dir} due to config.ini setting" msgstr "" #: sickchill/gui/slick/views/config.mako:250 @@ -6668,7 +6668,7 @@ msgid "The old status had a quality in it, using that: " msgstr "" #: sickchill/oldbeard/show_queue.py:478 -msgid "The show in {showDir} is already in your show list, skipping" +msgid "The show in {show_dir} is already in your show list, skipping" msgstr "" #: sickchill/gui/slick/views/config_notifications.mako:1306 @@ -7246,7 +7246,7 @@ msgstr "" #: sickchill/oldbeard/show_queue.py:381 #, fuzzy #| msgid "Unable to create the folder {show_dir}, can't add the show" -msgid "Unable to create the folder {showDir}, can't add the show" +msgid "Unable to create the folder {show_dir}, can't add the show" msgstr "" "Impossibile creare la cartella {show_dir}, non è possibile aggiungere lo " "show" @@ -7303,7 +7303,7 @@ msgstr "" #: sickchill/oldbeard/show_queue.py:361 #, fuzzy #| msgid "Unable to create the folder {show_dir}, can't add the show" -msgid "Unable to get a show {showDir}, can't add the show" +msgid "Unable to get a show {show_dir}, can't add the show" msgstr "" "Impossibile creare la cartella {show_dir}, non è possibile aggiungere lo " "show" @@ -9763,4 +9763,3 @@ msgstr "{show_name} è stato {deleted_trashed} {was_deleted}" #: sickchill/views/home.py:1280 msgid "{show_name} has been {paused_resumed}" msgstr "{show_name} è stato {paused_resumed}" - diff --git a/sickchill/locale/ja_JP/LC_MESSAGES/messages.po b/sickchill/locale/ja_JP/LC_MESSAGES/messages.po index 5c3d605d49..10c7c09f1a 100644 --- a/sickchill/locale/ja_JP/LC_MESSAGES/messages.po +++ b/sickchill/locale/ja_JP/LC_MESSAGES/messages.po @@ -5499,7 +5499,7 @@ msgstr "" #: sickchill/oldbeard/show_queue.py:390 msgid "" -"Show in {showDir} has no name on {indexer}, probably searched with the " +"Show in {show_dir} has no name on {indexer}, probably searched with the " "wrong language. Delete .nfo and add manually in the correct language." msgstr "" @@ -5695,7 +5695,7 @@ msgid "Skipped" msgstr "スキップされた" #: sickchill/oldbeard/show_queue.py:377 -msgid "Skipping initial creation of {showDir} due to config.ini setting" +msgid "Skipping initial creation of {show_dir} due to config.ini setting" msgstr "" #: sickchill/gui/slick/views/config.mako:250 @@ -6278,7 +6278,7 @@ msgid "The old status had a quality in it, using that: " msgstr "" #: sickchill/oldbeard/show_queue.py:478 -msgid "The show in {showDir} is already in your show list, skipping" +msgid "The show in {show_dir} is already in your show list, skipping" msgstr "" #: sickchill/gui/slick/views/config_notifications.mako:1306 @@ -6827,7 +6827,7 @@ msgid "Unable to create subtitles folder {subs_new_path}" msgstr "" #: sickchill/oldbeard/show_queue.py:381 -msgid "Unable to create the folder {showDir}, can't add the show" +msgid "Unable to create the folder {show_dir}, can't add the show" msgstr "" #: sickchill/views/manage/add_shows.py:632 @@ -6874,7 +6874,7 @@ msgid "Unable to force an update on scene numbering of the show." msgstr "" #: sickchill/oldbeard/show_queue.py:361 -msgid "Unable to get a show {showDir}, can't add the show" +msgid "Unable to get a show {show_dir}, can't add the show" msgstr "" #: sickchill/oldbeard/helpers.py:1448 @@ -9234,4 +9234,3 @@ msgstr "" #: sickchill/views/home.py:1280 msgid "{show_name} has been {paused_resumed}" msgstr "" - diff --git a/sickchill/locale/ko_KR/LC_MESSAGES/messages.po b/sickchill/locale/ko_KR/LC_MESSAGES/messages.po index fb8561f8a5..8500792839 100644 --- a/sickchill/locale/ko_KR/LC_MESSAGES/messages.po +++ b/sickchill/locale/ko_KR/LC_MESSAGES/messages.po @@ -5497,7 +5497,7 @@ msgstr "" #: sickchill/oldbeard/show_queue.py:390 msgid "" -"Show in {showDir} has no name on {indexer}, probably searched with the " +"Show in {show_dir} has no name on {indexer}, probably searched with the " "wrong language. Delete .nfo and add manually in the correct language." msgstr "" @@ -5691,7 +5691,7 @@ msgid "Skipped" msgstr "" #: sickchill/oldbeard/show_queue.py:377 -msgid "Skipping initial creation of {showDir} due to config.ini setting" +msgid "Skipping initial creation of {show_dir} due to config.ini setting" msgstr "" #: sickchill/gui/slick/views/config.mako:250 @@ -6274,7 +6274,7 @@ msgid "The old status had a quality in it, using that: " msgstr "" #: sickchill/oldbeard/show_queue.py:478 -msgid "The show in {showDir} is already in your show list, skipping" +msgid "The show in {show_dir} is already in your show list, skipping" msgstr "" #: sickchill/gui/slick/views/config_notifications.mako:1306 @@ -6823,7 +6823,7 @@ msgid "Unable to create subtitles folder {subs_new_path}" msgstr "" #: sickchill/oldbeard/show_queue.py:381 -msgid "Unable to create the folder {showDir}, can't add the show" +msgid "Unable to create the folder {show_dir}, can't add the show" msgstr "" #: sickchill/views/manage/add_shows.py:632 @@ -6870,7 +6870,7 @@ msgid "Unable to force an update on scene numbering of the show." msgstr "" #: sickchill/oldbeard/show_queue.py:361 -msgid "Unable to get a show {showDir}, can't add the show" +msgid "Unable to get a show {show_dir}, can't add the show" msgstr "" #: sickchill/oldbeard/helpers.py:1448 @@ -9230,4 +9230,3 @@ msgstr "" #: sickchill/views/home.py:1280 msgid "{show_name} has been {paused_resumed}" msgstr "" - diff --git a/sickchill/locale/lv_LV/LC_MESSAGES/messages.po b/sickchill/locale/lv_LV/LC_MESSAGES/messages.po index 5e8efb3e41..f59d2dc019 100644 --- a/sickchill/locale/lv_LV/LC_MESSAGES/messages.po +++ b/sickchill/locale/lv_LV/LC_MESSAGES/messages.po @@ -5498,7 +5498,7 @@ msgstr "" #: sickchill/oldbeard/show_queue.py:390 msgid "" -"Show in {showDir} has no name on {indexer}, probably searched with the " +"Show in {show_dir} has no name on {indexer}, probably searched with the " "wrong language. Delete .nfo and add manually in the correct language." msgstr "" @@ -5692,7 +5692,7 @@ msgid "Skipped" msgstr "" #: sickchill/oldbeard/show_queue.py:377 -msgid "Skipping initial creation of {showDir} due to config.ini setting" +msgid "Skipping initial creation of {show_dir} due to config.ini setting" msgstr "" #: sickchill/gui/slick/views/config.mako:250 @@ -6275,7 +6275,7 @@ msgid "The old status had a quality in it, using that: " msgstr "" #: sickchill/oldbeard/show_queue.py:478 -msgid "The show in {showDir} is already in your show list, skipping" +msgid "The show in {show_dir} is already in your show list, skipping" msgstr "" #: sickchill/gui/slick/views/config_notifications.mako:1306 @@ -6824,7 +6824,7 @@ msgid "Unable to create subtitles folder {subs_new_path}" msgstr "" #: sickchill/oldbeard/show_queue.py:381 -msgid "Unable to create the folder {showDir}, can't add the show" +msgid "Unable to create the folder {show_dir}, can't add the show" msgstr "" #: sickchill/views/manage/add_shows.py:632 @@ -6871,7 +6871,7 @@ msgid "Unable to force an update on scene numbering of the show." msgstr "" #: sickchill/oldbeard/show_queue.py:361 -msgid "Unable to get a show {showDir}, can't add the show" +msgid "Unable to get a show {show_dir}, can't add the show" msgstr "" #: sickchill/oldbeard/helpers.py:1448 @@ -9231,4 +9231,3 @@ msgstr "" #: sickchill/views/home.py:1280 msgid "{show_name} has been {paused_resumed}" msgstr "" - diff --git a/sickchill/locale/messages.pot b/sickchill/locale/messages.pot index 958247c6ff..03067560fe 100644 --- a/sickchill/locale/messages.pot +++ b/sickchill/locale/messages.pot @@ -5448,7 +5448,7 @@ msgstr "" #: sickchill/oldbeard/show_queue.py:392 msgid "" -"Show in {showDir} has no name on {indexer}, probably searched with the wrong " +"Show in {show_dir} has no name on {indexer}, probably searched with the wrong " "language. Delete .nfo and add manually in the correct language." msgstr "" @@ -5640,7 +5640,7 @@ msgid "Skipped" msgstr "" #: sickchill/oldbeard/show_queue.py:379 -msgid "Skipping initial creation of {showDir} due to config.ini setting" +msgid "Skipping initial creation of {show_dir} due to config.ini setting" msgstr "" #: sickchill/gui/slick/views/config.mako:250 @@ -6221,7 +6221,7 @@ msgid "The old status had a quality in it, using that: " msgstr "" #: sickchill/oldbeard/show_queue.py:480 -msgid "The show in {showDir} is already in your show list, skipping" +msgid "The show in {show_dir} is already in your show list, skipping" msgstr "" #: sickchill/gui/slick/views/config_notifications.mako:1306 @@ -6769,7 +6769,7 @@ msgid "Unable to create subtitles folder {subs_new_path}" msgstr "" #: sickchill/oldbeard/show_queue.py:383 -msgid "Unable to create the folder {showDir}, can't add the show" +msgid "Unable to create the folder {show_dir}, can't add the show" msgstr "" #: sickchill/views/manage/add_shows.py:636 @@ -6814,7 +6814,7 @@ msgid "Unable to force an update on scene numbering of the show." msgstr "" #: sickchill/oldbeard/show_queue.py:363 -msgid "Unable to get a show {showDir}, can't add the show" +msgid "Unable to get a show {show_dir}, can't add the show" msgstr "" #: sickchill/oldbeard/helpers.py:1462 diff --git a/sickchill/locale/nl_NL/LC_MESSAGES/messages.po b/sickchill/locale/nl_NL/LC_MESSAGES/messages.po index e3d2b0ad8b..c8f5cbf7bd 100644 --- a/sickchill/locale/nl_NL/LC_MESSAGES/messages.po +++ b/sickchill/locale/nl_NL/LC_MESSAGES/messages.po @@ -6026,7 +6026,7 @@ msgstr "Show overgeslagen" #: sickchill/oldbeard/show_queue.py:390 msgid "" -"Show in {showDir} has no name on {indexer}, probably searched with the " +"Show in {show_dir} has no name on {indexer}, probably searched with the " "wrong language. Delete .nfo and add manually in the correct language." msgstr "" @@ -6228,7 +6228,7 @@ msgid "Skipped" msgstr "Show overgeslagen" #: sickchill/oldbeard/show_queue.py:377 -msgid "Skipping initial creation of {showDir} due to config.ini setting" +msgid "Skipping initial creation of {show_dir} due to config.ini setting" msgstr "" #: sickchill/gui/slick/views/config.mako:250 @@ -6861,7 +6861,7 @@ msgstr "De oude status had een kwaliteit en gebruikmakend daarvan: " #: sickchill/oldbeard/show_queue.py:478 #, fuzzy #| msgid "The show in {0} is already in your show list, skipping" -msgid "The show in {showDir} is already in your show list, skipping" +msgid "The show in {show_dir} is already in your show list, skipping" msgstr "De serie in {0} staat al in uw serie lijst en wordt overgeslagen" #: sickchill/gui/slick/views/config_notifications.mako:1306 @@ -7469,7 +7469,7 @@ msgstr "Kan map ondertiteling niet aanmaken {0}" #: sickchill/oldbeard/show_queue.py:381 #, fuzzy #| msgid "Unable to create the folder {show_dir}, can't add the show" -msgid "Unable to create the folder {showDir}, can't add the show" +msgid "Unable to create the folder {show_dir}, can't add the show" msgstr "" "Niet mogelijk om de map {show_dir} aan te maken, kon de serie niet " "toevoegen" @@ -7530,7 +7530,7 @@ msgstr "" #: sickchill/oldbeard/show_queue.py:361 #, fuzzy #| msgid "Unable to create the folder {show_dir}, can't add the show" -msgid "Unable to get a show {showDir}, can't add the show" +msgid "Unable to get a show {show_dir}, can't add the show" msgstr "" "Niet mogelijk om de map {show_dir} aan te maken, kon de serie niet " "toevoegen" @@ -10055,4 +10055,3 @@ msgstr "{show_name} is {deleted_trashed} {was_deleted}" #: sickchill/views/home.py:1280 msgid "{show_name} has been {paused_resumed}" msgstr "{show_name} is {paused_resumed}" - diff --git a/sickchill/locale/no_NO/LC_MESSAGES/messages.po b/sickchill/locale/no_NO/LC_MESSAGES/messages.po index 0859199d3a..20f9e120c4 100644 --- a/sickchill/locale/no_NO/LC_MESSAGES/messages.po +++ b/sickchill/locale/no_NO/LC_MESSAGES/messages.po @@ -5834,7 +5834,7 @@ msgstr "Serieliste" #: sickchill/oldbeard/show_queue.py:390 msgid "" -"Show in {showDir} has no name on {indexer}, probably searched with the " +"Show in {show_dir} has no name on {indexer}, probably searched with the " "wrong language. Delete .nfo and add manually in the correct language." msgstr "" @@ -6034,7 +6034,7 @@ msgid "Skipped" msgstr "" #: sickchill/oldbeard/show_queue.py:377 -msgid "Skipping initial creation of {showDir} due to config.ini setting" +msgid "Skipping initial creation of {show_dir} due to config.ini setting" msgstr "" #: sickchill/gui/slick/views/config.mako:250 @@ -6655,7 +6655,7 @@ msgid "The old status had a quality in it, using that: " msgstr "" #: sickchill/oldbeard/show_queue.py:478 -msgid "The show in {showDir} is already in your show list, skipping" +msgid "The show in {show_dir} is already in your show list, skipping" msgstr "" #: sickchill/gui/slick/views/config_notifications.mako:1306 @@ -7219,7 +7219,7 @@ msgstr "Kan ikke lage mappe {show_dir}, kan ikke legge til serie" #: sickchill/oldbeard/show_queue.py:381 #, fuzzy #| msgid "Unable to create the folder {show_dir}, can't add the show" -msgid "Unable to create the folder {showDir}, can't add the show" +msgid "Unable to create the folder {show_dir}, can't add the show" msgstr "Kan ikke lage mappe {show_dir}, kan ikke legge til serie" #: sickchill/views/manage/add_shows.py:632 @@ -7268,7 +7268,7 @@ msgstr "Kan ikke fremtvinge en oppdatering for \"scene\"-nummerering av serien." #: sickchill/oldbeard/show_queue.py:361 #, fuzzy #| msgid "Unable to create the folder {show_dir}, can't add the show" -msgid "Unable to get a show {showDir}, can't add the show" +msgid "Unable to get a show {show_dir}, can't add the show" msgstr "Kan ikke lage mappe {show_dir}, kan ikke legge til serie" #: sickchill/oldbeard/helpers.py:1448 @@ -9722,4 +9722,3 @@ msgstr "{show_name} er blitt {deleted_trashed} {was_deleted}" #: sickchill/views/home.py:1280 msgid "{show_name} has been {paused_resumed}" msgstr "{show_name} er {paused_resumed}" - diff --git a/sickchill/locale/pl_PL/LC_MESSAGES/messages.po b/sickchill/locale/pl_PL/LC_MESSAGES/messages.po index c40726b76a..e167de6db0 100644 --- a/sickchill/locale/pl_PL/LC_MESSAGES/messages.po +++ b/sickchill/locale/pl_PL/LC_MESSAGES/messages.po @@ -5851,7 +5851,7 @@ msgstr "Pokaż listę" #: sickchill/oldbeard/show_queue.py:390 msgid "" -"Show in {showDir} has no name on {indexer}, probably searched with the " +"Show in {show_dir} has no name on {indexer}, probably searched with the " "wrong language. Delete .nfo and add manually in the correct language." msgstr "" @@ -6051,7 +6051,7 @@ msgid "Skipped" msgstr "" #: sickchill/oldbeard/show_queue.py:377 -msgid "Skipping initial creation of {showDir} due to config.ini setting" +msgid "Skipping initial creation of {show_dir} due to config.ini setting" msgstr "" #: sickchill/gui/slick/views/config.mako:250 @@ -6674,7 +6674,7 @@ msgid "The old status had a quality in it, using that: " msgstr "" #: sickchill/oldbeard/show_queue.py:478 -msgid "The show in {showDir} is already in your show list, skipping" +msgid "The show in {show_dir} is already in your show list, skipping" msgstr "" #: sickchill/gui/slick/views/config_notifications.mako:1306 @@ -7244,7 +7244,7 @@ msgstr "Nie można utworzyć folderu {show_dir}, tym samym nie można dodać pro #: sickchill/oldbeard/show_queue.py:381 #, fuzzy #| msgid "Unable to create the folder {show_dir}, can't add the show" -msgid "Unable to create the folder {showDir}, can't add the show" +msgid "Unable to create the folder {show_dir}, can't add the show" msgstr "Nie można utworzyć folderu {show_dir}, tym samym nie można dodać programu" #: sickchill/views/manage/add_shows.py:632 @@ -7293,7 +7293,7 @@ msgstr "Nie można wymusić aktualizacji numeracji scen serialu." #: sickchill/oldbeard/show_queue.py:361 #, fuzzy #| msgid "Unable to create the folder {show_dir}, can't add the show" -msgid "Unable to get a show {showDir}, can't add the show" +msgid "Unable to get a show {show_dir}, can't add the show" msgstr "Nie można utworzyć folderu {show_dir}, tym samym nie można dodać programu" #: sickchill/oldbeard/helpers.py:1448 @@ -9751,4 +9751,3 @@ msgstr "{show_name} został {deleted_trashed} {was_deleted}" #: sickchill/views/home.py:1280 msgid "{show_name} has been {paused_resumed}" msgstr "{show_name} został {paused_resumed}" - diff --git a/sickchill/locale/pt_BR/LC_MESSAGES/messages.po b/sickchill/locale/pt_BR/LC_MESSAGES/messages.po index c1a7cd6145..129d00cec1 100644 --- a/sickchill/locale/pt_BR/LC_MESSAGES/messages.po +++ b/sickchill/locale/pt_BR/LC_MESSAGES/messages.po @@ -5857,7 +5857,7 @@ msgstr "Lista de séries" #: sickchill/oldbeard/show_queue.py:390 msgid "" -"Show in {showDir} has no name on {indexer}, probably searched with the " +"Show in {show_dir} has no name on {indexer}, probably searched with the " "wrong language. Delete .nfo and add manually in the correct language." msgstr "" @@ -6057,7 +6057,7 @@ msgid "Skipped" msgstr "" #: sickchill/oldbeard/show_queue.py:377 -msgid "Skipping initial creation of {showDir} due to config.ini setting" +msgid "Skipping initial creation of {show_dir} due to config.ini setting" msgstr "" #: sickchill/gui/slick/views/config.mako:250 @@ -6678,7 +6678,7 @@ msgid "The old status had a quality in it, using that: " msgstr "" #: sickchill/oldbeard/show_queue.py:478 -msgid "The show in {showDir} is already in your show list, skipping" +msgid "The show in {show_dir} is already in your show list, skipping" msgstr "" #: sickchill/gui/slick/views/config_notifications.mako:1306 @@ -7250,7 +7250,7 @@ msgstr "Não foi possível criar a pasta {show_dir}, série não adicionada" #: sickchill/oldbeard/show_queue.py:381 #, fuzzy #| msgid "Unable to create the folder {show_dir}, can't add the show" -msgid "Unable to create the folder {showDir}, can't add the show" +msgid "Unable to create the folder {show_dir}, can't add the show" msgstr "Não foi possível criar a pasta {show_dir}, série não adicionada" #: sickchill/views/manage/add_shows.py:632 @@ -7303,7 +7303,7 @@ msgstr "" #: sickchill/oldbeard/show_queue.py:361 #, fuzzy #| msgid "Unable to create the folder {show_dir}, can't add the show" -msgid "Unable to get a show {showDir}, can't add the show" +msgid "Unable to get a show {show_dir}, can't add the show" msgstr "Não foi possível criar a pasta {show_dir}, série não adicionada" #: sickchill/oldbeard/helpers.py:1448 @@ -9763,4 +9763,3 @@ msgstr "{show_name} foi {deleted_trashed} {was_deleted}" #: sickchill/views/home.py:1280 msgid "{show_name} has been {paused_resumed}" msgstr "{show_name} foi {paused_resumed}" - diff --git a/sickchill/locale/pt_PT/LC_MESSAGES/messages.po b/sickchill/locale/pt_PT/LC_MESSAGES/messages.po index 9e2fb52b07..64526e87e7 100644 --- a/sickchill/locale/pt_PT/LC_MESSAGES/messages.po +++ b/sickchill/locale/pt_PT/LC_MESSAGES/messages.po @@ -5841,7 +5841,7 @@ msgstr "Lista de programas" #: sickchill/oldbeard/show_queue.py:390 msgid "" -"Show in {showDir} has no name on {indexer}, probably searched with the " +"Show in {show_dir} has no name on {indexer}, probably searched with the " "wrong language. Delete .nfo and add manually in the correct language." msgstr "" @@ -6041,7 +6041,7 @@ msgid "Skipped" msgstr "" #: sickchill/oldbeard/show_queue.py:377 -msgid "Skipping initial creation of {showDir} due to config.ini setting" +msgid "Skipping initial creation of {show_dir} due to config.ini setting" msgstr "" #: sickchill/gui/slick/views/config.mako:250 @@ -6664,7 +6664,7 @@ msgid "The old status had a quality in it, using that: " msgstr "" #: sickchill/oldbeard/show_queue.py:478 -msgid "The show in {showDir} is already in your show list, skipping" +msgid "The show in {show_dir} is already in your show list, skipping" msgstr "" #: sickchill/gui/slick/views/config_notifications.mako:1306 @@ -7238,7 +7238,7 @@ msgstr "Não é possível criar a pasta {show_dir}, não é possível adicionar #: sickchill/oldbeard/show_queue.py:381 #, fuzzy #| msgid "Unable to create the folder {show_dir}, can't add the show" -msgid "Unable to create the folder {showDir}, can't add the show" +msgid "Unable to create the folder {show_dir}, can't add the show" msgstr "Não é possível criar a pasta {show_dir}, não é possível adicionar o show" #: sickchill/views/manage/add_shows.py:632 @@ -7287,7 +7287,7 @@ msgstr "Não é possível forçar uma atualização sobre a numeração da Scene #: sickchill/oldbeard/show_queue.py:361 #, fuzzy #| msgid "Unable to create the folder {show_dir}, can't add the show" -msgid "Unable to get a show {showDir}, can't add the show" +msgid "Unable to get a show {show_dir}, can't add the show" msgstr "Não é possível criar a pasta {show_dir}, não é possível adicionar o show" #: sickchill/oldbeard/helpers.py:1448 @@ -9741,4 +9741,3 @@ msgstr "{show_name} foi {deleted_trashed} {was_deleted}" #: sickchill/views/home.py:1280 msgid "{show_name} has been {paused_resumed}" msgstr "{show_name} foi {paused_resumed}" - diff --git a/sickchill/locale/ro_RO/LC_MESSAGES/messages.po b/sickchill/locale/ro_RO/LC_MESSAGES/messages.po index 86aa83c962..bb9b5bf3a6 100644 --- a/sickchill/locale/ro_RO/LC_MESSAGES/messages.po +++ b/sickchill/locale/ro_RO/LC_MESSAGES/messages.po @@ -5566,7 +5566,7 @@ msgstr "Lista de seriale" #: sickchill/oldbeard/show_queue.py:390 msgid "" -"Show in {showDir} has no name on {indexer}, probably searched with the " +"Show in {show_dir} has no name on {indexer}, probably searched with the " "wrong language. Delete .nfo and add manually in the correct language." msgstr "" @@ -5762,7 +5762,7 @@ msgid "Skipped" msgstr "" #: sickchill/oldbeard/show_queue.py:377 -msgid "Skipping initial creation of {showDir} due to config.ini setting" +msgid "Skipping initial creation of {show_dir} due to config.ini setting" msgstr "" #: sickchill/gui/slick/views/config.mako:250 @@ -6349,7 +6349,7 @@ msgid "The old status had a quality in it, using that: " msgstr "" #: sickchill/oldbeard/show_queue.py:478 -msgid "The show in {showDir} is already in your show list, skipping" +msgid "The show in {show_dir} is already in your show list, skipping" msgstr "" #: sickchill/gui/slick/views/config_notifications.mako:1306 @@ -6900,7 +6900,7 @@ msgid "Unable to create subtitles folder {subs_new_path}" msgstr "" #: sickchill/oldbeard/show_queue.py:381 -msgid "Unable to create the folder {showDir}, can't add the show" +msgid "Unable to create the folder {show_dir}, can't add the show" msgstr "" #: sickchill/views/manage/add_shows.py:632 @@ -6947,7 +6947,7 @@ msgid "Unable to force an update on scene numbering of the show." msgstr "" #: sickchill/oldbeard/show_queue.py:361 -msgid "Unable to get a show {showDir}, can't add the show" +msgid "Unable to get a show {show_dir}, can't add the show" msgstr "" #: sickchill/oldbeard/helpers.py:1448 @@ -9319,4 +9319,3 @@ msgstr "" #: sickchill/views/home.py:1280 msgid "{show_name} has been {paused_resumed}" msgstr "" - diff --git a/sickchill/locale/ru_RU/LC_MESSAGES/messages.po b/sickchill/locale/ru_RU/LC_MESSAGES/messages.po index b23c4dded1..2480e7391f 100644 --- a/sickchill/locale/ru_RU/LC_MESSAGES/messages.po +++ b/sickchill/locale/ru_RU/LC_MESSAGES/messages.po @@ -5845,7 +5845,7 @@ msgstr "Список шоу" #: sickchill/oldbeard/show_queue.py:390 msgid "" -"Show in {showDir} has no name on {indexer}, probably searched with the " +"Show in {show_dir} has no name on {indexer}, probably searched with the " "wrong language. Delete .nfo and add manually in the correct language." msgstr "" @@ -6045,7 +6045,7 @@ msgid "Skipped" msgstr "" #: sickchill/oldbeard/show_queue.py:377 -msgid "Skipping initial creation of {showDir} due to config.ini setting" +msgid "Skipping initial creation of {show_dir} due to config.ini setting" msgstr "" #: sickchill/gui/slick/views/config.mako:250 @@ -6666,7 +6666,7 @@ msgid "The old status had a quality in it, using that: " msgstr "" #: sickchill/oldbeard/show_queue.py:478 -msgid "The show in {showDir} is already in your show list, skipping" +msgid "The show in {show_dir} is already in your show list, skipping" msgstr "" #: sickchill/gui/slick/views/config_notifications.mako:1306 @@ -7238,7 +7238,7 @@ msgstr "Не удается создать папку {show_dir}, не удал #: sickchill/oldbeard/show_queue.py:381 #, fuzzy #| msgid "Unable to create the folder {show_dir}, can't add the show" -msgid "Unable to create the folder {showDir}, can't add the show" +msgid "Unable to create the folder {show_dir}, can't add the show" msgstr "Не удается создать папку {show_dir}, не удалось добавить шоу" #: sickchill/views/manage/add_shows.py:632 @@ -7287,7 +7287,7 @@ msgstr "Не удается выполнить принудительное об #: sickchill/oldbeard/show_queue.py:361 #, fuzzy #| msgid "Unable to create the folder {show_dir}, can't add the show" -msgid "Unable to get a show {showDir}, can't add the show" +msgid "Unable to get a show {show_dir}, can't add the show" msgstr "Не удается создать папку {show_dir}, не удалось добавить шоу" #: sickchill/oldbeard/helpers.py:1448 @@ -9737,4 +9737,3 @@ msgstr "{show_name} был {deleted_trashed} {was_deleted}" #: sickchill/views/home.py:1280 msgid "{show_name} has been {paused_resumed}" msgstr "{show_name} был {paused_resumed}" - diff --git a/sickchill/locale/sk_SK/LC_MESSAGES/messages.po b/sickchill/locale/sk_SK/LC_MESSAGES/messages.po index 505b709107..05c7c2e76e 100644 --- a/sickchill/locale/sk_SK/LC_MESSAGES/messages.po +++ b/sickchill/locale/sk_SK/LC_MESSAGES/messages.po @@ -5797,7 +5797,7 @@ msgstr "Zoznam relácií" #: sickchill/oldbeard/show_queue.py:390 msgid "" -"Show in {showDir} has no name on {indexer}, probably searched with the " +"Show in {show_dir} has no name on {indexer}, probably searched with the " "wrong language. Delete .nfo and add manually in the correct language." msgstr "" @@ -5997,7 +5997,7 @@ msgid "Skipped" msgstr "" #: sickchill/oldbeard/show_queue.py:377 -msgid "Skipping initial creation of {showDir} due to config.ini setting" +msgid "Skipping initial creation of {show_dir} due to config.ini setting" msgstr "" #: sickchill/gui/slick/views/config.mako:250 @@ -6614,7 +6614,7 @@ msgid "The old status had a quality in it, using that: " msgstr "" #: sickchill/oldbeard/show_queue.py:478 -msgid "The show in {showDir} is already in your show list, skipping" +msgid "The show in {show_dir} is already in your show list, skipping" msgstr "" #: sickchill/gui/slick/views/config_notifications.mako:1306 @@ -7182,7 +7182,7 @@ msgstr "Nepodarilo sa vytvoriť priečinok {show_dir}, nie je možné pridať se #: sickchill/oldbeard/show_queue.py:381 #, fuzzy #| msgid "Unable to create the folder {show_dir}, can't add the show" -msgid "Unable to create the folder {showDir}, can't add the show" +msgid "Unable to create the folder {show_dir}, can't add the show" msgstr "Nepodarilo sa vytvoriť priečinok {show_dir}, nie je možné pridať seriál" #: sickchill/views/manage/add_shows.py:632 @@ -7231,7 +7231,7 @@ msgstr "Nie je možné vynútiť aktualizáciu alternatívneho číslovania seri #: sickchill/oldbeard/show_queue.py:361 #, fuzzy #| msgid "Unable to create the folder {show_dir}, can't add the show" -msgid "Unable to get a show {showDir}, can't add the show" +msgid "Unable to get a show {show_dir}, can't add the show" msgstr "Nepodarilo sa vytvoriť priečinok {show_dir}, nie je možné pridať seriál" #: sickchill/oldbeard/helpers.py:1448 @@ -9675,4 +9675,3 @@ msgstr "{show_name} bol {deleted_trashed} {was_deleted}" #: sickchill/views/home.py:1280 msgid "{show_name} has been {paused_resumed}" msgstr "{show_name} bol {paused_resumed}" - diff --git a/sickchill/locale/sl_SI/LC_MESSAGES/messages.po b/sickchill/locale/sl_SI/LC_MESSAGES/messages.po index 0dc9a60825..9a59b60d9e 100644 --- a/sickchill/locale/sl_SI/LC_MESSAGES/messages.po +++ b/sickchill/locale/sl_SI/LC_MESSAGES/messages.po @@ -5714,7 +5714,7 @@ msgstr "Seznam Serij" #: sickchill/oldbeard/show_queue.py:390 msgid "" -"Show in {showDir} has no name on {indexer}, probably searched with the " +"Show in {show_dir} has no name on {indexer}, probably searched with the " "wrong language. Delete .nfo and add manually in the correct language." msgstr "" @@ -5912,7 +5912,7 @@ msgid "Skipped" msgstr "" #: sickchill/oldbeard/show_queue.py:377 -msgid "Skipping initial creation of {showDir} due to config.ini setting" +msgid "Skipping initial creation of {show_dir} due to config.ini setting" msgstr "" #: sickchill/gui/slick/views/config.mako:250 @@ -6531,7 +6531,7 @@ msgid "The old status had a quality in it, using that: " msgstr "" #: sickchill/oldbeard/show_queue.py:478 -msgid "The show in {showDir} is already in your show list, skipping" +msgid "The show in {show_dir} is already in your show list, skipping" msgstr "" #: sickchill/gui/slick/views/config_notifications.mako:1306 @@ -7082,7 +7082,7 @@ msgid "Unable to create subtitles folder {subs_new_path}" msgstr "" #: sickchill/oldbeard/show_queue.py:381 -msgid "Unable to create the folder {showDir}, can't add the show" +msgid "Unable to create the folder {show_dir}, can't add the show" msgstr "" #: sickchill/views/manage/add_shows.py:632 @@ -7129,7 +7129,7 @@ msgid "Unable to force an update on scene numbering of the show." msgstr "" #: sickchill/oldbeard/show_queue.py:361 -msgid "Unable to get a show {showDir}, can't add the show" +msgid "Unable to get a show {show_dir}, can't add the show" msgstr "" #: sickchill/oldbeard/helpers.py:1448 @@ -9561,4 +9561,3 @@ msgstr "" #: sickchill/views/home.py:1280 msgid "{show_name} has been {paused_resumed}" msgstr "" - diff --git a/sickchill/locale/sv_SE/LC_MESSAGES/messages.po b/sickchill/locale/sv_SE/LC_MESSAGES/messages.po index 5816a4e0d4..cb235d26e5 100644 --- a/sickchill/locale/sv_SE/LC_MESSAGES/messages.po +++ b/sickchill/locale/sv_SE/LC_MESSAGES/messages.po @@ -5833,7 +5833,7 @@ msgstr "Visa lista" #: sickchill/oldbeard/show_queue.py:390 msgid "" -"Show in {showDir} has no name on {indexer}, probably searched with the " +"Show in {show_dir} has no name on {indexer}, probably searched with the " "wrong language. Delete .nfo and add manually in the correct language." msgstr "" @@ -6033,7 +6033,7 @@ msgid "Skipped" msgstr "" #: sickchill/oldbeard/show_queue.py:377 -msgid "Skipping initial creation of {showDir} due to config.ini setting" +msgid "Skipping initial creation of {show_dir} due to config.ini setting" msgstr "" #: sickchill/gui/slick/views/config.mako:250 @@ -6656,7 +6656,7 @@ msgid "The old status had a quality in it, using that: " msgstr "" #: sickchill/oldbeard/show_queue.py:478 -msgid "The show in {showDir} is already in your show list, skipping" +msgid "The show in {show_dir} is already in your show list, skipping" msgstr "" #: sickchill/gui/slick/views/config_notifications.mako:1306 @@ -7222,7 +7222,7 @@ msgstr "Kan inte skapa mapp {show_dir}, kan inte lägga till serien" #: sickchill/oldbeard/show_queue.py:381 #, fuzzy #| msgid "Unable to create the folder {show_dir}, can't add the show" -msgid "Unable to create the folder {showDir}, can't add the show" +msgid "Unable to create the folder {show_dir}, can't add the show" msgstr "Kan inte skapa mapp {show_dir}, kan inte lägga till serien" #: sickchill/views/manage/add_shows.py:632 @@ -7271,7 +7271,7 @@ msgstr "Kan inte att tvinga en uppdatering av scene numrering av denna serie." #: sickchill/oldbeard/show_queue.py:361 #, fuzzy #| msgid "Unable to create the folder {show_dir}, can't add the show" -msgid "Unable to get a show {showDir}, can't add the show" +msgid "Unable to get a show {show_dir}, can't add the show" msgstr "Kan inte skapa mapp {show_dir}, kan inte lägga till serien" #: sickchill/oldbeard/helpers.py:1448 @@ -9725,4 +9725,3 @@ msgstr "{show_name} har blivit {deleted_trashed} {was_deleted}" #: sickchill/views/home.py:1280 msgid "{show_name} has been {paused_resumed}" msgstr "{show_name} har blivit {paused_resumed}" - diff --git a/sickchill/locale/tr_TR/LC_MESSAGES/messages.po b/sickchill/locale/tr_TR/LC_MESSAGES/messages.po index a8a845e532..75f8f49afc 100644 --- a/sickchill/locale/tr_TR/LC_MESSAGES/messages.po +++ b/sickchill/locale/tr_TR/LC_MESSAGES/messages.po @@ -5859,7 +5859,7 @@ msgstr "Dizi Listesi" #: sickchill/oldbeard/show_queue.py:390 msgid "" -"Show in {showDir} has no name on {indexer}, probably searched with the " +"Show in {show_dir} has no name on {indexer}, probably searched with the " "wrong language. Delete .nfo and add manually in the correct language." msgstr "" @@ -6059,7 +6059,7 @@ msgid "Skipped" msgstr "" #: sickchill/oldbeard/show_queue.py:377 -msgid "Skipping initial creation of {showDir} due to config.ini setting" +msgid "Skipping initial creation of {show_dir} due to config.ini setting" msgstr "" #: sickchill/gui/slick/views/config.mako:250 @@ -6684,7 +6684,7 @@ msgid "The old status had a quality in it, using that: " msgstr "" #: sickchill/oldbeard/show_queue.py:478 -msgid "The show in {showDir} is already in your show list, skipping" +msgid "The show in {show_dir} is already in your show list, skipping" msgstr "" #: sickchill/gui/slick/views/config_notifications.mako:1306 @@ -7252,7 +7252,7 @@ msgstr "{show_dir} klasörü oluşturulamadı, dizi eklenemedi" #: sickchill/oldbeard/show_queue.py:381 #, fuzzy #| msgid "Unable to create the folder {show_dir}, can't add the show" -msgid "Unable to create the folder {showDir}, can't add the show" +msgid "Unable to create the folder {show_dir}, can't add the show" msgstr "{show_dir} klasörü oluşturulamadı, dizi eklenemedi" #: sickchill/views/manage/add_shows.py:632 @@ -7301,7 +7301,7 @@ msgstr "Gösteri sahne numaralandırmasını zorla güncelleme işlemi başarıs #: sickchill/oldbeard/show_queue.py:361 #, fuzzy #| msgid "Unable to create the folder {show_dir}, can't add the show" -msgid "Unable to get a show {showDir}, can't add the show" +msgid "Unable to get a show {show_dir}, can't add the show" msgstr "{show_dir} klasörü oluşturulamadı, dizi eklenemedi" #: sickchill/oldbeard/helpers.py:1448 @@ -9759,4 +9759,3 @@ msgstr "{show_name} isimli dizi {deleted_trashed} {was_deleted}" #: sickchill/views/home.py:1280 msgid "{show_name} has been {paused_resumed}" msgstr "{show_name} isimli dizi {paused_resumed}" - diff --git a/sickchill/locale/uk_UA/LC_MESSAGES/messages.po b/sickchill/locale/uk_UA/LC_MESSAGES/messages.po index 5a17b6a1db..f85cd33a70 100644 --- a/sickchill/locale/uk_UA/LC_MESSAGES/messages.po +++ b/sickchill/locale/uk_UA/LC_MESSAGES/messages.po @@ -5499,7 +5499,7 @@ msgstr "" #: sickchill/oldbeard/show_queue.py:390 msgid "" -"Show in {showDir} has no name on {indexer}, probably searched with the " +"Show in {show_dir} has no name on {indexer}, probably searched with the " "wrong language. Delete .nfo and add manually in the correct language." msgstr "" @@ -5693,7 +5693,7 @@ msgid "Skipped" msgstr "" #: sickchill/oldbeard/show_queue.py:377 -msgid "Skipping initial creation of {showDir} due to config.ini setting" +msgid "Skipping initial creation of {show_dir} due to config.ini setting" msgstr "" #: sickchill/gui/slick/views/config.mako:250 @@ -6276,7 +6276,7 @@ msgid "The old status had a quality in it, using that: " msgstr "" #: sickchill/oldbeard/show_queue.py:478 -msgid "The show in {showDir} is already in your show list, skipping" +msgid "The show in {show_dir} is already in your show list, skipping" msgstr "" #: sickchill/gui/slick/views/config_notifications.mako:1306 @@ -6825,7 +6825,7 @@ msgid "Unable to create subtitles folder {subs_new_path}" msgstr "" #: sickchill/oldbeard/show_queue.py:381 -msgid "Unable to create the folder {showDir}, can't add the show" +msgid "Unable to create the folder {show_dir}, can't add the show" msgstr "" #: sickchill/views/manage/add_shows.py:632 @@ -6872,7 +6872,7 @@ msgid "Unable to force an update on scene numbering of the show." msgstr "" #: sickchill/oldbeard/show_queue.py:361 -msgid "Unable to get a show {showDir}, can't add the show" +msgid "Unable to get a show {show_dir}, can't add the show" msgstr "" #: sickchill/oldbeard/helpers.py:1448 @@ -9232,4 +9232,3 @@ msgstr "" #: sickchill/views/home.py:1280 msgid "{show_name} has been {paused_resumed}" msgstr "" - diff --git a/sickchill/locale/vi_VN/LC_MESSAGES/messages.po b/sickchill/locale/vi_VN/LC_MESSAGES/messages.po index bec295b805..b313c37061 100644 --- a/sickchill/locale/vi_VN/LC_MESSAGES/messages.po +++ b/sickchill/locale/vi_VN/LC_MESSAGES/messages.po @@ -5497,7 +5497,7 @@ msgstr "" #: sickchill/oldbeard/show_queue.py:390 msgid "" -"Show in {showDir} has no name on {indexer}, probably searched with the " +"Show in {show_dir} has no name on {indexer}, probably searched with the " "wrong language. Delete .nfo and add manually in the correct language." msgstr "" @@ -5691,7 +5691,7 @@ msgid "Skipped" msgstr "" #: sickchill/oldbeard/show_queue.py:377 -msgid "Skipping initial creation of {showDir} due to config.ini setting" +msgid "Skipping initial creation of {show_dir} due to config.ini setting" msgstr "" #: sickchill/gui/slick/views/config.mako:250 @@ -6274,7 +6274,7 @@ msgid "The old status had a quality in it, using that: " msgstr "" #: sickchill/oldbeard/show_queue.py:478 -msgid "The show in {showDir} is already in your show list, skipping" +msgid "The show in {show_dir} is already in your show list, skipping" msgstr "" #: sickchill/gui/slick/views/config_notifications.mako:1306 @@ -6823,7 +6823,7 @@ msgid "Unable to create subtitles folder {subs_new_path}" msgstr "" #: sickchill/oldbeard/show_queue.py:381 -msgid "Unable to create the folder {showDir}, can't add the show" +msgid "Unable to create the folder {show_dir}, can't add the show" msgstr "" #: sickchill/views/manage/add_shows.py:632 @@ -6870,7 +6870,7 @@ msgid "Unable to force an update on scene numbering of the show." msgstr "" #: sickchill/oldbeard/show_queue.py:361 -msgid "Unable to get a show {showDir}, can't add the show" +msgid "Unable to get a show {show_dir}, can't add the show" msgstr "" #: sickchill/oldbeard/helpers.py:1448 @@ -9230,4 +9230,3 @@ msgstr "" #: sickchill/views/home.py:1280 msgid "{show_name} has been {paused_resumed}" msgstr "" - diff --git a/sickchill/locale/zh_CN/LC_MESSAGES/messages.po b/sickchill/locale/zh_CN/LC_MESSAGES/messages.po index 8242fb4435..ee642962ba 100644 --- a/sickchill/locale/zh_CN/LC_MESSAGES/messages.po +++ b/sickchill/locale/zh_CN/LC_MESSAGES/messages.po @@ -5555,7 +5555,7 @@ msgstr "节目清单" #: sickchill/oldbeard/show_queue.py:390 msgid "" -"Show in {showDir} has no name on {indexer}, probably searched with the " +"Show in {show_dir} has no name on {indexer}, probably searched with the " "wrong language. Delete .nfo and add manually in the correct language." msgstr "" @@ -5753,7 +5753,7 @@ msgid "Skipped" msgstr "" #: sickchill/oldbeard/show_queue.py:377 -msgid "Skipping initial creation of {showDir} due to config.ini setting" +msgid "Skipping initial creation of {show_dir} due to config.ini setting" msgstr "" #: sickchill/gui/slick/views/config.mako:250 @@ -6336,7 +6336,7 @@ msgid "The old status had a quality in it, using that: " msgstr "" #: sickchill/oldbeard/show_queue.py:478 -msgid "The show in {showDir} is already in your show list, skipping" +msgid "The show in {show_dir} is already in your show list, skipping" msgstr "" #: sickchill/gui/slick/views/config_notifications.mako:1306 @@ -6887,7 +6887,7 @@ msgid "Unable to create subtitles folder {subs_new_path}" msgstr "" #: sickchill/oldbeard/show_queue.py:381 -msgid "Unable to create the folder {showDir}, can't add the show" +msgid "Unable to create the folder {show_dir}, can't add the show" msgstr "" #: sickchill/views/manage/add_shows.py:632 @@ -6934,7 +6934,7 @@ msgid "Unable to force an update on scene numbering of the show." msgstr "" #: sickchill/oldbeard/show_queue.py:361 -msgid "Unable to get a show {showDir}, can't add the show" +msgid "Unable to get a show {show_dir}, can't add the show" msgstr "" #: sickchill/oldbeard/helpers.py:1448 @@ -9312,4 +9312,3 @@ msgstr "" #: sickchill/views/home.py:1280 msgid "{show_name} has been {paused_resumed}" msgstr "" - diff --git a/sickchill/locale/zh_TW/LC_MESSAGES/messages.po b/sickchill/locale/zh_TW/LC_MESSAGES/messages.po index 1d437cfbaf..0bc7876bac 100644 --- a/sickchill/locale/zh_TW/LC_MESSAGES/messages.po +++ b/sickchill/locale/zh_TW/LC_MESSAGES/messages.po @@ -5657,7 +5657,7 @@ msgstr "節目清單" #: sickchill/oldbeard/show_queue.py:390 msgid "" -"Show in {showDir} has no name on {indexer}, probably searched with the " +"Show in {show_dir} has no name on {indexer}, probably searched with the " "wrong language. Delete .nfo and add manually in the correct language." msgstr "" @@ -5855,7 +5855,7 @@ msgid "Skipped" msgstr "" #: sickchill/oldbeard/show_queue.py:377 -msgid "Skipping initial creation of {showDir} due to config.ini setting" +msgid "Skipping initial creation of {show_dir} due to config.ini setting" msgstr "" #: sickchill/gui/slick/views/config.mako:250 @@ -6458,7 +6458,7 @@ msgid "The old status had a quality in it, using that: " msgstr "" #: sickchill/oldbeard/show_queue.py:478 -msgid "The show in {showDir} is already in your show list, skipping" +msgid "The show in {show_dir} is already in your show list, skipping" msgstr "" #: sickchill/gui/slick/views/config_notifications.mako:1306 @@ -7009,7 +7009,7 @@ msgid "Unable to create subtitles folder {subs_new_path}" msgstr "" #: sickchill/oldbeard/show_queue.py:381 -msgid "Unable to create the folder {showDir}, can't add the show" +msgid "Unable to create the folder {show_dir}, can't add the show" msgstr "" #: sickchill/views/manage/add_shows.py:632 @@ -7056,7 +7056,7 @@ msgid "Unable to force an update on scene numbering of the show." msgstr "" #: sickchill/oldbeard/show_queue.py:361 -msgid "Unable to get a show {showDir}, can't add the show" +msgid "Unable to get a show {show_dir}, can't add the show" msgstr "" #: sickchill/oldbeard/helpers.py:1448 @@ -9446,4 +9446,3 @@ msgstr "" #: sickchill/views/home.py:1280 msgid "{show_name} has been {paused_resumed}" msgstr "" - diff --git a/sickchill/logger.py b/sickchill/logger.py index 1cc92519a6..1e1da4e666 100644 --- a/sickchill/logger.py +++ b/sickchill/logger.py @@ -1,8 +1,6 @@ -import locale import logging import logging.handlers import os -import platform import re import sys from logging import NullHandler @@ -96,6 +94,7 @@ def __init__(self): logging.getLogger("subliminal"), logging.getLogger("tornado.access"), logging.getLogger("imdbpy.parser.http.piculet"), + logging.getLogger("imdbpy.parser.http.domparser"), logging.getLogger("sqlalchemy.engine"), logging.getLogger("sqlalchemy.pool"), logging.getLogger("sqlalchemy.dialect"), @@ -141,7 +140,7 @@ def init_logging(self, console_logging=False, file_logging=False, debug_logging= # set minimum logging level allowed for loggers for logger in self.loggers: - if logger.name in ("subliminal", "tornado.access", "tornado.general", "imdbpy.parser.http.piculet"): + if logger.name in ("subliminal", "tornado.access", "tornado.general", "imdbpy.parser.http.piculet", "imdbpy.parser.http.domparser"): logger.setLevel("CRITICAL") elif (logger.name.startswith("sqlalchemy") or logger.name.startswith("imdb")) and not self.database_logging: logger.setLevel("WARNING") diff --git a/sickchill/oldbeard/classes.py b/sickchill/oldbeard/classes.py index a33fd1a9d3..73418cb539 100644 --- a/sickchill/oldbeard/classes.py +++ b/sickchill/oldbeard/classes.py @@ -69,11 +69,9 @@ def from_json(self, result_dict): @classmethod def make_result(cls, result_dict): - show = sickchill.show.Show.Show.validate_indexer_id(result_dict.get("indexerid")) - if not show[1]: - return show[0] - - show = show[1] + error, show = sickchill.show.Show.Show.validate_indexer_id(result_dict.get("indexerid")) + if not show: + return error episode_objects = [show.get_episode(result_dict.get("season"), ep) for ep in result_dict.get("episodes").split("|") if ep] provider = sickchill.oldbeard.providers.getProviderClass(result_dict.get("provider")) diff --git a/sickchill/oldbeard/generic_queue.py b/sickchill/oldbeard/generic_queue.py index b703d92f7e..5e11fe45c3 100644 --- a/sickchill/oldbeard/generic_queue.py +++ b/sickchill/oldbeard/generic_queue.py @@ -5,9 +5,9 @@ class QueuePriorities(object): - LOW = 10 - NORMAL = 20 - HIGH = 30 + LOW: int = 10 + NORMAL: int = 20 + HIGH: int = 30 class GenericQueue(object): diff --git a/sickchill/oldbeard/postProcessor.py b/sickchill/oldbeard/postProcessor.py index ae94c63852..d2c3931611 100644 --- a/sickchill/oldbeard/postProcessor.py +++ b/sickchill/oldbeard/postProcessor.py @@ -1012,7 +1012,7 @@ def process(self): "File has season {episode_season}, while the indexer is on season {newest_season}. " "Try forcing a full update on the show and process this file again. " "The file may be incorrectly labeled or fake, aborting." - ).format(episode_season=episode_season, newest_season_num=newest_season) + ).format(episode_season=episode_season, newest_season=newest_season) ) return False diff --git a/sickchill/oldbeard/providers/thepiratebay.py b/sickchill/oldbeard/providers/thepiratebay.py index dd1f466f37..550c0d8e59 100644 --- a/sickchill/oldbeard/providers/thepiratebay.py +++ b/sickchill/oldbeard/providers/thepiratebay.py @@ -99,7 +99,7 @@ def search(self, search_strings): all_search_strings = search_strings[mode] if mode != "RSS" and self.show and self.show.imdb_id: - all_search_strings = [self.show.imdb_id] + search_strings[mode] + all_search_strings = {self.show.imdb_id}.union(search_strings[mode]) for search_string in all_search_strings: search_urls = (self.urls["search"], self.urls["rss"])[mode == "RSS"] diff --git a/sickchill/oldbeard/show_queue.py b/sickchill/oldbeard/show_queue.py index 62c60826fd..e24b29b89a 100644 --- a/sickchill/oldbeard/show_queue.py +++ b/sickchill/oldbeard/show_queue.py @@ -2,6 +2,7 @@ import traceback from collections import namedtuple from operator import attrgetter +from typing import overload, Tuple, Union import dateutil.parser @@ -29,58 +30,59 @@ class ShowQueue(generic_queue.GenericQueue): def __init__(self): super(ShowQueue, self).__init__() + # noinspection SpellCheckingInspection self.queue_name = "SHOWQUEUE" - def _is_in_queue(self, show, actions): + def _is_in_queue(self, show: "TVShow", actions) -> bool: if not show: return False return show.indexerid in (x.show.indexerid if x.show else 0 for x in self.queue if x.action_id in actions) - def _is_being_somethinged(self, show, actions): + def _actions_in_queue(self, show: "TVShow", actions) -> bool: return self.currentItem is not None and show == self.currentItem.show and self.currentItem.action_id in actions - # def is_in_add_queue(self, show): + # def is_in_add_queue(self, show: "TVShow") -> bool: # return self._isInQueue(show, (ShowQueueActions.ADD,)) - def is_in_update_queue(self, show): + def is_in_update_queue(self, show: "TVShow") -> bool: return self._is_in_queue(show, (ShowQueueActions.UPDATE, ShowQueueActions.FORCEUPDATE)) - def is_in_refresh_queue(self, show): + def is_in_refresh_queue(self, show: "TVShow") -> bool: return self._is_in_queue(show, (ShowQueueActions.REFRESH,)) - def is_in_rename_queue(self, show): + def is_in_rename_queue(self, show: "TVShow") -> bool: return self._is_in_queue(show, (ShowQueueActions.RENAME,)) - def is_in_remove_queue(self, show): + def is_in_remove_queue(self, show: "TVShow") -> bool: return self._is_in_queue(show, (ShowQueueActions.REMOVE,)) - def is_in_subtitle_queue(self, show): + def is_in_subtitle_queue(self, show: "TVShow") -> bool: return self._is_in_queue(show, (ShowQueueActions.SUBTITLE,)) - def is_being_added(self, show): - return self._is_being_somethinged(show, (ShowQueueActions.ADD,)) + def is_being_added(self, show: "TVShow") -> bool: + return self._actions_in_queue(show, (ShowQueueActions.ADD,)) - def is_being_updated(self, show): - return self._is_being_somethinged(show, (ShowQueueActions.UPDATE, ShowQueueActions.FORCEUPDATE)) + def is_being_updated(self, show: "TVShow") -> bool: + return self._actions_in_queue(show, (ShowQueueActions.UPDATE, ShowQueueActions.FORCEUPDATE)) - def is_being_refreshed(self, show): - return self._is_being_somethinged(show, (ShowQueueActions.REFRESH,)) + def is_being_refreshed(self, show: "TVShow") -> bool: + return self._actions_in_queue(show, (ShowQueueActions.REFRESH,)) - def is_being_renamed(self, show): - return self._is_being_somethinged(show, (ShowQueueActions.RENAME,)) + def is_being_renamed(self, show: "TVShow") -> bool: + return self._actions_in_queue(show, (ShowQueueActions.RENAME,)) - def is_being_removed(self, show): - return self._is_being_somethinged(show, (ShowQueueActions.REMOVE,)) + def is_being_removed(self, show: "TVShow") -> bool: + return self._actions_in_queue(show, (ShowQueueActions.REMOVE,)) - def is_being_subtitled(self, show): - return self._is_being_somethinged(show, (ShowQueueActions.SUBTITLE,)) + def is_being_subtitled(self, show: "TVShow") -> bool: + return self._actions_in_queue(show, (ShowQueueActions.SUBTITLE,)) @property - def loading_show_list(self): + def loading_show_list(self) -> {"ShowQueueItem"}: return {x for x in self.queue + [self.currentItem] if x and x.is_loading} - def update_show(self, show, force=False): + def update_show(self, show: "TVShow", force: bool = False) -> "ShowQueueItem": if self.is_being_added(show): raise CantUpdateShowException(f"{show.name} is still being added, wait until it is finished before you update.") @@ -96,7 +98,7 @@ def update_show(self, show, force=False): self.add_item(queue_item_obj) return queue_item_obj - def refresh_show(self, show, force=False): + def refresh_show(self, show: "TVShow", force=False) -> Union["ShowQueueItem", None]: if self.is_being_refreshed(show) and not force: raise CantRefreshShowException("This show is already being refreshed, not refreshing again.") @@ -116,22 +118,21 @@ def refresh_show(self, show, force=False): self.add_item(queue_item_obj) return queue_item_obj - def rename_show_episodes(self, show): + def rename_show_episodes(self, show: "TVShow") -> "ShowQueueItem": queue_item_obj = QueueItemRename(show) self.add_item(queue_item_obj) return queue_item_obj - def download_subtitles(self, show): + def download_subtitles(self, show: "TVShow") -> "ShowQueueItem": queue_item_obj = QueueItemSubtitle(show) self.add_item(queue_item_obj) return queue_item_obj - # noinspection PyPep8Naming def add_show( self, indexer, indexer_id, - showDir, + show_dir, default_status=None, quality=None, season_folders=None, @@ -145,7 +146,7 @@ def add_show( whitelist=None, default_status_after=None, root_dir=None, - ): + ) -> "ShowQueueItem": if lang is None: lang = settings.INDEXER_DEFAULT_LANGUAGE @@ -155,7 +156,7 @@ def add_show( queue_item_obj = QueueItemAdd( indexer, indexer_id, - showDir, + show_dir, default_status, quality, season_folders, @@ -174,7 +175,7 @@ def add_show( self.add_item(queue_item_obj) return queue_item_obj - def remove_show(self, show, full=False): + def remove_show(self, show: "TVShow", full: bool = False) -> "ShowQueueItem": if not show: raise CantRemoveShowException("Failed removing show: Show does not exist") @@ -201,6 +202,7 @@ def __init__(self): REFRESH = 1 ADD = 2 UPDATE = 3 + # noinspection SpellCheckingInspection FORCEUPDATE = 4 RENAME = 5 SUBTITLE = 6 @@ -233,15 +235,15 @@ def __init__(self, action_id, show): super(ShowQueueItem, self).__init__(ShowQueueActions.names[action_id], action_id) self.show = show - def is_in_queue(self): + def is_in_queue(self) -> bool: return self in settings.showQueueScheduler.action.queue + [settings.showQueueScheduler.action.currentItem] @property - def show_name(self): + def show_name(self) -> str: return self.show.name if self.show else "UNSET" @property - def is_loading(self): + def is_loading(self) -> bool: return False @@ -251,7 +253,7 @@ def __init__( self, indexer, indexer_id, - showDir, + show_dir, default_status, quality, season_folders, @@ -268,7 +270,7 @@ def __init__( ): super(QueueItemAdd, self).__init__(ShowQueueActions.ADD, None) - self.showDir = showDir + self.show_dir = show_dir self.indexer = indexer self.indexer_id = indexer_id self.default_status = default_status @@ -296,7 +298,7 @@ def show_name(self): Returns the show name if there is a show object created, if not returns the dir that the show is being added to. """ - return self.show.name if self.show else self.showDir.rsplit(os.sep)[-1] if self.showDir else _("Loading") + return self.show.name if self.show else self.show_dir.rsplit(os.sep)[-1] if self.show_dir else _("Loading") @property def is_loading(self): @@ -334,7 +336,9 @@ def run(self): super(QueueItemAdd, self).run() logger.info( - _("Starting to add show {0}").format(_("by ShowDir: {0}").format(self.showDir) if self.showDir else _("by Indexer Id: {0}").format(self.indexer_id)) + _("Starting to add show {0}").format( + _("by show_dir: {0}").format(self.show_dir) if self.show_dir else _("by Indexer Id: {0}").format(self.indexer_id) + ) ) # make sure the Indexer IDs are valid try: @@ -350,11 +354,11 @@ def run(self): self._finish_early() return - # Let's try to create the show Dir if it's not provided. This way we force the show dir to build build using the + # Let's try to create the show Dir if it's not provided. This way we force the show dir to build using the # Indexers provided series name - if self.root_dir and not self.showDir: + if self.root_dir and not self.show_dir: if not s.seriesName: - logger.info(_("Unable to get a show {showDir}, can't add the show").format(showDir=self.showDir)) + logger.info(_("Unable to get a show {show_dir}, can't add the show").format(show_dir=self.show_dir)) self._finish_early() return @@ -367,26 +371,25 @@ def run(self): except (TypeError, ValueError): logger.info(_("Could not append the show year folder for the show: {show_dir}").format(show_dir=show_dir)) - self.showDir = os.path.join(self.root_dir, sanitize_filename(show_dir)) + self.show_dir = os.path.join(self.root_dir, sanitize_filename(show_dir)) if settings.ADD_SHOWS_WO_DIR: - logger.info(_("Skipping initial creation of {showDir} due to config.ini setting").format(showDir=self.showDir)) + logger.info(_("Skipping initial creation of {show_dir} due to config.ini setting").format(show_dir=self.show_dir)) else: - dir_exists = makeDir(self.showDir) + dir_exists = makeDir(self.show_dir) if not dir_exists: - logger.info(_("Unable to create the folder {showDir}, can't add the show").format(showDir=self.showDir)) + logger.info(_("Unable to create the folder {show_dir}, can't add the show").format(show_dir=self.show_dir)) self._finish_early() return - chmodAsParent(self.showDir) + chmodAsParent(self.show_dir) - # this usually only happens if they have an NFO in their show dir which gave us a Indexer ID that has no proper english version of the show + # this usually only happens if they have an NFO in their show dir which gave us an indexer id that has no proper english version of the show if getattr(s, "seriesName", None) is None: - # noinspection PyPep8 error_string = _( - "Show in {showDir} has no name on {indexer}, probably " + "Show in {show_dir} has no name on {indexer}, probably " "searched with the wrong language. Delete .nfo and add manually in the correct language." - ).format(showDir=self.showDir, indexer=sickchill.indexer.name(self.indexer)) + ).format(show_dir=self.show_dir, indexer=sickchill.indexer.name(self.indexer)) logger.warning(error_string) ui.notifications.error(_("Unable to add show"), error_string) @@ -395,7 +398,7 @@ def run(self): return except Exception as error: error_string = ( - f"Unable to look up the show in {self.showDir} on {sickchill.indexer.name(self.indexer)} " + f"Unable to look up the show in {self.show_dir} on {sickchill.indexer.name(self.indexer)} " f"using ID {self.indexer_id}, not using the NFO. Delete .nfo and try adding manually again." ) @@ -405,7 +408,7 @@ def run(self): if settings.USE_TRAKT: trakt_api = TraktAPI(settings.SSL_VERIFY, settings.TRAKT_TIMEOUT) - title = self.showDir.split("/")[-1] + title = self.show_dir.split("/")[-1] data = {"shows": [{"title": title, "ids": {sickchill.indexer.slug(self.indexer): self.indexer_id}}]} trakt_api.traktRequest("sync/watchlist/remove", data, method="POST") @@ -429,7 +432,7 @@ def run(self): self.show = new_show # set up initial values - self.show.location = self.showDir + self.show.location = self.show_dir self.show.subtitles = self.subtitles if self.subtitles is not None else settings.SUBTITLES_DEFAULT self.show.subtitles_sc_metadata = self.subtitles_sc_metadata self.show.quality = self.quality if self.quality else settings.QUALITY_DEFAULT @@ -471,7 +474,7 @@ def run(self): return except MultipleShowObjectsException: - error_string = _("The show in {showDir} is already in your show list, skipping").format(showDir=self.showDir) + error_string = _("The show in {show_dir} is already in your show list, skipping").format(show_dir=self.show_dir) logger.warning(error_string) ui.notifications.error(_("Show skipped"), error_string) @@ -548,14 +551,14 @@ def run(self): def _finish_early(self): if self.show is not None: - settings.showQueueScheduler.action.remove_show(self.show) + Show.delete(self.show) super(QueueItemAdd, self).finish() self.finish() class QueueItemRefresh(ShowQueueItem): - def __init__(self, show=None, force=False): + def __init__(self, show: "TVShow" = None, force=False): super(QueueItemRefresh, self).__init__(ShowQueueActions.REFRESH, show) # do refreshes first because they're quick @@ -583,7 +586,7 @@ def run(self): class QueueItemRename(ShowQueueItem): - def __init__(self, show=None): + def __init__(self, show: "TVShow" = None): super(QueueItemRename, self).__init__(ShowQueueActions.RENAME, show) def run(self): @@ -620,7 +623,7 @@ def run(self): class QueueItemSubtitle(ShowQueueItem): - def __init__(self, show=None): + def __init__(self, show: "TVShow" = None): super(QueueItemSubtitle, self).__init__(ShowQueueActions.SUBTITLE, show) def run(self): @@ -635,7 +638,7 @@ def run(self): class QueueItemUpdate(ShowQueueItem): - def __init__(self, show=None, force=False): + def __init__(self, show: "TVShow" = None, force=False): action = ShowQueueActions.FORCEUPDATE if force else ShowQueueActions.UPDATE super(QueueItemUpdate, self).__init__(action, show) self.force = force @@ -665,32 +668,31 @@ def run(self): logger.debug(traceback.format_exc()) # get episode list from DB - DBEpList = self.show.load_episodes_from_db() + database_episodes = self.show.load_episodes_from_db() # get episode list from TVDB logger.debug(f"Loading all episodes from {self.show.idxr.name}") try: - IndexerEpList = self.show.load_episodes_from_indexer(self.force) + indexer_episodes = self.show.load_episodes_from_indexer(self.force) except Exception as error: logger.exception(f"Unable to get info from {self.show.idxr.name}, the show info will not be refreshed: {error}") - IndexerEpList = None - - if IndexerEpList: - for curSeason in IndexerEpList: - for curEpisode in IndexerEpList[curSeason]: - curEp = self.show.get_episode(curSeason, curEpisode) - curEp.save_to_db() - - if curSeason in DBEpList and curEpisode in DBEpList[curSeason]: - del DBEpList[curSeason][curEpisode] - - # remaining episodes in the DB list are not on the indexer, just delete them from the DB - for curSeason in DBEpList: - for curEpisode in DBEpList[curSeason]: - logger.info("Permanently deleting episode {0:02d}E{1:02d} from the database".format(curSeason, curEpisode)) - curEp = self.show.get_episode(curSeason, curEpisode) + indexer_episodes = dict() + + for season in indexer_episodes: + for episode in indexer_episodes[season]: + self.show.get_episode(season, episode).save_to_db() + if season in database_episodes and episode in database_episodes[season]: + del database_episodes[season][episode] + + if indexer_episodes: + # remaining episodes in the database list are not on the indexer, just delete them from the DB + # TODO: database: maybe add a "marked for deletion" column to the database, and when we delete an episode just mark it and do the actual deletion after a few days. + # episodes marked for deletion can be hidden from the ui, but we wont lose downloaded files for episodes that are then brought back and they wont be sent to download again? + for season in database_episodes: + for episode in database_episodes[season]: + logger.info("Permanently deleting episode {0:02d}E{1:02d} from the database".format(season, episode)) try: - curEp.delete_episode() + self.show.get_episode(season, episode).delete_episode() except EpisodeDeletedException: pass @@ -710,10 +712,10 @@ def run(self): class QueueItemRemove(ShowQueueItem): - def __init__(self, show=None, full=False): + def __init__(self, show: "TVShow" = None, full: bool = False): super(QueueItemRemove, self).__init__(ShowQueueActions.REMOVE, show) - # lets make sure this happens before any other high priority actions + # noinspection IncorrectFormatting self.priority = generic_queue.QueuePriorities.HIGH**2 self.full = full @@ -729,6 +731,7 @@ def run(self): logger.warning(_("Unable to delete show from Trakt: {show_name}. Error: {error}").format(show_name=self.show.name, error=error)) # If any notification fails, don't stop removal + # noinspection PyBroadException try: # TODO: episode_object is undefined here, so all of these will fail. # send notifications @@ -749,7 +752,7 @@ def run(self): # do the library update for Synology Indexer notifiers.synoindex_notifier.addFolder(self.show.get_location) - # do the library update for pyTivo + # do the library update for tivo notifiers.pytivo_notifier.update_library(self.show) except Exception: logger.info(_("Some notifications could not be sent. Continuing removal of {}...").format(self.show.name)) diff --git a/sickchill/oldbeard/traktChecker.py b/sickchill/oldbeard/traktChecker.py index 5c3c66a46a..a3b162f9ff 100644 --- a/sickchill/oldbeard/traktChecker.py +++ b/sickchill/oldbeard/traktChecker.py @@ -331,7 +331,7 @@ def _remove_watched_shows_from_sickchill(self): continue if progress and progress.get("aired", True) == progress.get("completed", False): - settings.showQueueScheduler.action.remove_show(show, full=True) + Show.delete(show, remove_files=True) logger.debug("Show: {0} has been removed from SickChill".format(show.name)) logger.debug("SHOW_SICKCHILL::REMOVE::FINISH - Trakt Show Watchlist") diff --git a/sickchill/show/Show.py b/sickchill/show/Show.py index d04a21c899..91da926bde 100644 --- a/sickchill/show/Show.py +++ b/sickchill/show/Show.py @@ -2,7 +2,7 @@ from typing import TYPE_CHECKING, Union from sickchill import settings -from sickchill.helper.exceptions import CantRefreshShowException, CantRemoveShowException, MultipleShowObjectsException +from sickchill.helper.exceptions import CantRefreshShowException, CantRemoveShowException, CantUpdateShowException, MultipleShowObjectsException from sickchill.oldbeard.common import Quality, SKIPPED, WANTED from sickchill.oldbeard.db import DBConnection @@ -11,35 +11,8 @@ class Show(object): - def __init__(self): - pass - - @staticmethod - def delete(indexer_id, remove_files=False): - """ - Try to delete a show - :param indexer_id: The unique id of the show to delete - :param remove_files: ``True`` to remove the files associated with the show, ``False`` otherwise - :return: A tuple containing: - - an error message if the show could not be deleted, ``None`` otherwise - - the show object that was deleted, if it exists, ``None`` otherwise - """ - - error, show = Show.validate_indexer_id(indexer_id) - - if error is not None: - return error, show - - if show: - try: - settings.showQueueScheduler.action.remove_show(show, bool(remove_files)) - except CantRemoveShowException as exception: - return str(exception), show - - return None, show - @staticmethod - def find(shows, indexer_id) -> Union["TVShow", None]: + def find(shows: list, indexer_id: Union[int, str]) -> Union["TVShow", None]: """ Find a show by its indexer id in the provided list of shows :param shows: The list of shows to search in @@ -47,10 +20,7 @@ def find(shows, indexer_id) -> Union["TVShow", None]: :return: The desired show if found, ``None`` if not found :throw: ``MultipleShowObjectsException`` if multiple shows match the provided ``indexer_id`` """ - if not indexer_id or not shows: - return None - - if not isinstance(indexer_id, (str, int)): + if not (indexer_id and shows): return None if isinstance(indexer_id, list): @@ -59,6 +29,8 @@ def find(shows, indexer_id) -> Union["TVShow", None]: indexer_ids = [int(x) for x in indexer_id] else: + if not isinstance(indexer_id, (int, str)): + return None indexer_ids = [int(indexer_id)] results = [show for show in shows if show.indexerid in indexer_ids] @@ -72,18 +44,15 @@ def find(shows, indexer_id) -> Union["TVShow", None]: raise MultipleShowObjectsException() @staticmethod - def find_name(shows, name) -> Union["TVShow", None]: + def find_name(shows: list, name: str) -> Union["TVShow", None]: """ - Find a show by its indexer id in the provided list of shows + Find a show by its namer in the provided list of shows :param shows: The list of shows to search in :param name: The known name of the desired show :return: The desired show if found, ``None`` if not found :throw: ``MultipleShowObjectsException`` if multiple shows match the provided ``indexer_id`` """ - if not name or not shows: - return None - - if not isinstance(name, str): + if not (name and shows): return None if isinstance(name, list): @@ -92,6 +61,9 @@ def find_name(shows, name) -> Union["TVShow", None]: if not isinstance(item, str): return None else: + if not isinstance(name, str): + return None + names = [name] results = [show for show in shows if show.name in names] @@ -105,7 +77,7 @@ def find_name(shows, name) -> Union["TVShow", None]: raise MultipleShowObjectsException() @staticmethod - def overall_stats(): + def overall_stats() -> dict: db = DBConnection() shows = settings.show_list today = date.today().toordinal() @@ -114,7 +86,7 @@ def overall_stats(): snatched_status = Quality.SNATCHED + Quality.SNATCHED_PROPER + Quality.SNATCHED_BEST total_status = [SKIPPED, WANTED] - results = db.select("SELECT airdate, status " "FROM tv_episodes " "WHERE season > 0 " "AND episode > 0 " "AND airdate > 1") + results = db.select("SELECT airdate, status FROM tv_episodes WHERE season > 0 AND episode > 0 AND airdate > 1") stats = { "episodes": { @@ -141,18 +113,47 @@ def overall_stats(): return stats @staticmethod - def pause(indexer_id, pause=None): + def validate_indexer_id(show_or_id: Union["TVShow", str, int], show_list: list = None) -> (Union[str, None], Union["TVShow", None]): + """ + Check that the provided indexer_id is valid and corresponds with a known show + :param show_or_id: The indexer id or object to check + :param show_list: The list of shows to check against + :return: A tuple containing: + - an error message if the indexer id is not correct, ``None`` otherwise + - the show object corresponding to ``indexer_id`` if it exists, ``None`` otherwise + """ + + # NOTE: cannot import TVShow here because of circular import, check this way + if hasattr(show_or_id, "custom_name"): + return None, show_or_id + + try: + indexer_id = int(show_or_id) + except (TypeError, ValueError): + return _("Invalid show ID") + f" {show_or_id}", None + + if not show_list: + show_list = settings.show_list + + try: + show = Show.find(show_list, indexer_id) + except MultipleShowObjectsException: + return "Unable to find the specified show", None + + return None, show + + @staticmethod + def pause(show_or_id: Union[int, str, "TVShow"], pause: Union[bool, None] = None) -> (Union[str, None], Union["TVShow", None]): """ Change the pause state of a show - :param indexer_id: The unique id of the show to update + :param show_or_id: The unique id or object of the show to update :param pause: ``True`` to pause the show, ``False`` to resume the show, ``None`` to toggle the pause state :return: A tuple containing: - an error message if the pause state could not be changed, ``None`` otherwise - the show object that was updated, if it exists, ``None`` otherwise """ - error, show = Show.validate_indexer_id(indexer_id) - + error, show = Show.validate_indexer_id(show_or_id) if error is not None: return error, show @@ -166,18 +167,17 @@ def pause(indexer_id, pause=None): return None, show @staticmethod - def refresh(indexer_id, force=False): + def refresh(show_or_id: Union[int, str, "TVShow"], force: bool = False) -> (Union[str, None], Union["TVShow", None]): """ Try to refresh a show :param force: Force refresh - :param indexer_id: The unique id of the show to refresh + :param show_or_id: The unique id or object of the show to refresh :return: A tuple containing: - an error message if the show could not be refreshed, ``None`` otherwise - the show object that was refreshed, if it exists, ``None`` otherwise """ - error, show = Show.validate_indexer_id(indexer_id) - + error, show = Show.validate_indexer_id(show_or_id) if error is not None: return error, show @@ -189,23 +189,43 @@ def refresh(indexer_id, force=False): return None, show @staticmethod - def validate_indexer_id(indexer_id): + def update(show_or_id: Union[int, str, "TVShow"], force: bool = False) -> (Union[str, None], Union["TVShow", None]): """ - Check that the provided indexer_id is valid and corresponds with a known show - :param indexer_id: The indexer id to check + Try to delete a show + :param show_or_id: The unique id or object of the show to delete + :param force: Force update :return: A tuple containing: - - an error message if the indexer id is not correct, ``None`` otherwise - - the show object corresponding to ``indexer_id`` if it exists, ``None`` otherwise + - an error message if the show could not be deleted, ``None`` otherwise + - the show object that was deleted, if it exists, ``None`` otherwise """ + error, show = Show.validate_indexer_id(show_or_id) + if error is not None: + return error, show try: - indexer_id = int(indexer_id) - except (TypeError, ValueError): - return "Invalid show ID", None + settings.showQueueScheduler.action.update_show(show, bool(force)) + except CantUpdateShowException as exception: + return str(exception), show + + return None, show + + @staticmethod + def delete(show_or_id: Union[int, str, "TVShow"], remove_files: bool = False) -> (Union[str, None], Union["TVShow", None]): + """ + Try to delete a show + :param show_or_id: The unique id or object of the show to delete + :param remove_files: ``True`` to remove the files associated with the show, ``False`` otherwise + :return: A tuple containing: + - an error message if the show could not be deleted, ``None`` otherwise + - the show object that was deleted, if it exists, ``None`` otherwise + """ + error, show = Show.validate_indexer_id(show_or_id) + if error is not None: + return error, show try: - show = Show.find(settings.show_list, indexer_id) - except MultipleShowObjectsException: - return "Unable to find the specified show", None + settings.showQueueScheduler.action.remove_show(show, bool(remove_files)) + except CantRemoveShowException as exception: + return str(exception), show return None, show diff --git a/sickchill/show/indexers/handler.py b/sickchill/show/indexers/handler.py index e0bb0dd41c..4eb85868da 100644 --- a/sickchill/show/indexers/handler.py +++ b/sickchill/show/indexers/handler.py @@ -120,8 +120,8 @@ def search_indexers_for_series_id(self, name=None, indexerid=None, language=None logger.debug("Failed to find {} on {}".format(search, self.name(i))) continue - ShowObj = Show.find(settings.show_list, result.id) - if indexerid and ShowObj and ShowObj.indexerid == result.id: + show = Show.find(settings.show_list, result.id) + if indexerid and show and show.indexerid == result.id: return i, result elif indexerid and indexerid == result.id: return i, result diff --git a/sickchill/show_updater.py b/sickchill/show_updater.py index f28b5d9ef5..b2d1a4d877 100644 --- a/sickchill/show_updater.py +++ b/sickchill/show_updater.py @@ -6,6 +6,7 @@ from sickchill import logger, settings from sickchill.helper.exceptions import CantRefreshShowException, CantUpdateShowException from sickchill.oldbeard import db, network_timezones, ui +from sickchill.show import Show class ShowUpdater(object): @@ -66,11 +67,11 @@ def run(self, force=False): # When last_update is not set from the cache or the show was in the tvdb updated list we update the show if not last_update or (cur_show.indexerid in updated_shows and not skip_update): - pi_list.append(settings.showQueueScheduler.action.update_show(cur_show, force)) + pi_list.append(Show.update(cur_show, force)) elif not skip_update: # TODO: do we really need to refresh every show every day if it is not updated? # Temporarily use the same duration for paused as ended - pi_list.append(settings.showQueueScheduler.action.refresh_show(cur_show, force)) + pi_list.append(Show.refresh(cur_show, force)) except (CantUpdateShowException, CantRefreshShowException) as error: logger.info(_("Automatic update failed: {error}").format(error=error)) diff --git a/sickchill/sickchill-service.py b/sickchill/sickchill-service.py new file mode 100644 index 0000000000..cf865ad424 --- /dev/null +++ b/sickchill/sickchill-service.py @@ -0,0 +1,55 @@ +import multiprocessing +import os.path +import sys + +import servicemanager +import SickChill +import win32service +import win32serviceutil + + +class SickChillService(win32serviceutil.ServiceFramework): + _svc_name_ = "sickchill" + _svc_display_name_ = "sickchill service" + _svc_description_ = "Runs sickchill web service in the background." + _exe_name_ = sys.executable + _exe_args_ = f"-u -E {os.path.abspath(__file__)}" + + proc = None + + def SvcStop(self): + self.ReportServiceStatus(win32service.SERVICE_STOP_PENDING) + if self.proc: + self.proc.terminate() + + def SvcRun(self): + self.proc = multiprocessing.Process(target=SickChill.main) + self.proc.start() + self.ReportServiceStatus(win32service.SERVICE_RUNNING) + self.SvcDoRun() + self.ReportServiceStatus(win32service.SERVICE_STOP_PENDING) + + def SvcDoRun(self): + self.proc.join() + + +if __name__ == "__main__": + # noinspection PyBroadException + try: + if len(sys.argv) == 1: + import win32traceutil + + servicemanager.Initialize() + servicemanager.PrepareToHostSingle(SickChillService) + servicemanager.StartServiceCtrlDispatcher() + elif "--fg" in sys.argv: + sys.argv.remove("--fg") + SickChill.main() + else: + win32serviceutil.HandleCommandLine(SickChillService) + except (SystemExit, KeyboardInterrupt): + raise + except Exception: + import traceback + + traceback.print_exc() diff --git a/sickchill/tv.py b/sickchill/tv.py index fb9f1f946a..ed2231fd33 100644 --- a/sickchill/tv.py +++ b/sickchill/tv.py @@ -105,15 +105,11 @@ class TVShow(object): airs = DirtySetter("") startyear = DirtySetter(0) paused = DirtySetter(0) - air_by_date = DirtySetter(0) subtitles = DirtySetter(int(settings.SUBTITLES_DEFAULT)) subtitles_sc_metadata = DirtySetter(0) dvdorder = DirtySetter(0) lang = DirtySetter("en") last_update_indexer = DirtySetter(1) - sports = DirtySetter(0) - anime = DirtySetter(0) - scene = DirtySetter(0) rls_ignore_words = DirtySetter("") rls_require_words = DirtySetter("") rls_prefer_words = DirtySetter("") @@ -127,37 +123,94 @@ def __init__(self, indexer, indexerid: int, lang=""): self.episodes = {} self.next_airdate = "" self.release_groups = None - self._location = "" self.indexer = indexer self.indexerid = indexerid self.lang = lang + self._location = "" + self._anime = 0 + self._scene = 0 + self._sports = 0 + self._air_by_date = 0 + other_show = Show.find(settings.show_list, self.indexerid) if other_show is not None: raise MultipleShowObjectsException("Can't create a show if it already exists") self.load_from_db() + def __refresh_if_changed(self, attribute: str, value) -> None: + existing = getattr(self, f"_{attribute}") + if type(existing) is not type(value): + logger.warning(f"Please report that TVShow.{attribute} was set with an incorrect value ({value})", exc_info=True, stack_info=True) + if existing != value: + setattr(self, f"_{attribute}", value) + self.dirty = True + """ + TODO: move refresh, update, pause, etc logic here from Show + It is incredibly inefficient to send just the indexerid + and then have to iterate over the whole show list to + find the show object so we can do an action on it. + This makes every refresh use a ton more cpu cycles for example, + and the larger their show list is the worse it gets + Also, having all of the logic that only acts on one class + within the class itself makes it easier to find what methods exist. + """ + # Note: do not enable this until we have a queue we can set these as pending and only do it when processing show lists are done + # Show.refresh(self, True) + @property - def name(self): + def name(self) -> str: return self.custom_name or self.show_name @name.setter - def name(self, name): - self.show_name = name + def name(self, value) -> None: + self.show_name = value @property - def is_anime(self): + def is_anime(self) -> bool: return int(self.anime) > 0 @property - def is_sports(self): + def anime(self) -> int: + return self._anime + + @anime.setter + def anime(self, value: int) -> None: + self.__refresh_if_changed("anime", value) + + @property + def is_sports(self) -> bool: return int(self.sports) > 0 @property - def is_scene(self): + def sports(self) -> int: + return self._sports + + @sports.setter + def sports(self, value: int) -> None: + self.__refresh_if_changed("sports", value) + + @property + def is_scene(self) -> bool: return int(self.scene) > 0 + @property + def scene(self) -> int: + return self._scene + + @scene.setter + def scene(self, value: int) -> None: + self.__refresh_if_changed("scene", value) + + @property + def air_by_date(self) -> int: + return self._air_by_date + + @air_by_date.setter + def air_by_date(self, value: int) -> None: + self.__refresh_if_changed("air_by_date", value) + @property def network_logo_name(self): return unidecode(self.network).lower() @@ -918,7 +971,7 @@ def load_imdb_info(self): MaxRetryError, ) as error: logger.info(f"Could not get IMDB info: see debug logs for details") - logger.debug(f"IMDB traceback: {error}") + logger.debug(f"IMDB traceback: {error}", exc_info=True) except (SyntaxError, KeyError): logger.info("Could not get info from IDMb, pip install lxml") @@ -2510,6 +2563,7 @@ def rename(self): current_path = absolute_current_path_no_ext if absolute_current_path_no_ext.startswith(self.show.location): + # noinspection IncorrectFormatting current_path = absolute_current_path_no_ext[len(self.show.location) :] logger.debug(f"Renaming/moving episode from the base path {self.location} to {absolute_proper_path}") diff --git a/sickchill/views/api/webapi.py b/sickchill/views/api/webapi.py index ce0fe51b1e..bfc23e9a22 100644 --- a/sickchill/views/api/webapi.py +++ b/sickchill/views/api/webapi.py @@ -14,7 +14,7 @@ import sickchill from sickchill import logger, settings from sickchill.helper.common import dateFormat, dateTimeFormat, pretty_file_size, sanitize_filename, timeFormat, try_int -from sickchill.helper.exceptions import CantUpdateShowException, ShowDirectoryNotFoundException +from sickchill.helper.exceptions import ShowDirectoryNotFoundException from sickchill.helper.quality import get_quality_string from sickchill.init_helpers import get_current_version from sickchill.oldbeard import classes, db, helpers, network_timezones, scdatetime, search_queue, ui @@ -679,7 +679,6 @@ def run(self): grouped_coming_episodes = ComingEpisodes.get_coming_episodes(self.type, self.sort, True, self.paused) data = {section: [] for section in grouped_coming_episodes.keys()} - # noinspection PyCompatibility for section, coming_episodes in grouped_coming_episodes.items(): for coming_episode in coming_episodes: data[section].append( @@ -1710,7 +1709,7 @@ def run(self): for indexer, indexer_results in search_results.items(): for result in indexer_results: # Skip it if it's in our show list already, and we only want new shows - in_show_list = sickchill.show.Show.Show.find(settings.show_list, int(result["id"])) is not None + in_show_list = Show.find(settings.show_list, int(result["id"])) is not None if in_show_list and self.only_new: continue @@ -2243,7 +2242,6 @@ def __init__(self, args, kwargs): def run(self): """Delete a show in SickChill""" error, show = Show.delete(self.indexerid, self.removefiles) - if error: return _responds(RESULT_FAILURE, msg=error) @@ -2406,7 +2404,6 @@ def __init__(self, args, kwargs): def run(self): """Pause or un-pause a show""" error, show = Show.pause(self.indexerid, self.pause) - if error: return _responds(RESULT_FAILURE, msg=error) @@ -2432,7 +2429,6 @@ def __init__(self, args, kwargs): def run(self): """Refresh a show in SickChill""" error, show = Show.refresh(self.indexerid) - if error: return _responds(RESULT_FAILURE, msg=error) @@ -2712,16 +2708,11 @@ def __init__(self, args, kwargs): def run(self): """Update a show in SickChill""" - show_obj = Show.find(settings.show_list, int(self.indexerid)) - if not show_obj: - return _responds(RESULT_FAILURE, msg="Show not found") + error, show = Show.update(self.indexerid, True) + if error: + _responds(RESULT_FAILURE, msg=f"Unable to update {show.name}") - try: - settings.showQueueScheduler.action.update_show(show_obj, True) - return _responds(RESULT_SUCCESS, msg=str(show_obj.name) + " has queued to be updated") - except CantUpdateShowException as error: - logger.debug(f"API::Unable to update show: {error}") - return _responds(RESULT_FAILURE, msg=f"Unable to update {show_obj.name}") + return _responds(RESULT_SUCCESS, msg=str(show.name) + " has queued to be updated") # noinspection PyAbstractClass diff --git a/sickchill/views/home.py b/sickchill/views/home.py index 376bc7b663..15d8628649 100644 --- a/sickchill/views/home.py +++ b/sickchill/views/home.py @@ -4,7 +4,6 @@ import json import os import time -import traceback import urllib.parse from pathlib import Path from urllib.parse import unquote_plus @@ -15,7 +14,7 @@ from sickchill import adba, logger, settings from sickchill.helper import try_int from sickchill.helper.common import episode_num, pretty_file_size -from sickchill.helper.exceptions import CantRefreshShowException, CantUpdateShowException, NoNFOException, ShowDirectoryNotFoundException +from sickchill.helper.exceptions import CantUpdateShowException, NoNFOException, ShowDirectoryNotFoundException from sickchill.oldbeard.blackandwhitelist import BlackAndWhiteList, short_group_names from sickchill.oldbeard.common import cpu_presets, FAILED, IGNORED, Overview, Quality, SKIPPED, SNATCHED_BEST, statusStrings, UNAIRED, WANTED from sickchill.oldbeard.scene_numbering import ( @@ -282,13 +281,13 @@ def testSABnzbd(self): apikey = filters.unhide(settings.SAB_APIKEY, self.get_body_argument("apikey")) host = config.clean_url(self.get_body_argument("host")) - connection, accesMsg = sab.get_sab_acces_method(host) + connection, access_msg = sab.get_sab_acces_method(host) if connection: - authed, authMsg = sab.test_client_connection(host, username, password, apikey) + authed, auth_msg = sab.test_client_connection(host, username, password, apikey) if authed: return _("Success. Connected and authenticated") else: - return _("Authentication failed. SABnzbd expects") + " '" + accesMsg + "' " + _("as authentication method") + ", '" + authMsg + "'" + return _("Authentication failed. SABnzbd expects") + " '" + access_msg + "' " + _("as authentication method") + ", '" + auth_msg + "'" else: return _("Unable to connect to host") @@ -364,18 +363,18 @@ def testProwl(self): return _("Test prowl notice failed") def testBoxcar2(self): - accesstoken = self.get_query_argument("accesstoken") - result = notifiers.boxcar2_notifier.test_notify(accesstoken) + access_token = self.get_query_argument("accesstoken") + result = notifiers.boxcar2_notifier.test_notify(access_token) if result: return _("Boxcar2 notification succeeded. Check your Boxcar2 clients to make sure it worked") else: return _("Error sending Boxcar2 notification") def testPushover(self): - userKey = self.get_query_argument("userKey") - apiKey = self.get_query_argument("apiKey") + user_key = self.get_query_argument("userKey") + api_key = self.get_query_argument("apiKey") - result = notifiers.pushover_notifier.test_notify(userKey, apiKey) + result = notifiers.pushover_notifier.test_notify(user_key, api_key) if result: return _("Pushover notification succeeded. Check your Pushover clients to make sure it worked") else: @@ -637,7 +636,6 @@ def loadShowNotifyLists(): rows = main_db_con.select("SELECT indexer_id, show_name, notify_list FROM tv_shows ORDER BY show_name") data = {} - size = 0 for r in rows: notify_list = {"emails": "", "prowlAPIs": ""} if r["notify_list"] and len(r["notify_list"]) > 0: @@ -678,12 +676,12 @@ def saveShowNotifyList(self): # Change email or prowl with new or keep the existing emails = self.get_body_argument("emails", show_email) - prowlAPIs = self.get_body_argument("prowlAPIs", show_prowl) + prowl_apis = self.get_body_argument("prowlAPIs", show_prowl) - entries = {"emails": emails, "prowlAPIs": prowlAPIs} + entries = {"emails": emails, "prowlAPIs": prowl_apis} # TODO: Split emails and do validators.email - if emails or prowlAPIs: + if emails or prowl_apis: result = main_db_con.action("UPDATE tv_shows SET notify_list = ? WHERE indexer_id = ?", [str(entries), show]) else: result = main_db_con.action("UPDATE tv_shows SET notify_list = Null WHERE indexer_id = ?", [show]) @@ -708,8 +706,8 @@ def testEmail(self): return _("ERROR: {last_error}").format(last_error=notifiers.email_notifier.last_err) def testPushalot(self): - authorizationToken = self.get_body_argument("authorizationToken") - result = notifiers.pushalot_notifier.test_notify(authorizationToken) + authorization_token = self.get_body_argument("authorizationToken") + result = notifiers.pushalot_notifier.test_notify(authorization_token) if result: return _("Pushalot notification succeeded. Check your Pushalot clients to make sure it worked") else: @@ -742,8 +740,8 @@ def getPushbulletChannels(self): return _("Error sending Pushbullet notification") def status(self): - tvdirFree = helpers.disk_usage_hr(settings.TV_DOWNLOAD_DIR) - rootDir = {} + tvdir_free = helpers.disk_usage_hr(settings.TV_DOWNLOAD_DIR) + root_dir = {} if settings.ROOT_DIRS: backend_pieces = settings.ROOT_DIRS.split("|") @@ -753,15 +751,15 @@ def status(self): if backend_dirs: for subject in backend_dirs: - rootDir[subject] = helpers.disk_usage_hr(subject) + root_dir[subject] = helpers.disk_usage_hr(subject) t = PageTemplate(rh=self, filename="status.mako") return t.render( title=_("Status"), header=_("Status"), topmenu="system", - tvdirFree=tvdirFree, - rootDir=rootDir, + tvdirFree=tvdir_free, + rootDir=root_dir, controller="home", action="status", ) @@ -855,7 +853,7 @@ def displayShow(self): return self._genericMessage(_("Error"), _("Show not in show list")) main_db_con = db.DBConnection() - seasonResults = main_db_con.select( + season_results = main_db_con.select( "SELECT DISTINCT season FROM tv_episodes WHERE showid = ? AND season IS NOT NULL ORDER BY season DESC", [show_obj.indexerid] ) @@ -934,7 +932,7 @@ def displayShow(self): "icon": "menu-icon-emby", } ) - if seasonResults and int(seasonResults[-1]["season"]) == 0: + if season_results and int(season_results[-1]["season"]) == 0: if settings.DISPLAY_SHOW_SPECIALS: # noinspection PyPep8 submenu.append( @@ -972,13 +970,13 @@ def displayShow(self): Overview.SNATCHED_PROPER: 0, Overview.SNATCHED_BEST: 0, } - epCats = {} + episode_categories = {} - for cur_result in sql_results: - curEpCat = show_obj.get_overview(cur_result["status"]) - if curEpCat: - epCats[str(cur_result["season"]) + "x" + str(cur_result["episode"])] = curEpCat - ep_counts[curEpCat] += 1 + for current_result in sql_results: + current_episode_category = show_obj.get_overview(current_result["status"]) + if current_episode_category: + episode_categories[str(current_result["season"]) + "x" + str(current_result["episode"])] = current_episode_category + ep_counts[current_episode_category] += 1 shows = [] anime = [] @@ -1020,11 +1018,11 @@ def displayShow(self): show_message=show_message, show=show_obj, sql_results=sql_results, - seasonResults=seasonResults, + seasonResults=season_results, sorted_show_lists=[["Shows", shows], ["Anime", anime]], bwl=bwl, ep_counts=ep_counts, - epCats=epCats, + epCats=episode_categories, all_scene_exceptions=show_obj.exceptions, scene_numbering=get_scene_numbering_for_show(indexerid, indexer), xem_numbering=get_xem_numbering_for_show(indexerid, indexer), @@ -1090,21 +1088,19 @@ def editShow( ): anidb_failed = False - try: - show_obj = Show.find(settings.show_list, int(show)) - except (ValueError, TypeError): - errString = _("Invalid show ID") + f": {show}" + error, show_obj = Show.validate_indexer_id(show) + if error: if directCall: - return [errString] + return [error] else: - return self._genericMessage(_("Error"), errString) + return self._genericMessage(_("Error"), error) if not show_obj: - errString = _("Unable to find the specified show") + f": {show}" + error_string = _("Unable to find the specified show") + f": {show}" if directCall: - return [errString] + return [error_string] else: - return self._genericMessage(_("Error"), errString) + return self._genericMessage(_("Error"), error_string) show_obj.exceptions = sickchill.oldbeard.scene_exceptions.get_all_scene_exceptions(show_obj.indexerid) @@ -1221,34 +1217,36 @@ def editShow( def get_images(image): if image.startswith("data:image"): start = image.index("base64,") + 7 - img_data = base64.b64decode(image[start:]) - return img_data, img_data + _img_data = base64.b64decode(image[start:]) + return _img_data, _img_data else: image_parts = image.split("|") - img_url = image_parts[0] - img_data = getShowImage(img_url) + _img_data = getShowImage(image_parts[0]) if len(image_parts) > 1: - img_thumb_url = image_parts[1] - img_thumb_data = getShowImage(img_thumb_url) - return img_data, img_thumb_data + return _img_data, getShowImage(image_parts[1]) else: - return img_data, img_data + return _img_data, _img_data if poster: img_data, img_thumb_data = get_images(poster) dest_path = settings.IMAGE_CACHE.poster_path(show_obj.indexerid) dest_thumb_path = settings.IMAGE_CACHE.poster_thumb_path(show_obj.indexerid) + # noinspection PyProtectedMember metadata_generator._write_image(img_data, dest_path, overwrite=True) + # noinspection PyProtectedMember metadata_generator._write_image(img_thumb_data, dest_thumb_path, overwrite=True) if banner: img_data, img_thumb_data = get_images(banner) dest_path = settings.IMAGE_CACHE.banner_path(show_obj.indexerid) dest_thumb_path = settings.IMAGE_CACHE.banner_thumb_path(show_obj.indexerid) + # noinspection PyProtectedMember metadata_generator._write_image(img_data, dest_path, overwrite=True) + # noinspection PyProtectedMember metadata_generator._write_image(img_thumb_data, dest_thumb_path, overwrite=True) if fanart: img_data, img_thumb_data = get_images(fanart) dest_path = settings.IMAGE_CACHE.fanart_path(show_obj.indexerid) + # noinspection PyProtectedMember metadata_generator._write_image(img_data, dest_path, overwrite=True) # If directCall from mass_edit_update no scene exceptions handling or blackandwhite list handling @@ -1277,9 +1275,8 @@ def get_images(image): if bool(show_obj.season_folders) != season_folders: show_obj.season_folders = season_folders - try: - settings.showQueueScheduler.action.refresh_show(show_obj) - except CantRefreshShowException as error: + error, show = Show.refresh(show_obj) + if error: errors.append(_("Unable to refresh this show: {error}").format(error=error)) show_obj.paused = paused @@ -1313,9 +1310,8 @@ def get_images(image): # change it try: show_obj.location = location - try: - settings.showQueueScheduler.action.refresh_show(show_obj, True) - except CantRefreshShowException as error: + error, show = Show.refresh(show_obj, True) + if error: errors.append(_("Unable to refresh this show: {error}").format(error=error)) # grab updated info from TVDB # show_obj.loadEpisodesFromIndexer() @@ -1331,20 +1327,18 @@ def get_images(image): # force the update if do_update: - try: - settings.showQueueScheduler.action.update_show(show_obj, True) - time.sleep(cpu_presets[settings.CPU_PRESET]) - except CantUpdateShowException as error: + error, show = Show.update(show_obj, True) + if error: errors.append(_("Unable to update show: {error}").format(error=error)) - import traceback + time.sleep(cpu_presets[settings.CPU_PRESET]) logger.debug("Updating show exceptions") try: sickchill.oldbeard.scene_exceptions.update_custom_scene_exceptions(show_obj.indexerid, exceptions) time.sleep(cpu_presets[settings.CPU_PRESET]) except CantUpdateShowException: - logger.debug(traceback.format_exc()) + logger.debug("Error updating scene exceptions", exc_info=True) errors.append(_("Unable to force an update on scene exceptions of the show.")) if do_update_scene_numbering: @@ -1365,9 +1359,9 @@ def get_images(image): return self.redirect("/home/displayShow?show=" + show) - def togglePause(self, show=None): + def togglePause(self): + show = self.get_query_argument("show") error, show = Show.pause(show) - if error: return self._genericMessage(_("Error"), error) @@ -1379,22 +1373,21 @@ def togglePause(self, show=None): def deleteShow(self): show = self.get_query_argument("show") - full = int(self.get_query_argument("full")) - if show: - error, show = Show.delete(show, full) + full = bool(try_int(self.get_query_argument("full"))) - if error: - return self._genericMessage(_("Error"), error) + error, show = Show.delete(show, full) + if error: + return self._genericMessage(_("Error"), error) - ui.notifications.message( - _("{show_name} has been {deleted_trashed} {was_deleted}").format( - show_name=show.name, - deleted_trashed=(_("deleted"), _("trashed"))[settings.TRASH_REMOVE_SHOW], - was_deleted=(_("(media untouched)"), _("(with all related media)"))[bool(full)], - ) + ui.notifications.message( + _("{show_name} has been {deleted_trashed} {was_deleted}").format( + show_name=show.name, + deleted_trashed=(_("deleted"), _("trashed"))[settings.TRASH_REMOVE_SHOW], + was_deleted=(_("(media untouched)"), _("(with all related media)"))[full], ) + ) - time.sleep(cpu_presets[settings.CPU_PRESET]) + time.sleep(cpu_presets[settings.CPU_PRESET]) # Remove show from 'RECENT SHOWS' in 'Shows' menu settings.SHOWS_RECENT = [x for x in settings.SHOWS_RECENT if x["indexerid"] != show.indexerid] @@ -1424,24 +1417,20 @@ def updateShow(self): show = self.get_query_argument("show") force = bool(try_int(self.get_query_argument("force", default="0"))) - if not show: - return self._genericMessage(_("Error"), _("Invalid show ID")) - - show_obj = Show.find(settings.show_list, int(show)) + # force the update + error, show = Show.update(show, force) - if not show_obj: - return self._genericMessage(_("Error"), _("Unable to find the specified show")) + # This is a show validation error + if error and not show: + return self._genericMessage(_("Error"), error) - # force the update - try: - settings.showQueueScheduler.action.update_show(show_obj, bool(force)) - except CantUpdateShowException as error: + if error: ui.notifications.error(_("Unable to update this show."), f"{error}") # just give it some time time.sleep(cpu_presets[settings.CPU_PRESET]) - return self.redirect(f"/home/displayShow?show={show_obj.indexerid}") + return self.redirect(f"/home/displayShow?show={show.indexerid}") def subtitleShow(self): show = self.get_query_argument("show") @@ -1506,7 +1495,9 @@ def updateEMBY(self, show=None): def setStatus(self, direct=False): if direct is True: - show = self.to_change_show + # noinspection PyUnresolvedReferences + show = self.to_change_showa + # noinspection PyUnresolvedReferences eps = self.to_change_eps status = self.get_body_argument("newStatus") else: @@ -1663,7 +1654,7 @@ def testRename(self): return self._genericMessage(_("Error"), _("Show not in show list")) try: - show_obj.location + show_obj.location # noqa except ShowDirectoryNotFoundException: return self._genericMessage(_("Error"), _("Can't rename episodes when the show dir is missing.")) @@ -1689,7 +1680,7 @@ def doRename(self, show=None, eps=None): return self._genericMessage(_("Error"), _("Show not in show list")) try: - show_obj.location + show_obj.location # noqa except ShowDirectoryNotFoundException: return self._genericMessage(_("Error"), _("Can't rename episodes when the show dir is missing.")) @@ -1700,7 +1691,7 @@ def doRename(self, show=None, eps=None): for cur_ep in eps.split("|"): ep_info = cur_ep.split("x") - # this is probably the worst possible way to deal with double eps but I've kinda painted myself into a corner here with this stupid database + # this is probably the worst possible way to deal with double eps, but I've kinda painted myself into a corner here with this stupid database ep_result = main_db_con.select("SELECT location FROM tv_episodes WHERE showid = ? AND season = ? AND episode = ?", [show, ep_info[0], ep_info[1]]) if not ep_result: logger.warning(f"Unable to find an episode for {show}: {cur_ep} , skipping") @@ -1812,7 +1803,7 @@ def searchEpisode(self, show=None, season=None, episode=None, downCurQuality=0): settings.searchQueueScheduler.action.add_item(ep_queue_item) if not ep_queue_item.started and ep_queue_item.success is None: - return json.dumps({"result": "success"}) # I Actually want to call it queued, because the search hasnt been started yet! + return json.dumps({"result": "success"}) # I Actually want to call it queued, because the search hasn't been started yet! if ep_queue_item.started and ep_queue_item.success is None: return json.dumps({"result": "success"}) else: @@ -1836,6 +1827,7 @@ def getEpisodes(search_thread, search_status): def relative_ep_location(ep_loc, show_loc): """Returns the relative location compared to the show's location""" if ep_loc and show_loc and ep_loc.lower().startswith(show_loc.lower()): + # noinspection IncorrectFormatting return ep_loc[len(show_loc) + 1 :] else: return ep_loc @@ -2064,7 +2056,7 @@ def retryEpisode(self, show, season, episode, downCurQuality=0): settings.searchQueueScheduler.action.add_item(ep_queue_item) if not ep_queue_item.started and ep_queue_item.success is None: - return json.dumps({"result": "success"}) # I Actually want to call it queued, because the search hasnt been started yet! + return json.dumps({"result": "success"}) # I Actually want to call it queued, because the search hasn't been started yet! if ep_queue_item.started and ep_queue_item.success is None: return json.dumps({"result": "success"}) else: @@ -2080,7 +2072,6 @@ def fetch_releasegroups(show_name): logger.info(f"ReleaseGroups: {groups}") return json.dumps({"result": "success", "groups": groups}) except AttributeError as error: - logger.debug(f"Unable to get ReleaseGroups: {error}") - logger.debug(traceback.format_exc()) + logger.debug(f"Unable to get ReleaseGroups: {error}", exc_info=True) return json.dumps({"result": "failure"}) diff --git a/sickchill/views/index.py b/sickchill/views/index.py index 28adcde977..b17cfdc03f 100644 --- a/sickchill/views/index.py +++ b/sickchill/views/index.py @@ -7,7 +7,6 @@ from concurrent.futures import ThreadPoolExecutor from mimetypes import guess_type from secrets import compare_digest -from typing import TYPE_CHECKING from urllib.parse import urljoin from mako.exceptions import RichTraceback @@ -32,9 +31,6 @@ except Exception: has_cryptography = False -if TYPE_CHECKING: - from tornado.web import Application - class BaseHandler(RequestHandler): def data_received(self, chunk): diff --git a/sickchill/views/manage/add_shows.py b/sickchill/views/manage/add_shows.py index 3a5f4da127..0e62cad875 100644 --- a/sickchill/views/manage/add_shows.py +++ b/sickchill/views/manage/add_shows.py @@ -565,7 +565,7 @@ def finishAddShow(): settings.showQueueScheduler.action.add_show( indexer, indexer_id, - showDir=show_dir, + show_dir=show_dir, default_status=int(defaultStatus), quality=newQuality, season_folders=season_folders, diff --git a/sickchill/views/manage/index.py b/sickchill/views/manage/index.py index 73b9fe1165..e8f394da4f 100644 --- a/sickchill/views/manage/index.py +++ b/sickchill/views/manage/index.py @@ -274,8 +274,9 @@ def downloadSubtitleMissed(self, *args, **kwargs): return self.redirect("/manage/subtitleMissed/") - def backlogShow(self, indexer_id): - show_object = Show.find(settings.show_list, int(indexer_id)) + def backlogShow(self): + show = self.get_query_argument("indexer_id") + show_object = Show.find(settings.show_list, show) if show_object: settings.backlogSearchScheduler.action.searchBacklog([show_object]) @@ -641,23 +642,23 @@ def massUpdate(self): if curShowID == "": continue - show_object = Show.find(settings.show_list, int(curShowID)) + show_object = Show.find(settings.show_list, curShowID) if not show_object: continue if curShowID in delete: - settings.showQueueScheduler.action.remove_show(show_object, True) + Show.delete(show_object, True) # don't do anything else if it's being deleted continue if curShowID in remove: - settings.showQueueScheduler.action.remove_show(show_object) + Show.delete(show_object) # don't do anything else if it's being removed continue if curShowID in update: try: - settings.showQueueScheduler.action.update_show(show_object, True) + Show.update(show_object, True) updates.append(show_object.name) except CantUpdateShowException as error: errors.append(_("Unable to update show: {exception_format}").format(exception_format=error)) @@ -665,7 +666,7 @@ def massUpdate(self): # don't bother refreshing shows that were updated anyway if curShowID in refresh and curShowID not in update: try: - settings.showQueueScheduler.action.refresh_show(show_object, force=True) + Show.refresh(show_object, force=True) refreshes.append(show_object.name) except CantRefreshShowException as error: errors.append(_("Unable to refresh show {show_name}: {exception_format}").format(show_name=show_object.name, exception_format=error)) diff --git a/tests/sickchill_tests/show/test_show.py b/tests/sickchill_tests/show/test_show.py index 6bfa56b0b6..ae139b5e75 100644 --- a/tests/sickchill_tests/show/test_show.py +++ b/tests/sickchill_tests/show/test_show.py @@ -54,17 +54,21 @@ def test_find(self): for tests in test_cases, unicode_test_cases: for (use_shows, indexer_id), result in tests.items(): + print(f"{indexer_id}: {result}") + if use_shows: - assert Show.find(shows, indexer_id) == result + assert Show.find(shows, indexer_id) == result, (indexer_id, result, shows) else: - assert Show.find(None, indexer_id) == result + # noinspection PyTypeChecker + assert Show.find(None, indexer_id) == result, (indexer_id, result, shows) with self.assertRaises(MultipleShowObjectsException): Show.find(shows_duplicate, 456) + Show.find(shows_duplicate, "456") def test_validate_indexer_id(self): """ - Tests if the indexer_id is valid and if so if it returns the right show + Tests if the indexer_id is valid and that it returns the right show """ settings.QUALITY_DEFAULT = Quality.FULLHDTV @@ -79,13 +83,11 @@ def test_validate_indexer_id(self): show789, ] - invalid_show_id = ("Invalid show ID", None) - indexer_id_list = [None, "", "", "123", "123", "456", "456", "789", "789", 123, 456, 789, ["123", "456"], ["123", "456"], [123, 456]] results_list = [ - invalid_show_id, - invalid_show_id, - invalid_show_id, + (_("Invalid show ID") + f" {None}", None), + (_("Invalid show ID") + f" {''}", None), + (_("Invalid show ID") + f" {''}", None), (None, show123), (None, show123), (None, show456), @@ -95,9 +97,9 @@ def test_validate_indexer_id(self): (None, show123), (None, show456), (None, show789), - invalid_show_id, - invalid_show_id, - invalid_show_id, + (_("Invalid show ID") + f" {['123', '456']}", None), + (_("Invalid show ID") + f" {['123', '456']}", None), + (_("Invalid show ID") + f" {[123, 456]}", None), ] assert len(indexer_id_list) == len(results_list), "Number of parameters ({0:d}) and results ({1:d}) does not match".format( @@ -105,7 +107,7 @@ def test_validate_indexer_id(self): ) for index, indexer_id in enumerate(indexer_id_list): - assert Show.validate_indexer_id(indexer_id) == results_list[index] + assert Show.validate_indexer_id(indexer_id) == results_list[index], (indexer_id, results_list[index]) class TestTVShow(TVShow): diff --git a/tests/test_browser.py b/tests/test_browser.py index 9f3c94fc67..840f140a1c 100644 --- a/tests/test_browser.py +++ b/tests/test_browser.py @@ -1,5 +1,6 @@ import logging import os +import string import sys import unittest from pathlib import Path @@ -35,9 +36,11 @@ def test_folders_at_path(self): if os.name == "nt": assert test_list[0]["currentPath"] == "My Computer", test_list[0] drives = browser.get_windows_drives() - assert len(drives) == len(test_list[1:]) + assert len(drives) + assert len(test_list[1:]) for item in test_list[1:]: - assert item["path"] in drives + if item["path"].upper()[0] in string.ascii_uppercase: + assert item["path"][:3] in drives, (item["path"], drives) else: assert test_list[0]["currentPath"] == "/" diff --git a/tests/test_name_parser.py b/tests/test_name_parser.py index 8183235dfb..4f0d2debbd 100644 --- a/tests/test_name_parser.py +++ b/tests/test_name_parser.py @@ -3,8 +3,8 @@ import sys import unittest -from sickchill import tv -from sickchill.oldbeard import common +from sickchill import settings, tv +from sickchill.oldbeard import common, scheduler, show_queue from sickchill.oldbeard.name_parser import parser from tests import conftest @@ -143,6 +143,7 @@ ("Season 02\\03-04-05 - Ep Name.ext", parser.ParseResult(None, None, 2, [3, 4, 5], extra_info="Ep Name"), ["no_season", "season_only"]), ] +# noinspection SpellCheckingInspection UNICODE_TEST_CASES = [ ( "The.Big.Bang.Theory.2x07.The.Panty.Piñata.Polarization.720p.HDTV.x264.AC3-SHELDON.mkv", @@ -154,6 +155,7 @@ ), ] +# noinspection SpellCheckingInspection FAILURE_CASES = ["7sins-jfcs01e09-720p-bluray-x264"] @@ -444,8 +446,9 @@ class AnimeTests(conftest.SickChillTestDBCase): def __init__(self, something): super().__init__(something) super().setUp() - self.show = tv.TVShow(1, 1, "en") - self.show.anime = True + self.show: tv.TVShow = tv.TVShow(1, 1, "en") + self.show.paused = True + self.show.anime = 1 def tearDown(self): parser.name_parser_cache.data.clear() diff --git a/tests/test_snatch.py b/tests/test_snatch.py index 7cebb99400..caeafc8058 100644 --- a/tests/test_snatch.py +++ b/tests/test_snatch.py @@ -45,10 +45,10 @@ def _create_fake_xml(items): :param items: :return: """ - xml = '' # noqa: E501 + xml = '' for item in items: xml += "" + item + "\n" - xml += "http://fantasy.com/" + item + "" + xml += "https://www.newznab.com/" + item + "" xml += "" return xml @@ -64,7 +64,7 @@ class SearchTest(conftest.SickChillTestDBCase): @staticmethod def _fake_get_url(url, headers=None): """ - Fake getting a url + Fake requesting url :param url: :param headers: diff --git a/tests/test_xem.py b/tests/test_xem.py index a325f07118..37fbf6c1c6 100644 --- a/tests/test_xem.py +++ b/tests/test_xem.py @@ -25,10 +25,11 @@ def load_shows_from_db(): sql_results = test_main_db_con.select("SELECT * FROM tv_shows") for sql_show in sql_results: + # noinspection PyBroadException try: cur_show = TVShow(int(sql_show["indexer"]), int(sql_show["indexer_id"])) settings.show_list.append(cur_show) - except Exception: # noqa: S110 + except Exception: pass @staticmethod @@ -46,28 +47,6 @@ def load_from_db(): except Exception as error: print(f"There was an error creating the show {error}") - # @staticmethod - # def test_formatting(): - # """ - # Test formatting - # """ - # name = "Game.of.Thrones.S03.720p.HDTV.x264-CtrlHD" - # release = "Game of Thrones" - # - # # m = re.match('(?P(?>\d{1,4})(?![ip])).+', name) - # - # escaped_name = re.sub('\\\\[\\s.-]', '\W+', re.escape(release)) - # cur_regex = '^' + escaped_name + r'\W+(?:(?:S\d[\dE._ -])|' + \ - # r'(?:\d\d?x)|(?:\d{4}\W\d\d\W\d\d)|(?:(?:part|pt)[\._ -]?(\d|[ivx]))|' + \ - # r'Season\W+\d+\W+|E\d+\W+|(?:\d{1,4}.+\d{1,}[a-zA-Z]{2}\W+[a-zA-Z]{3,}\W+\d{4}.+))' - # - # # print("Checking if show " + name + " matches " + curRegex) - # - # match = re.search(cur_regex, name, re.I) - # if match: - # # print("Matched " + curRegex + " to " + name) - # pass - if __name__ == "__main__": print("==================")