Skip to content

Commit

Permalink
3.6
Browse files Browse the repository at this point in the history
  • Loading branch information
moyy996 committed Feb 11, 2020
1 parent f86fd60 commit f912172
Show file tree
Hide file tree
Showing 9 changed files with 835 additions and 86 deletions.
207 changes: 189 additions & 18 deletions AVDC.py

Large diffs are not rendered by default.

535 changes: 501 additions & 34 deletions AVDC.ui

Large diffs are not rendered by default.

151 changes: 126 additions & 25 deletions AVDC_Main.py

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion fanza.py
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ def main(number):
dic = {
'title': getTitle(htmlcode).strip(getActor(htmlcode)),
'studio': getStudio(htmlcode),
'outline': getOutline(htmlcode),
'outline': getOutline(htmlcode).replace('\n', ''),
'runtime': getRuntime(htmlcode),
'director': getDirector(htmlcode),
'actor': actor,
Expand Down
2 changes: 1 addition & 1 deletion fc2fans_club.py
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ def main(number):
'title': getTitle(htmlcode).replace(' ', '-'),
'studio': getStudio(htmlcode),
'year': '', # str(re.search('\d{4}',getRelease(number)).group()),
'outline': getOutline(htmlcode2),
'outline': getOutline(htmlcode2).replace('\n', ''),
'runtime': getYear(getRelease(htmlcode)),
'director': getStudio(htmlcode),
'actor': actor.replace('/', ','),
Expand Down
2 changes: 1 addition & 1 deletion javbus.py
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ def main(number):
'title': str(re.sub('\w+-\d+-', '', getTitle(htmlcode))),
'studio': getStudio(htmlcode),
'year': str(re.search('\d{4}', getYear(htmlcode)).group()),
'outline': getOutline(dww_htmlcode),
'outline': getOutline(dww_htmlcode).replace('\n', ''),
'runtime': getRuntime(htmlcode),
'director': getDirector(htmlcode),
'actor': getActor(htmlcode),
Expand Down
2 changes: 1 addition & 1 deletion javdb.py
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ def main(number):
'actor': str(actor).strip(" [',']").replace('\'', ''),
'title': getTitle(b).replace("\\n", '').replace('_', '-').replace(number_get, '').strip().replace(' ', '-').replace('--', '-'),
'studio': getStudio(b),
'outline': getOutline(b),
'outline': getOutline(b).replace('\n', ''),
'runtime': getRuntime(b),
'director': getDirector(b),
'release': getRelease(b),
Expand Down
16 changes: 13 additions & 3 deletions siro.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,15 @@ def getActor(a): # //*[@id="center_column"]/div[2]/div[1]/div/table/tbody/tr[1]
return str(result1 + result2).strip('+').replace("', '", '').replace('"', '').replace('/', ',')


def getActorPhoto(actor): # //*[@id="star_qdt"]/li/a/img
d = {}
for i in actor:
if ',' not in i or ')' in i:
p = {i: ''}
d.update(p)
return d


def getStudio(a):
html = etree.fromstring(a, etree.HTMLParser()) # //table/tr[1]/td[1]/text()
result1 = str(html.xpath('//th[contains(text(),"シリーズ:")]/../td/a/text()')).strip(" ['']").strip('\\n ').strip(
Expand Down Expand Up @@ -117,21 +126,22 @@ def main(number2):
'').replace(
'\n ', '')
try:
actor = getActor(a)
dic = {
'title': getTitle(htmlcode).replace("\\n", '').replace(' ', ''),
'studio': getStudio(a),
'outline': getOutline(htmlcode),
'outline': getOutline(htmlcode).replace('\n', ''),
'runtime': getRuntime(a),
'director': getDirector(a),
'actor': getActor(a),
'actor': actor,
'release': getRelease(a),
'number': getNum(a),
'cover': getCover(htmlcode),
'imagecut': 0,
'tag': getTag(a),
'label': getLabel(a),
'year': getYear(getRelease(a)), # str(re.search('\d{4}',getRelease(a)).group()),
'actor_photo': '',
'actor_photo': getActorPhoto(actor.split(',')),
'website': 'https://www.mgstage.com/product/product_detail/' + str(number) + '/',
'source': 'siro.py',
}
Expand Down
4 changes: 2 additions & 2 deletions update_check.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"version": "3.5",
"version_show":"3.5",
"version": "3.6",
"version_show":"3.6",
"download": "https://github.com/moyy996/AVDC/releases"
}

0 comments on commit f912172

Please sign in to comment.