FIX: fix for auto-snatch not being clickable on weeklypull, IMP: Took publisher logo workflow and moved it from html into helpers.py, IMP: Added/Updated some of the publisher logos, FIX: Corrected mis-match table entry on choose download option, FIX: Refresh Series will now reload the screen after completion, FIX: Removed some unnecessary logging lines from cmtagmylar
evilhero
|
|
@ -260,7 +260,7 @@ table#searchresults_table td#comicyear { vertical-align: middle; text-align: lef
|
|||
table#searchresults_table td#issues { vertical-align: middle; text-align: center; min-width: 50px; }
|
||||
|
||||
table#downloads_table th#title { text-align: center; min-width: 100px; }
|
||||
table#donwloads_table th#provider { text-align: center; min-width: 30px; }
|
||||
table#downloads_table th#provider { text-align: center; min-width: 30px; }
|
||||
table#downloads_table th#size { text-align: center; min-width: 20px; }
|
||||
table#downloads_table th#kind { text-align: center; min-width: 20px; }
|
||||
|
||||
|
|
|
|||
|
|
@ -24,7 +24,7 @@
|
|||
%if mylar.CONFIG.RENAME_FILES:
|
||||
<a id="menu_link_refresh" onclick="doAjaxCall('manualRename?comicid=${comic['ComicID']}', $(this),'table')" data-success="Renaming files.">Rename Files</a>
|
||||
%endif
|
||||
<a id="menu_link_refresh" onclick="doAjaxCall('forceRescan?ComicID=${comic['ComicID']}', $(this));refreshLoadSeries();" data-success="${comic['ComicName']} is being rescanned">Recheck Files</a>
|
||||
<a id="menu_link_refresh" onclick="doAjaxCall('forceRescan?ComicID=${comic['ComicID']}', $(this), 'table');" data-success="${comic['ComicName']} is being rescanned">Recheck Files</a>
|
||||
%if mylar.CONFIG.ENABLE_META:
|
||||
<a id="menu_link_refresh" onclick="doAjaxCall('group_metatag?ComicID=${comic['ComicID']}&dirName=${comic['ComicLocation'] |u}', $(this),'table');refreshLoadSeries();" data-success="(re)tagging every issue present for '${comic['ComicName']}'">Manual MetaTagging</a>
|
||||
%endif
|
||||
|
|
@ -95,50 +95,8 @@
|
|||
<div style="display:table;position:relative;margin:auto;top:0px;"><span title="${comicConfig['percent']}"></span>${css}<div style="width:${comicConfig['percent']}%"><span class="progressbar-front-text">${comicConfig['haveissues']}/${comicConfig['totalissues']}</span></div></div></div>
|
||||
</td>
|
||||
<td width="100%" padding="10">
|
||||
%if comic['ComicPublisher'] == 'DC Comics':
|
||||
<img src="interfaces/default/images/publisherlogos/logo-dccomics.png" align="right" alt="DC" height="50" width="50" />
|
||||
%elif comic['ComicPublisher'] == 'Marvel':
|
||||
<img src="interfaces/default/images/publisherlogos/logo-marvel.jpg" align="right" alt="Marvel" height="50" width="100"/>
|
||||
%elif comic['ComicPublisher'] == 'Image':
|
||||
<img src="interfaces/default/images/publisherlogos/logo-imagecomics.png" align="right" alt="Image" height="100" width="50" />
|
||||
%elif comic['ComicPublisher'] == 'Dark Horse Comics' or comic['ComicPublisher'] == 'Dark Horse':
|
||||
<img src="interfaces/default/images/publisherlogos/logo-darkhorse.png" align="right" alt="Darkhorse" height="100" width="75" />
|
||||
%elif comic['ComicPublisher'] == 'IDW Publishing':
|
||||
<img src="interfaces/default/images/publisherlogos/logo-idwpublish.png" align="right" alt="IDW" height="50" width="100"/>
|
||||
%elif comic['ComicPublisher'] == 'Icon':
|
||||
<img src="interfaces/default/images/publisherlogos/logo-iconcomics.png" align="right" alt="Icon" height="50" width="100"/>
|
||||
%elif comic['ComicPublisher'] == 'Red5':
|
||||
<img src="interfaces/default/images/publisherlogos/logo-red5comics.png" align="right" alt="Red5" height="50" width="100"/>
|
||||
%elif comic['ComicPublisher'] == 'Vertigo':
|
||||
<img src="interfaces/default/images/publisherlogos/logo-vertigo.jpg" align="right" alt="Vertigo" height="50" width="100"/>
|
||||
%elif comic['ComicPublisher'] == 'ShadowLine':
|
||||
<img src="interfaces/default/images/publisherlogos/logo-shadowline.png" align="right" alt="Shadowline" height="75" width="100"/>
|
||||
%elif comic['ComicPublisher'] == 'Archie Comics':
|
||||
<img src="interfaces/default/images/publisherlogos/logo-archiecomics.jpg" align="right" alt="Archie" height="75" width="75"/>
|
||||
%elif comic['ComicPublisher'] == 'Oni Press':
|
||||
<img src="interfaces/default/images/publisherlogos/logo-onipress.png" align="right" alt="Oni Press" height="50" width="100"/>
|
||||
%elif comic['ComicPublisher'] == 'Tokyopop':
|
||||
<img src="interfaces/default/images/publisherlogos/logo-tokyopop.jpg" align="right" alt="Tokyopop" height="50" width="100"/>
|
||||
%elif comic['ComicPublisher'] == 'Midtown Comics':
|
||||
<img src="interfaces/default/images/publisherlogos/logo-midtowncomics.jpg" align="right" alt="Midtown" height="50" width="100"/>
|
||||
%elif comic['ComicPublisher'] == 'Boom! Studios':
|
||||
<img src="interfaces/default/images/publisherlogos/logo-boom.jpg" align="right" alt="Boom!" height="50" width="100"/>
|
||||
%elif comic['ComicPublisher'] == 'Skybound':
|
||||
<img src="interfaces/default/images/publisherlogos/logo-skybound.jpg" align="right" alt="Skybound" height="50" width="100"/>
|
||||
%elif comic['ComicPublisher'] == 'Vertigo':
|
||||
<img src="interfaces/default/images/publisherlogos/logo-dynamite.jpg" align="right" alt="Dynamite" height="50" width="100"/>
|
||||
%elif comic['ComicPublisher'] == 'Top Cow':
|
||||
<img src="interfaces/default/images/publisherlogos/logo-topcow.gif" align="right" alt="Top Cow" height="75" width="100"/>
|
||||
%elif comic['ComicPublisher'] == 'Dynamite Entertainment':
|
||||
<img src="interfaces/default/images/publisherlogos/logo-dynamite.png" align="right" alt="Dynamite" height="50" width="100"/>
|
||||
%elif comic['ComicPublisher'] == 'Cartoon Books':
|
||||
<img src="interfaces/default/images/publisherlogos/logo-cartoonbooks.jpg" align="right" alt="Cartoon Books" height="75" width="90"/>
|
||||
%elif comic['ComicPublisher'] == 'Valiant':
|
||||
<img src="interfaces/default/images/publisherlogos/logo-valiant.png" align="right" alt="Valiant" height="100" width="100"/>
|
||||
%elif comic['ComicPublisher'] == 'Action Lab':
|
||||
<img src="interfaces/default/images/publisherlogos/logo-actionlabs.png" align="right" alt="Action Lab" height="100" width="100"/>
|
||||
%elif comic['ComicPublisher'] == 'Zenescope Entertainment':
|
||||
<img src="interfaces/default/images/publisherlogos/logo-zenescope.png" align="right" alt="Zenescope" height="100" width="160"/>
|
||||
%if comicConfig['publisher_image'] is not None:
|
||||
<img src="${comicConfig['publisher_image']}" align="right" alt="${comicConfig['publisher_image_alt']}" height="${comicConfig['publisher_imageH']}" width="${comicConfig['publisher_imageW']}" />
|
||||
%endif
|
||||
<fieldset>
|
||||
<div>
|
||||
|
|
@ -213,19 +171,10 @@
|
|||
<div style="display:table;position:relative;margin:auto;top:0px;"><span title="${comicConfig['percent']}"></span>${css}<div style="width:${comicConfig['percent']}%"><span class="progressbar-front-text">${comicConfig['haveissues']}/${comicConfig['totalissues']}</span></div></div></div>
|
||||
</td>
|
||||
<td width="100%" padding="10">
|
||||
%if comic['ComicPublisher'] == 'DC Comics':
|
||||
<img src="interfaces/default/images/publisherlogos/logo-dccomics.png" align="right" alt="DC" height="50" width="50"/>
|
||||
%elif comic['ComicPublisher'] == 'Marvel':
|
||||
<img src="interfaces/default/images/publisherlogos/logo-marvel.jpg" align="right" alt="Marvel" height="50" width="100" border="1"/>
|
||||
%elif comic['ComicPublisher'] == 'Image':
|
||||
<img src="interfaces/default/images/publisherlogos/logo-imagecomics.png" align="right" alt="Image" height="100" width="50"/>
|
||||
%elif comic['ComicPublisher'] == 'Dark Horse Comics':
|
||||
<img src="interfaces/default/images/publisherlogos/logo-darkhorse.png" align="right" alt="Darkhorse" height="100" width="75"/>
|
||||
%elif comic['ComicPublisher'] == 'IDW Publishing':
|
||||
<img src="interfaces/default/images/publisherlogos/logo-idwpublish.png" align="right" alt="IDW" height="50" width="100"/>
|
||||
%endif
|
||||
|
||||
<form action="comic_config" method="GET">
|
||||
%if comicConfig['publisher_image'] is not None:
|
||||
<img src="${comicConfig['publisher_image']}" align="right" alt="${comicConfig['publisher_image_alt']}" height="${comicConfig['publisher_imageH']}" width="${comicConfig['publisher_imageW']}" />
|
||||
%endif
|
||||
<form action="comic_config" method="GET">
|
||||
<input type="hidden" name="ComicID" value=${comic['ComicID']}>
|
||||
<fieldset>
|
||||
<br/>
|
||||
|
|
@ -364,7 +313,7 @@
|
|||
<td id="issuenumber">${issue['Issue_Number']}</td>
|
||||
<%
|
||||
if len(issue['IssueName']) > 70:
|
||||
issuename = issue['IssueName'][:70] + '...'
|
||||
issuename = "%s..." % issue['IssueName'][:70]
|
||||
else:
|
||||
issuename = issue['IssueName']
|
||||
endif
|
||||
|
|
|
|||
|
After Width: | Height: | Size: 32 KiB |
|
After Width: | Height: | Size: 40 KiB |
|
After Width: | Height: | Size: 6.9 KiB |
|
After Width: | Height: | Size: 69 KiB |
|
Before Width: | Height: | Size: 82 KiB After Width: | Height: | Size: 82 KiB |
|
After Width: | Height: | Size: 24 KiB |
|
After Width: | Height: | Size: 7.0 KiB |
0
data/interfaces/default/images/publisherlogos/logo-bluewatercomics.png
Executable file → Normal file
|
Before Width: | Height: | Size: 14 KiB After Width: | Height: | Size: 14 KiB |
|
Before Width: | Height: | Size: 4.8 KiB After Width: | Height: | Size: 4.8 KiB |
|
After Width: | Height: | Size: 18 KiB |
|
Before Width: | Height: | Size: 60 KiB After Width: | Height: | Size: 60 KiB |
|
After Width: | Height: | Size: 78 KiB |
|
Before Width: | Height: | Size: 5.0 KiB |
|
Before Width: | Height: | Size: 25 KiB After Width: | Height: | Size: 25 KiB |
|
Before Width: | Height: | Size: 26 KiB After Width: | Height: | Size: 26 KiB |
|
After Width: | Height: | Size: 97 KiB |
|
Before Width: | Height: | Size: 93 KiB After Width: | Height: | Size: 13 KiB |
|
Before Width: | Height: | Size: 45 KiB After Width: | Height: | Size: 45 KiB |
|
Before Width: | Height: | Size: 35 KiB After Width: | Height: | Size: 35 KiB |
|
Before Width: | Height: | Size: 11 KiB After Width: | Height: | Size: 11 KiB |
|
After Width: | Height: | Size: 152 KiB |
|
Before Width: | Height: | Size: 19 KiB After Width: | Height: | Size: 19 KiB |
0
data/interfaces/default/images/publisherlogos/logo-midtowncomics.jpg
Executable file → Normal file
|
Before Width: | Height: | Size: 20 KiB After Width: | Height: | Size: 20 KiB |
|
After Width: | Height: | Size: 18 KiB |
|
Before Width: | Height: | Size: 56 KiB |
|
Before Width: | Height: | Size: 85 KiB After Width: | Height: | Size: 85 KiB |
|
Before Width: | Height: | Size: 9.1 KiB After Width: | Height: | Size: 123 KiB |
|
Before Width: | Height: | Size: 19 KiB After Width: | Height: | Size: 19 KiB |
|
After Width: | Height: | Size: 20 KiB |
|
Before Width: | Height: | Size: 12 KiB |
|
After Width: | Height: | Size: 17 KiB |
|
Before Width: | Height: | Size: 6.6 KiB After Width: | Height: | Size: 6.6 KiB |
|
Before Width: | Height: | Size: 9.8 KiB |
|
After Width: | Height: | Size: 17 KiB |
|
After Width: | Height: | Size: 6.0 KiB |
|
After Width: | Height: | Size: 68 KiB |
|
After Width: | Height: | Size: 39 KiB |
|
Before Width: | Height: | Size: 130 KiB |
|
Before Width: | Height: | Size: 13 KiB After Width: | Height: | Size: 13 KiB |
|
Before Width: | Height: | Size: 197 KiB |
|
|
@ -200,8 +200,9 @@
|
|||
</table>
|
||||
</div>
|
||||
%elif weekly['HASH'] is not None:
|
||||
<a href="#" onclick="doAjaxCall('torrentit?torrent_hash=${weekly['HASH']}&download=True',$(this),'table')" title="Auto-Snatch torrent file">
|
||||
%if mylar.CONFIG.SHOW_ICONS:
|
||||
<a href="#" onclick="doAjaxCall('torrentit?torrent_hash=${weekly['HASH']}&download=True',$(this),'table')" title="Auto-Snatch torrent file"><img style="margin: 0px 5px" src="interfaces/default/images/snatch.png" height="25" width="25" class="highqual" />
|
||||
<img style="margin: 0px 5px" src="interfaces/default/images/snatch.png" height="25" width="25" class="highqual" />
|
||||
%else:
|
||||
<span class="ui-icon ui-icon-plus"></span>Auto-Snatch
|
||||
%endif
|
||||
|
|
|
|||
|
|
@ -47,12 +47,12 @@ def run(dirName, nzbName=None, issueid=None, comversion=None, manual=None, filen
|
|||
new_folder = None
|
||||
try:
|
||||
import tempfile
|
||||
logger.info('Filepath: %s' %filepath)
|
||||
logger.info('Filename: %s' %filename)
|
||||
logger.fdebug('Filepath: %s' %filepath)
|
||||
logger.fdebug('Filename: %s' %filename)
|
||||
new_folder = tempfile.mkdtemp(prefix='mylar_', dir=mylar.CONFIG.CACHE_DIR) #prefix, suffix, dir
|
||||
logger.info('New_Folder: %s' % new_folder)
|
||||
logger.fdebug('New_Folder: %s' % new_folder)
|
||||
new_filepath = os.path.join(new_folder, filename)
|
||||
logger.info('New_Filepath: %s' % new_filepath)
|
||||
logger.fdebug('New_Filepath: %s' % new_filepath)
|
||||
if mylar.CONFIG.FILE_OPTS == 'copy' and manualmeta == False:
|
||||
shutil.copy(filepath, new_filepath)
|
||||
else:
|
||||
|
|
|
|||
188
mylar/helpers.py
|
|
@ -3441,6 +3441,194 @@ def getImage(comicid, url, issueid=None):
|
|||
|
||||
return 'retry'
|
||||
|
||||
def publisherImages(publisher):
|
||||
if publisher == 'DC Comics':
|
||||
comicpublisher = {'publisher_image': 'interfaces/default/images/publisherlogos/logo-dccomics.png',
|
||||
'publisher_image_alt': 'DC',
|
||||
'publisher_imageH': '50',
|
||||
'publisher_imageW': '50'}
|
||||
elif publisher == 'Marvel':
|
||||
comicpublisher = {'publisher_image': 'interfaces/default/images/publisherlogos/logo-mavel.jpg',
|
||||
'publisher_image_alt': 'Marvel',
|
||||
'publisher_imageH': '50',
|
||||
'publisher_imageW': '100'}
|
||||
elif publisher == 'Image':
|
||||
comicpublisher = {'publisher_image': 'interfaces/default/images/publisherlogos/logo-imagecomics.png',
|
||||
'publisher_image_alt': 'Image',
|
||||
'publisher_imageH': '100',
|
||||
'publisher_imageW': '50'}
|
||||
elif publisher == 'Dark Horse Comics' or publisher == 'Dark Horse':
|
||||
comicpublisher = {'publisher_image': 'interfaces/default/images/publisherlogos/logo-darkhorse.png',
|
||||
'publisher_image_alt': 'DarkHorse',
|
||||
'publisher_imageH': '100',
|
||||
'publisher_imageW': '75'}
|
||||
elif publisher == 'IDW Publishing':
|
||||
comicpublisher = {'publisher_image': 'interfaces/default/images/publisherlogos/logo-idwpublish.png',
|
||||
'publisher_image_alt': 'IDW',
|
||||
'publisher_imageH': '50',
|
||||
'publisher_imageW': '100'}
|
||||
elif publisher == 'Icon':
|
||||
comicpublisher = {'publisher_image': 'interfaces/default/images/publisherlogos/logo-iconcomics.png',
|
||||
'publisher_image_alt': 'Icon',
|
||||
'publisher_imageH': '50',
|
||||
'publisher_imageW': '100'}
|
||||
elif publisher == 'Red5':
|
||||
comicpublisher = {'publisher_image': 'interfaces/default/images/publisherlogos/logo-red5comics.png',
|
||||
'publisher_image_alt': 'Red5',
|
||||
'publisher_imageH': '50',
|
||||
'publisher_imageW': '100'}
|
||||
elif publisher == 'Vertigo':
|
||||
comicpublisher = {'publisher_image': 'interfaces/default/images/publisherlogos/logo-vertigo.png',
|
||||
'publisher_image_alt': 'Vertigo',
|
||||
'publisher_imageH': '50',
|
||||
'publisher_imageW': '100'}
|
||||
elif publisher == 'Shadowline':
|
||||
comicpublisher = {'publisher_image': 'interfaces/default/images/publisherlogos/logo-shadowline.png',
|
||||
'publisher_image_alt': 'Shadowline',
|
||||
'publisher_imageH': '50',
|
||||
'publisher_imageW': '150'}
|
||||
elif publisher == 'Archie Comics':
|
||||
comicpublisher = {'publisher_image': 'interfaces/default/images/publisherlogos/logo-archiecomics.jpg',
|
||||
'publisher_image_alt': 'Archie',
|
||||
'publisher_imageH': '75',
|
||||
'publisher_imageW': '75'}
|
||||
elif publisher == 'Oni Press':
|
||||
comicpublisher = {'publisher_image': 'interfaces/default/images/publisherlogos/logo-onipress.jpg',
|
||||
'publisher_image_alt': 'Oni Press',
|
||||
'publisher_imageH': '50',
|
||||
'publisher_imageW': '100'}
|
||||
elif publisher == 'Tokyopop':
|
||||
comicpublisher = {'publisher_image': 'interfaces/default/images/publisherlogos/logo-tokyopop.jpg',
|
||||
'publisher_image_alt': 'Tokyopop',
|
||||
'publisher_imageH': '100',
|
||||
'publisher_imageW': '50'}
|
||||
elif publisher == 'Midtown Comics':
|
||||
comicpublisher = {'publisher_image': 'interfaces/default/images/publisherlogos/logo-midtowncomics.jpg',
|
||||
'publisher_image_alt': 'Midtown',
|
||||
'publisher_imageH': '50',
|
||||
'publisher_imageW': '100'}
|
||||
elif publisher == 'Boom! Studios':
|
||||
comicpublisher = {'publisher_image': 'interfaces/default/images/publisherlogos/logo-boom.jpg',
|
||||
'publisher_image_alt': 'Boom!',
|
||||
'publisher_imageH': '50',
|
||||
'publisher_imageW': '100'}
|
||||
elif publisher == 'Skybound':
|
||||
comicpublisher = {'publisher_image': 'interfaces/default/images/publisherlogos/logo-skybound.jpg',
|
||||
'publisher_image_alt': 'Skybound',
|
||||
'publisher_imageH': '50',
|
||||
'publisher_imageW': '100'}
|
||||
elif publisher == 'Dynamite Entertainment':
|
||||
comicpublisher = {'publisher_image': 'interfaces/default/images/publisherlogos/logo-dynamite.png',
|
||||
'publisher_image_alt': 'Dynamite',
|
||||
'publisher_imageH': '50',
|
||||
'publisher_imageW': '125'}
|
||||
elif publisher == 'Top Cow':
|
||||
comicpublisher = {'publisher_image': 'interfaces/default/images/publisherlogos/logo-topcow.gif',
|
||||
'publisher_image_alt': 'Top Cow',
|
||||
'publisher_imageH': '75',
|
||||
'publisher_imageW': '100'}
|
||||
elif publisher == 'Cartoon Books':
|
||||
comicpublisher = {'publisher_image': 'interfaces/default/images/publisherlogos/logo-cartoonbooks.jpg',
|
||||
'publisher_image_alt': 'Cartoon Books',
|
||||
'publisher_imageH': '75',
|
||||
'publisher_imageW': '90'}
|
||||
elif publisher == 'Valiant':
|
||||
comicpublisher = {'publisher_image': 'interfaces/default/images/publisherlogos/logo-valiant.png',
|
||||
'publisher_image_alt': 'Valiant',
|
||||
'publisher_imageH': '100',
|
||||
'publisher_imageW': '100'}
|
||||
elif publisher == 'Action Lab':
|
||||
comicpublisher = {'publisher_image': 'interfaces/default/images/publisherlogos/logo-actionlabs.png',
|
||||
'publisher_image_alt': 'Action Lab',
|
||||
'publisher_imageH': '100',
|
||||
'publisher_imageW': '100'}
|
||||
elif publisher == 'Zenescope Entertainment':
|
||||
comicpublisher = {'publisher_image': 'interfaces/default/images/publisherlogos/logo-zenescope.png',
|
||||
'publisher_image_alt': 'Zenescope',
|
||||
'publisher_imageH': '125',
|
||||
'publisher_imageW': '125'}
|
||||
elif publisher == '2000 ad':
|
||||
comicpublisher = {'publisher_image': 'interfaces/default/images/publisherlogos/logo-2000ad.jpg',
|
||||
'publisher_image_alt': '2000 AD',
|
||||
'publisher_imageH': '75',
|
||||
'publisher_imageW': '50'}
|
||||
elif publisher == 'Aardvark':
|
||||
comicpublisher = {'publisher_image': 'interfaces/default/images/publisherlogos/logo-aardvark.png',
|
||||
'publisher_image_alt': 'Aardvark',
|
||||
'publisher_imageH': '100',
|
||||
'publisher_imageW': '100'}
|
||||
elif publisher == 'Abstract Studio':
|
||||
comicpublisher = {'publisher_image': 'interfaces/default/images/publisherlogos/logo-abstract.jpg',
|
||||
'publisher_image_alt': 'Abstract Studio',
|
||||
'publisher_imageH': '75',
|
||||
'publisher_imageW': '50'}
|
||||
elif publisher == 'Aftershock Comics':
|
||||
comicpublisher = {'publisher_image': 'interfaces/default/images/publisherlogos/logo-aftershock.jpg',
|
||||
'publisher_image_alt': 'Aftershock',
|
||||
'publisher_imageH': '100',
|
||||
'publisher_imageW': '75'}
|
||||
elif publisher == 'Avatar Press':
|
||||
comicpublisher = {'publisher_image': 'interfaces/default/images/publisherlogos/logo-avatarpress.jpg',
|
||||
'publisher_image_alt': 'Avatar Press',
|
||||
'publisher_imageH': '100',
|
||||
'publisher_imageW': '75'}
|
||||
elif publisher == 'Benitez Productions':
|
||||
comicpublisher = {'publisher_image': 'interfaces/default/images/publisherlogos/logo-benitez.png',
|
||||
'publisher_image_alt': 'Benitez',
|
||||
'publisher_imageH': '75',
|
||||
'publisher_imageW': '125'}
|
||||
elif publisher == 'Boundless Comics':
|
||||
comicpublisher = {'publisher_image': 'interfaces/default/images/publisherlogos/logo-boundless.png',
|
||||
'publisher_image_alt': 'Boundless',
|
||||
'publisher_imageH': '75',
|
||||
'publisher_imageW': '75'}
|
||||
elif publisher == 'Darby Pop':
|
||||
comicpublisher = {'publisher_image': 'interfaces/default/images/publisherlogos/logo-darbypop.png',
|
||||
'publisher_image_alt': 'Darby Pop',
|
||||
'publisher_imageH': '75',
|
||||
'publisher_imageW': '125'}
|
||||
elif publisher == 'Devil\'s Due':
|
||||
comicpublisher = {'publisher_image': 'interfaces/default/images/publisherlogos/logo-devilsdue.png',
|
||||
'publisher_image_alt': 'Devil\'s Due',
|
||||
'publisher_imageH': '75',
|
||||
'publisher_imageW': '75'}
|
||||
elif publisher == 'Icon Comics':
|
||||
comicpublisher = {'publisher_image': 'interfaces/default/images/publisherlogos/logo-iconcomics.png',
|
||||
'publisher_image_alt': 'Icon',
|
||||
'publisher_imageH': '50',
|
||||
'publisher_imageW': '50'}
|
||||
elif publisher == 'Joe Books':
|
||||
comicpublisher = {'publisher_image': 'interfaces/default/images/publisherlogos/logo-joebooks.png',
|
||||
'publisher_image_alt': 'Joe Books',
|
||||
'publisher_imageH': '100',
|
||||
'publisher_imageW': '100'}
|
||||
elif publisher == 'Titan Comics':
|
||||
comicpublisher = {'publisher_image': 'interfaces/default/images/publisherlogos/logo-titan.png',
|
||||
'publisher_image_alt': 'Titan',
|
||||
'publisher_imageH': '75',
|
||||
'publisher_imageW': '75'}
|
||||
elif publisher == 'Viz':
|
||||
comicpublisher = {'publisher_image': 'interfaces/default/images/publisherlogos/logo-viz.png',
|
||||
'publisher_image_alt': 'Viz',
|
||||
'publisher_imageH': '50',
|
||||
'publisher_imageW': '50'}
|
||||
elif publisher == 'Warp Graphics':
|
||||
comicpublisher = {'publisher_image': 'interfaces/default/images/publisherlogos/logo-warpgraphics.png',
|
||||
'publisher_image_alt': 'Warp Graphics',
|
||||
'publisher_imageH': '125',
|
||||
'publisher_imageW': '75'}
|
||||
elif publisher == 'Wildstorm':
|
||||
comicpublisher = {'publisher_image': 'interfaces/default/images/publisherlogos/logo-wildstorm.png',
|
||||
'publisher_image_alt': 'Wildstorm',
|
||||
'publisher_imageH': '50',
|
||||
'publisher_imageW': '100'}
|
||||
else:
|
||||
comicpublisher = {'publisher_image': None,
|
||||
'publisher_image_alt': 'Nope',
|
||||
'publisher_imageH': '0',
|
||||
'publisher_imageW': '0'}
|
||||
|
||||
return comicpublisher
|
||||
|
||||
def file_ops(path,dst,arc=False,one_off=False):
|
||||
# # path = source path + filename
|
||||
|
|
|
|||
|
|
@ -177,6 +177,7 @@ class WebInterface(object):
|
|||
comicImage = 'cache/' + str(ComicID) + '.jpg'
|
||||
else:
|
||||
comicImage = comic['ComicImage']
|
||||
comicpublisher = helpers.publisherImages(comic['ComicPublisher'])
|
||||
comicConfig = {
|
||||
"fuzzy_year0": helpers.radio(int(usethefuzzy), 0),
|
||||
"fuzzy_year1": helpers.radio(int(usethefuzzy), 1),
|
||||
|
|
@ -189,6 +190,10 @@ class WebInterface(object):
|
|||
"totalissues": totalissues,
|
||||
"haveissues": haveissues,
|
||||
"percent": percent,
|
||||
"publisher_image": comicpublisher['publisher_image'],
|
||||
"publisher_image_alt": comicpublisher['publisher_image_alt'],
|
||||
"publisher_imageH": comicpublisher['publisher_imageH'],
|
||||
"publisher_imageW": comicpublisher['publisher_imageW'],
|
||||
"ComicImage": comicImage + '?' + datetime.datetime.now().strftime('%y-%m-%d %H:%M:%S')
|
||||
}
|
||||
|
||||
|
|
@ -207,9 +212,14 @@ class WebInterface(object):
|
|||
aName.append({"annualComicName": ann['ReleaseComicName'],
|
||||
"annualComicID": ann['ReleaseComicID']})
|
||||
|
||||
issuename = ann['IssueName']
|
||||
if ann['IssueName'] is not None:
|
||||
if len(ann['IssueName']) > 75:
|
||||
issuename = '%s...' % ann['IssueName'][:75]
|
||||
|
||||
annuals_list.append({"Issue_Number": ann['Issue_Number'],
|
||||
"Int_IssueNumber": ann['Int_IssueNumber'],
|
||||
"IssueName": ann['IssueName'],
|
||||
"IssueName": issuename,
|
||||
"IssueDate": ann['IssueDate'],
|
||||
"Status": ann['Status'],
|
||||
"Location": ann['Location'],
|
||||
|
|
@ -2695,7 +2705,7 @@ class WebInterface(object):
|
|||
import get_image_size
|
||||
image = get_image_size.get_image_metadata(filepath)
|
||||
imageinfo = json.loads(get_image_size.Image.to_str_json(image))
|
||||
logger.info('imageinfo: %s' % imageinfo)
|
||||
#logger.fdebug('imageinfo: %s' % imageinfo)
|
||||
if imageinfo['width'] > imageinfo['height']:
|
||||
template = 'storyarc_detail.html'
|
||||
bannerheight = '280'
|
||||
|
|
|
|||