- Change default from WV to AES
- Change way to select title lang
This commit is contained in:
@@ -62,8 +62,8 @@ class TID(Service):
|
|||||||
@click.argument("title", type=str)
|
@click.argument("title", type=str)
|
||||||
@click.option("-SE", "--season", default=None, required=False, type=int,
|
@click.option("-SE", "--season", default=None, required=False, type=int,
|
||||||
help="TrueID sometime not provide Season in info, so specify it manually.")
|
help="TrueID sometime not provide Season in info, so specify it manually.")
|
||||||
@click.option("-d", "--drm", default="wv",type=click.Choice(["aes", "wv","None"]), required=False,
|
@click.option("-d", "--drm", default="aes",type=click.Choice(["aes", "wv","None"]), required=False,
|
||||||
help="TrueID can be force to use DASH or HLS, this option will force the use of DASH (default: wv).")
|
help="TrueID can be force to use DASH or HLS, this option will force the use of DASH (default: aes).")
|
||||||
@click.option("-tl", "--title_lang", default="ja", required=False, type=str,
|
@click.option("-tl", "--title_lang", default="ja", required=False, type=str,
|
||||||
help="If the title is foreigner audio language, specify the foreigner language.")
|
help="If the title is foreigner audio language, specify the foreigner language.")
|
||||||
@click.pass_context
|
@click.pass_context
|
||||||
@@ -283,8 +283,7 @@ class TID(Service):
|
|||||||
# original_lang=Language.find(self.LANGUAGE_MAP[res_json['source_country'].lower()]) if res_json.get('source_country') else 'en'
|
# original_lang=Language.find(self.LANGUAGE_MAP[res_json['source_country'].lower()]) if res_json.get('source_country') else 'en'
|
||||||
|
|
||||||
series_title=response.json().get('seasonShelf', '').get('title', '')
|
series_title=response.json().get('seasonShelf', '').get('title', '')
|
||||||
# with open("seasonShelf.json", "w") as f:
|
|
||||||
# json.dump(series_title, f, indent=4, ensure_ascii=False)
|
|
||||||
|
|
||||||
season_detail=None
|
season_detail=None
|
||||||
url=None
|
url=None
|
||||||
@@ -339,7 +338,6 @@ class TID(Service):
|
|||||||
# manifest, license = self._get_manifest(url, drm)
|
# manifest, license = self._get_manifest(url, drm)
|
||||||
|
|
||||||
chapters = self.find_hhmmss_in_dict(ep_item)
|
chapters = self.find_hhmmss_in_dict(ep_item)
|
||||||
# print(ep_item.get('season_no', '') if not self.season else self.season)
|
|
||||||
titles.append({
|
titles.append({
|
||||||
"title":ep_item.get('title', ''),
|
"title":ep_item.get('title', ''),
|
||||||
"series_title":series_title,
|
"series_title":series_title,
|
||||||
@@ -356,6 +354,7 @@ class TID(Service):
|
|||||||
'manifest': manifest,
|
'manifest': manifest,
|
||||||
'license': license,
|
'license': license,
|
||||||
'chapters': chapters,
|
'chapters': chapters,
|
||||||
|
# 'language': original_lang
|
||||||
|
|
||||||
# 'original_lang': original_lang,
|
# 'original_lang': original_lang,
|
||||||
})
|
})
|
||||||
@@ -367,7 +366,7 @@ class TID(Service):
|
|||||||
number=x.get("episode_no"),
|
number=x.get("episode_no"),
|
||||||
name=x.get("title"),
|
name=x.get("title"),
|
||||||
data=x,
|
data=x,
|
||||||
# original_lang=x.get("original_lang", ""),
|
language=x.get("language",self.title_lang),
|
||||||
) for x in titles])
|
) for x in titles])
|
||||||
|
|
||||||
# DASH Example: Service requires separate API calls per codec/range.
|
# DASH Example: Service requires separate API calls per codec/range.
|
||||||
@@ -381,7 +380,7 @@ class TID(Service):
|
|||||||
if title.data['drm'] == "aes":
|
if title.data['drm'] == "aes":
|
||||||
|
|
||||||
|
|
||||||
tracks.add(HLS.from_text(res, manifest).to_tracks(self.title_lang))
|
tracks.add(HLS.from_text(res, manifest).to_tracks(title.language))
|
||||||
|
|
||||||
else:
|
else:
|
||||||
# r = self.session.get(url=manifest)
|
# r = self.session.get(url=manifest)
|
||||||
@@ -389,7 +388,7 @@ class TID(Service):
|
|||||||
tracks.add(DASH.from_text(
|
tracks.add(DASH.from_text(
|
||||||
text=res,
|
text=res,
|
||||||
url=manifest
|
url=manifest
|
||||||
).to_tracks(self.title_lang))
|
).to_tracks(title.language))
|
||||||
|
|
||||||
|
|
||||||
return tracks
|
return tracks
|
||||||
|
|||||||
Reference in New Issue
Block a user