From 4ca8c2ec367974a24693ee8e66e67045334a096c Mon Sep 17 00:00:00 2001 From: Alhaziel Date: Mon, 23 Mar 2020 11:48:03 +0100 Subject: [PATCH] Fix Serie CB01 --- channels/cineblog01.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/channels/cineblog01.py b/channels/cineblog01.py index 8a2f462f..861fa864 100644 --- a/channels/cineblog01.py +++ b/channels/cineblog01.py @@ -174,10 +174,12 @@ def episodios(item): itlist = [] special_list = [] for item in itemlist: + item.title = re.sub(r'\.(\D)',' \\1', item.title) if re.sub(r'(\[[^\]]+\])','',item.title) in [config.get_localized_string(30161),config.get_localized_string(60355),config.get_localized_string(60357)]: special_list.append(item) else: - match = support.match(item.title, patron=r'(\d+.\d+)').match + match = support.match(item.title, patron=r'(\d+.\d+)').match.replace('x','') + item.order = match if match not in title_dict: title_dict[match] = item elif match in title_dict and item.contentLanguage == title_dict[match].contentLanguage \ @@ -190,7 +192,7 @@ def episodios(item): for key, value in title_dict.items(): itlist.append(value) - return sorted(itlist, key=lambda it: (it.contentLanguage, it.title)) + special_list + return sorted(itlist, key=lambda it: (it.contentLanguage, int(it.order))) + special_list return locals() @@ -274,7 +276,7 @@ def findvid_serie(item): lnkblk = [] lnkblkp = [] - data = re.sub(r'((?:

|)?[0-9]+(?:×|×)[0-9]+[^<]+)', '' ,item.url) + data = re.sub(r'((?:

|)?[^\d]*\d*(?:×|×)[0-9]+[^<]+)', '' ,item.url) # Blocks with split blk = re.split(r"(?:>\s*)?([A-Za-z\s0-9]*):\s*<", data, re.S)