mirror
/
bazarr
mirror of https://github.com/morpheus65535/bazarr
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'development' into python3 

# Conflicts:
#	bazarr/main.py
This commit is contained in:
Louis Vézina 2019-10-07 17:00:52 -04:00
parent 90e9786546 41105c706f
commit 08139b43ed
6 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bazarr/embedded_subs_reader.py
View File

@ -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

2
bazarr/get_series.py
View File

@ -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 = []

4
libs/subliminal_patch/core.py
View File

@ -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

6
libs/subliminal_patch/providers/argenteam.py
View File

@ -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,

4
views/episodes.tpl
View File

@ -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%">

4
views/movie.tpl
View File

@ -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%">