mirror of https://github.com/evilhero/mylar
FIX: Try to show Edition/Type of series on search results page when available
This commit is contained in:
parent
59ae202789
commit
4f30900836
|
@ -320,7 +320,7 @@ def GetComicInfo(comicid, dom, safechk=None):
|
||||||
comic['Type'] = 'None'
|
comic['Type'] = 'None'
|
||||||
if comic_deck != 'None':
|
if comic_deck != 'None':
|
||||||
if any(['print' in comic_deck.lower(), 'digital' in comic_deck.lower(), 'paperback' in comic_deck.lower(), 'one shot' in re.sub('-', '', comic_deck.lower()).strip(), 'hardcover' in comic_deck.lower()]):
|
if any(['print' in comic_deck.lower(), 'digital' in comic_deck.lower(), 'paperback' in comic_deck.lower(), 'one shot' in re.sub('-', '', comic_deck.lower()).strip(), 'hardcover' in comic_deck.lower()]):
|
||||||
if 'print' in comic_deck.lower():
|
if all(['print' in comic_deck.lower(), 'reprint' not in comic_deck.lower()]):
|
||||||
comic['Type'] = 'Print'
|
comic['Type'] = 'Print'
|
||||||
elif 'digital' in comic_deck.lower():
|
elif 'digital' in comic_deck.lower():
|
||||||
comic['Type'] = 'Digital'
|
comic['Type'] = 'Digital'
|
||||||
|
@ -330,9 +330,11 @@ def GetComicInfo(comicid, dom, safechk=None):
|
||||||
comic['Type'] = 'HC'
|
comic['Type'] = 'HC'
|
||||||
elif 'oneshot' in re.sub('-', '', comic_deck.lower()).strip():
|
elif 'oneshot' in re.sub('-', '', comic_deck.lower()).strip():
|
||||||
comic['Type'] = 'One-Shot'
|
comic['Type'] = 'One-Shot'
|
||||||
|
else:
|
||||||
|
comic['Type'] = 'Print'
|
||||||
|
|
||||||
if comic_desc != 'None' and comic['Type'] == 'None':
|
if comic_desc != 'None' and comic['Type'] == 'None':
|
||||||
if 'print' in comic_desc[:60].lower() and 'print edition can be found' not in comic_desc.lower():
|
if 'print' in comic_desc[:60].lower() and all(['print edition can be found' not in comic_desc.lower(), 'reprints' not in comic_desc.lower()]):
|
||||||
comic['Type'] = 'Print'
|
comic['Type'] = 'Print'
|
||||||
elif 'digital' in comic_desc[:60].lower() and 'digital edition can be found' not in comic_desc.lower():
|
elif 'digital' in comic_desc[:60].lower() and 'digital edition can be found' not in comic_desc.lower():
|
||||||
comic['Type'] = 'Digital'
|
comic['Type'] = 'Digital'
|
||||||
|
|
31
mylar/mb.py
31
mylar/mb.py
|
@ -359,8 +359,8 @@ def findComic(name, mode, issue, limityear=None, type=None):
|
||||||
|
|
||||||
xmltype = None
|
xmltype = None
|
||||||
if xmldeck != 'None':
|
if xmldeck != 'None':
|
||||||
if any(['print' in xmldeck.lower(), 'digital' in xmldeck.lower(), 'paperback' in xmldeck.lower(), 'hardcover' in xmldeck.lower()]):
|
if any(['print' in xmldeck.lower(), 'digital' in xmldeck.lower(), 'paperback' in xmldeck.lower(), 'one shot' in re.sub('-', '', xmldeck.lower()).strip(), 'hardcover' in xmldeck.lower()]):
|
||||||
if 'print' in xmldeck.lower():
|
if all(['print' in xmldeck.lower(), 'reprint' not in xmldeck.lower()]):
|
||||||
xmltype = 'Print'
|
xmltype = 'Print'
|
||||||
elif 'digital' in xmldeck.lower():
|
elif 'digital' in xmldeck.lower():
|
||||||
xmltype = 'Digital'
|
xmltype = 'Digital'
|
||||||
|
@ -368,15 +368,38 @@ def findComic(name, mode, issue, limityear=None, type=None):
|
||||||
xmltype = 'TPB'
|
xmltype = 'TPB'
|
||||||
elif 'hardcover' in xmldeck.lower():
|
elif 'hardcover' in xmldeck.lower():
|
||||||
xmltype = 'HC'
|
xmltype = 'HC'
|
||||||
|
elif 'oneshot' in re.sub('-', '', xmldeck.lower()).strip():
|
||||||
|
xmltype = 'One-Shot'
|
||||||
|
else:
|
||||||
|
xmltype = 'Print'
|
||||||
|
|
||||||
if xmldesc != 'None' and xmltype is None:
|
if xmldesc != 'None' and xmltype is None:
|
||||||
if 'print' in xmldesc[:60].lower() and 'print edition can be found' not in xmldesc.lower():
|
if 'print' in xmldesc[:60].lower() and all(['print edition can be found' not in xmldesc.lower(), 'reprints' not in xmldesc.lower()]):
|
||||||
xmltype = 'Print'
|
xmltype = 'Print'
|
||||||
elif 'digital' in xmldesc[:60].lower() and 'digital edition can be found' not in xmldesc.lower():
|
elif 'digital' in xmldesc[:60].lower() and 'digital edition can be found' not in xmldesc.lower():
|
||||||
xmltype = 'Digital'
|
xmltype = 'Digital'
|
||||||
elif all(['paperback' in xmldesc[:60].lower(), 'paperback can be found' not in xmldesc.lower()]) or 'collects' in xmldesc.lower():
|
elif all(['paperback' in xmldesc[:60].lower(), 'paperback can be found' not in xmldesc.lower()]) or 'collects' in xmldesc[:60].lower():
|
||||||
xmltype = 'TPB'
|
xmltype = 'TPB'
|
||||||
elif 'hardcover' in xmldesc[:60].lower() and 'hardcover can be found' not in xmldesc.lower():
|
elif 'hardcover' in xmldesc[:60].lower() and 'hardcover can be found' not in xmldesc.lower():
|
||||||
xmltype = 'HC'
|
xmltype = 'HC'
|
||||||
|
elif any(['one-shot' in xmldesc[:60].lower(), 'one shot' in xmldesc[:60].lower()]) and any(['can be found' not in xmldesc.lower(), 'following the' not in xmldesc.lower()]):
|
||||||
|
i = 0
|
||||||
|
xmltype = 'One-Shot'
|
||||||
|
avoidwords = ['preceding', 'after the special', 'following the']
|
||||||
|
while i < 2:
|
||||||
|
if i == 0:
|
||||||
|
cbd = 'one-shot'
|
||||||
|
elif i == 1:
|
||||||
|
cbd = 'one shot'
|
||||||
|
tmp1 = xmldesc[:60].lower().find(cbd)
|
||||||
|
if tmp1 != -1:
|
||||||
|
for x in avoidwords:
|
||||||
|
tmp2 = xmldesc[:tmp1].lower().find(x)
|
||||||
|
if tmp2 != -1:
|
||||||
|
xmltype = 'Print'
|
||||||
|
i = 3
|
||||||
|
break
|
||||||
|
i+=1
|
||||||
else:
|
else:
|
||||||
xmltype = 'Print'
|
xmltype = 'Print'
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue