From 69f451c332899d9f3ed01d9758a594388a810813 Mon Sep 17 00:00:00 2001 From: Alhaziel Date: Thu, 11 Apr 2019 18:33:16 +0200 Subject: [PATCH 1/2] little fix for duration in scrape function --- plugin.video.alfa/channels/support.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/plugin.video.alfa/channels/support.py b/plugin.video.alfa/channels/support.py index 8bedaa27..ad03a54a 100644 --- a/plugin.video.alfa/channels/support.py +++ b/plugin.video.alfa/channels/support.py @@ -166,7 +166,7 @@ def scrape(item, patron = '', listGroups = [], headers="", blacklist="", data="" if scrapedplot: infolabels['plot'] = plot if scrapedduration: - infolabels['duration'] = scrapedduration + infolabels['duration'] = int(scrapedduration) * 60 if scrapedgenre: genres = scrapertoolsV2.find_multiple_matches(scrapedgenre, '[A-Za-z]+') infolabels['genre'] = ", ".join(genres) @@ -361,9 +361,10 @@ def match(item, patron='', patron_block='', headers=''): log('BLOCK= ',block) else: block = data - - matches = scrapertoolsV2.find_multiple_matches(block, patron) - log('MATCHES= ',matches) + + if patron: + matches = scrapertoolsV2.find_multiple_matches(block, patron) + log('MATCHES= ',matches) return matches, data From 34beb82cd24b2f4b53c41ea238a13efd8936e72c Mon Sep 17 00:00:00 2001 From: Alhaziel Date: Thu, 11 Apr 2019 20:23:53 +0200 Subject: [PATCH 2/2] Duration Fix, now recognizes hours and minutes --- plugin.video.alfa/channels/support.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/plugin.video.alfa/channels/support.py b/plugin.video.alfa/channels/support.py index ad03a54a..d9061a47 100644 --- a/plugin.video.alfa/channels/support.py +++ b/plugin.video.alfa/channels/support.py @@ -166,6 +166,9 @@ def scrape(item, patron = '', listGroups = [], headers="", blacklist="", data="" if scrapedplot: infolabels['plot'] = plot if scrapedduration: + matches = scrapertoolsV2.find_multiple_matches(scrapedduration, r'([0-9])\s*?(?:[hH]|:|\.|,|\\|\/|\||\s)\s*?([0-9]+)') + for h, m in matches: + scrapedduration = int(h) * 60 + int(m) infolabels['duration'] = int(scrapedduration) * 60 if scrapedgenre: genres = scrapertoolsV2.find_multiple_matches(scrapedgenre, '[A-Za-z]+')