2323
2424
2525# Logic class
26- from .. DASH . extractor import ClearKey
26+ from .decrypt import M3U8_Decryption
2727from .estimator import M3U8_Ts_Estimator
2828from .parser import M3U8_Parser
2929from .url_fixer import M3U8_UrlFix
@@ -68,7 +68,7 @@ def __init__(self, url: str, tmp_folder: str, license_url: Optional[str] = None,
6868 self .enable_retry = ENABLE_RETRY
6969
7070 # Util class
71- self .decryption : ClearKey = None
71+ self .decryption : M3U8_Decryption = None
7272 self .class_ts_estimator = M3U8_Ts_Estimator (0 , self )
7373 self .class_url_fixer = M3U8_UrlFix (url )
7474
@@ -118,7 +118,7 @@ def parse_data(self, m3u8_content: str) -> None:
118118
119119 if m3u8_parser .keys :
120120 key = self .__get_key__ (m3u8_parser )
121- self .decryption = ClearKey (key , m3u8_parser .keys .get ('iv' ), m3u8_parser .keys .get ('method' ), m3u8_parser .keys .get ('pssh' ))
121+ self .decryption = M3U8_Decryption (key , m3u8_parser .keys .get ('iv' ), m3u8_parser .keys .get ('method' ), m3u8_parser .keys .get ('pssh' ))
122122
123123 segments = [
124124 self .class_url_fixer .generate_full_url (seg ) if "http" not in seg else seg
@@ -127,7 +127,7 @@ def parse_data(self, m3u8_content: str) -> None:
127127 self .segments = segments
128128 self .stream_type = self .get_type_stream (self .segments )
129129 self .class_ts_estimator .total_segments = len (self .segments )
130- console .log (f"[cyan]Detected stream type: [green]{ self .stream_type } " )
130+ console .log (f"[cyan]Detected stream type: [green]{ str ( self .stream_type ). upper () } " )
131131
132132 def get_segments_count (self ) -> int :
133133 """
@@ -350,6 +350,7 @@ async def _concatenate_segments(self, output_path: str, temp_dir: str):
350350 """
351351 Concatenate all segment files in order to the final output file.
352352 """
353+ console .print ("\n [yellow]Concatenating TS ..." )
353354 with open (output_path , 'ab' ) as outfile :
354355 for idx in range (len (self .segments )):
355356 temp_file = self ._get_temp_segment_path (temp_dir , idx )
0 commit comments