From 847c66bc56b30f521e77eaf2769a48d1f4d74cc3 Mon Sep 17 00:00:00 2001 From: yfang1644 Date: Sat, 7 Nov 2020 15:46:32 +0800 Subject: [PATCH] patch meiju --- addons.xml | 2 +- addons.xml.md5 | 2 +- plugin.video.meiju/addon.xml | 2 +- plugin.video.meiju/default.py | 13 ++++++++----- ...1.0.2.zip => plugin.video.meiju-1.0.3.zip} | Bin 14902 -> 14923 bytes 5 files changed, 11 insertions(+), 8 deletions(-) rename plugin.video.meiju/{plugin.video.meiju-1.0.2.zip => plugin.video.meiju-1.0.3.zip} (75%) diff --git a/addons.xml b/addons.xml index e4e77b0..4f0d22d 100644 --- a/addons.xml +++ b/addons.xml @@ -243,7 +243,7 @@ diff --git a/addons.xml.md5 b/addons.xml.md5 index f1a11c0..8dce5ba 100644 --- a/addons.xml.md5 +++ b/addons.xml.md5 @@ -1 +1 @@ -d479edd00b5503961060fc0fa73e08e6 addons.xml +62addde576e632eea2b6b16a9909bddb addons.xml diff --git a/plugin.video.meiju/addon.xml b/plugin.video.meiju/addon.xml index fa5699d..22f0c35 100644 --- a/plugin.video.meiju/addon.xml +++ b/plugin.video.meiju/addon.xml @@ -1,7 +1,7 @@ diff --git a/plugin.video.meiju/default.py b/plugin.video.meiju/default.py index f30da0e..28c33c9 100644 --- a/plugin.video.meiju/default.py +++ b/plugin.video.meiju/default.py @@ -8,7 +8,7 @@ from json import loads import time -YYETSS = 'http://www.yyetss.com/' +YYETSS = 'http://www.yyetss.com' TTKMJ = 'https://www.ttkmj.org/' MEIJUXIA = 'http://www.meijuxia.vip' BANNER = '[COLOR FFDEB887]{}[/COLOR]' @@ -207,6 +207,7 @@ def yyplay(url): @plugin.route('/yyepisodes//') def yyepisodes(url): plugin.set_content('TVShows') + if url[0] == '/': url = YYETSS + url html = get_html(url) soup = BeautifulSoup(html, 'html.parser') tree = soup.findAll('div', {'class':'tab_set_info'}) @@ -273,10 +274,11 @@ def yyfilter(url): tree = soup.findAll('ul', {'class':'list-inline'}) titles = tree[0].findAll('li') - lst = [x.text for x in titles[1:]] + names = titles[1].findAll('a') + lst = [x.text for x in names[:]] sel = dialog.select('年份', lst) sel = max(0, sel) - href = titles[1+sel].a['href'] + href = names[sel]['href'] hs = href.split('-') year = hs[2] return yycategory(cate, year, 1) @@ -287,7 +289,7 @@ def yycategory(cate, year, page): plugin.set_content('TVShows') items = [] - url = YYETSS + 'list-{}-{}-{}.html'.format(cate, year, page) + url = YYETSS + '/list-{}-{}-{}.html'.format(cate, year, page) html = get_html(url) soup = BeautifulSoup(html, 'html.parser') @@ -326,7 +328,8 @@ def yycategory(cate, year, page): # 分页 items.append({ 'label': BANNER.format('分页'), - 'path': url_for('stay') + 'path': url_for('stay'), + 'is_playable': True }) pages = tree[0].findAll('li') for item in pages: diff --git a/plugin.video.meiju/plugin.video.meiju-1.0.2.zip b/plugin.video.meiju/plugin.video.meiju-1.0.3.zip similarity index 75% rename from plugin.video.meiju/plugin.video.meiju-1.0.2.zip rename to plugin.video.meiju/plugin.video.meiju-1.0.3.zip index 1695580680c93aaa99cdc3f59cb79c55026ee6d3..d839cb2e356cd4c7bfd5ee45bfa468bb0c34c469 100644 GIT binary patch delta 3144 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 delta 3118 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 IH~;_u0GPkmxc~qF