Merge branch 'development' into python3

# Conflicts:
#	bazarr/main.py

bazarr/embedded_subs_reader.py

@@ -25,8 +25,6 @@ class EmbeddedSubsReader:
             parser = VideoFileParser(ffprobe=self.ffprobe, includeMissing=True, rawMode=False)
             data = parser.parseFfprobe(file)
 
-            detected_languages = []
-
             for detected_language in data['subtitles']:
                 subtitles_list.append([detected_language['language'], detected_language['forced'], detected_language["codec"]])
         else:
@@ -34,7 +32,7 @@ class EmbeddedSubsReader:
                 with open(file, 'rb') as f:
                     mkv = enzyme.MKV(f)
                 for subtitle_track in mkv.subtitle_tracks:
-                    subtitles_list.append([subtitle_track.language, subtitle_track.forced])
+                    subtitles_list.append([subtitle_track.language, subtitle_track.forced, subtitle_track.codec_id])
 
         return subtitles_list
 

bazarr/get_series.py

@@ -124,7 +124,7 @@ def update_series():
                                               'audio_language': profile_id_to_language((show['qualityProfileId'] if sonarr_version.startswith('2') else show['languageProfileId']), audio_profiles),
                                               'sort_title': show['sortTitle'],
                                               'year': show['year'],
-                                              'alternate_title': alternateTitles})
+                                              'alternate_titles': alternateTitles})
             
             # Update existing series in DB
             series_in_db_list = []

libs/subliminal_patch/core.py

@@ -616,6 +616,10 @@ def _search_external_subtitles(path, languages=None, only_one=False, scandir_gen
         # extract the potential language code
         try:
             language_code = p_root.rsplit(".", 1)[1].replace('_', '-')
+            try:
+                Language.fromietf(language_code)
+            except:
+                language_code = None
         except IndexError:
             language_code = None
 

libs/subliminal_patch/providers/argenteam.py

@@ -137,7 +137,7 @@ class ArgenteamProvider(Provider, ProviderSubtitleArchiveMixin):
     provider_name = 'argenteam'
     languages = {Language.fromalpha2(l) for l in ['es']}
     video_types = (Episode, Movie)
-    BASE_URL = "http://www.argenteam.net/"
+    BASE_URL = "https://argenteam.net/"
     API_URL = BASE_URL + "api/v1/"
     subtitle_class = ArgenteamSubtitle
     hearing_impaired_verifiable = False
@@ -245,7 +245,9 @@ class ArgenteamProvider(Provider, ProviderSubtitleArchiveMixin):
                 for s in r['subtitles']:
                     movie_kind = "episode" if is_episode else "movie"
                     page_link = self.BASE_URL + movie_kind + "/" + str(aid)
-                    sub = ArgenteamSubtitle(language, page_link, s['uri'], movie_kind, returned_title,
+                    # use https and new domain
+                    download_link = s['uri'].replace('http://www.argenteam.net/', self.BASE_URL)
+                    sub = ArgenteamSubtitle(language, page_link, download_link, movie_kind, returned_title,
                                             season, episode, year, r.get('team'), r.get('tags'),
                                             r.get('source'), r.get('codec'), content.get("tvdb"), imdb_id,
                                             asked_for_release_group=video.release_group,

views/episodes.tpl

@@ -383,8 +383,8 @@
 			<i class="close icon"></i>
 			<div class="header">
 				<span id="series_title_span"></span> - <span id="season"></span>x<span id="episode"></span> - <span id="episode_title"></span>
-				<br><div class="ui tiny inverted label" style="background-color: #35c5f4;"><span id="episode_path_span"></span></div>
-				<br><div class="ui tiny inverted label" style="background-color: orange;"><span id="episode_scenename_span"></span></div>
+				<br><h5>Episode path is: <div class="ui tiny inverted label" style="background-color: #35c5f4;"><span id="episode_path_span"></span></div>
+				<br>Scenename is: <div class="ui tiny inverted label" style="background-color: orange;"><span id="episode_scenename_span"></span></div></h5>
 			</div>
 			<div class="scrolling content">
 				<table id="search_result" class="display" style="width:100%">

views/movie.tpl

@@ -340,8 +340,8 @@
 			<i class="close icon"></i>
 			<div class="header">
 				<span id="movie_title_span"></span>
-				<br><div class="ui tiny inverted label" style="background-color: #35c5f4;"><span id="movie_path_span"></span></div>
-				<br><div class="ui tiny inverted label" style="background-color: orange;"><span id="movie_scenename_span"></span></div>
+				<br><h5>Movie path is: <div class="ui tiny inverted label" style="background-color: #35c5f4;"><span id="movie_path_span"></span></div>
+				<br>Scenename is: <div class="ui tiny inverted label" style="background-color: orange;"><span id="movie_scenename_span"></span></div></h5>
 			</div>
 			<div class="scrolling content">
 				<table id="search_result" class="display" style="width:100%">