diff --git a/resources/contenters/EZTV.py b/resources/contenters/EZTV.py index 34a5cab..dabe984 100644 --- a/resources/contenters/EZTV.py +++ b/resources/contenters/EZTV.py @@ -70,9 +70,9 @@ class EZTV(Content.Content): #print str(result) num = 51 result = re.compile( - r'''class="epinfo">(.+?).+?(.+?).+?(.+?) ''', re.DOTALL).findall(response) - for title, link in result: + for title, link, date in result: #main info = {} num = num - 1 @@ -83,6 +83,7 @@ class EZTV(Content.Content): info['label'] = info['title'] = title info['link'] = link + info['plot'] = info['title']+'\r\nAge: %s' % (date) contentList.append(( int(int(self.sourceWeight) * (int(num))), diff --git a/resources/contenters/KickAssSo.py b/resources/contenters/KickAssSo.py index ae5c8a6..7413fb4 100644 --- a/resources/contenters/KickAssSo.py +++ b/resources/contenters/KickAssSo.py @@ -86,9 +86,9 @@ class KickAssSo(Content.Content): num = 51 good_forums=['TV','Anime','Movies'] result = re.compile( - r'''(.+?).+? in .+?">(.+?)''', + r'''(.+?).+? in .+?">(.+?).+?(.+?).+?(\d+ .+?).+?(\d+?).+?(\d+?)''', re.DOTALL).findall(response) - for link,infolink,title,forum in result: + for link,infolink,title,forum,size,date,seeds,leechers in result: #main if forum in good_forums: info = {} @@ -101,6 +101,9 @@ class KickAssSo(Content.Content): info['label'] = info['title'] = self.unescape(title) info['link'] = link info['infolink']=self.baseurl+infolink + size = self.unescape(self.stripHtml(size)) + date=self.unescape(self.stripHtml(date)) + info['plot'] = info['title']+'\r\n[I](%s) [S/L: %s/%s] [/I]\r\nAge: %s' % (size, seeds, leechers, date) contentList.append(( int(int(self.sourceWeight) * (int(num))),