diff --git a/data/css/style.css b/data/css/style.css index 13094852..a7b465b7 100755 --- a/data/css/style.css +++ b/data/css/style.css @@ -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; } diff --git a/data/interfaces/default/comicdetails.html b/data/interfaces/default/comicdetails.html index c8f5989e..0d38aafa 100755 --- a/data/interfaces/default/comicdetails.html +++ b/data/interfaces/default/comicdetails.html @@ -24,7 +24,7 @@ %if mylar.CONFIG.RENAME_FILES: Rename Files %endif - Recheck Files + Recheck Files %if mylar.CONFIG.ENABLE_META: Manual MetaTagging %endif @@ -95,50 +95,8 @@
${css}
${comicConfig['haveissues']}/${comicConfig['totalissues']}
- %if comic['ComicPublisher'] == 'DC Comics': - DC - %elif comic['ComicPublisher'] == 'Marvel': - Marvel - %elif comic['ComicPublisher'] == 'Image': - Image - %elif comic['ComicPublisher'] == 'Dark Horse Comics' or comic['ComicPublisher'] == 'Dark Horse': - Darkhorse - %elif comic['ComicPublisher'] == 'IDW Publishing': - IDW - %elif comic['ComicPublisher'] == 'Icon': - Icon - %elif comic['ComicPublisher'] == 'Red5': - Red5 - %elif comic['ComicPublisher'] == 'Vertigo': - Vertigo - %elif comic['ComicPublisher'] == 'ShadowLine': - Shadowline - %elif comic['ComicPublisher'] == 'Archie Comics': - Archie - %elif comic['ComicPublisher'] == 'Oni Press': - Oni Press - %elif comic['ComicPublisher'] == 'Tokyopop': - Tokyopop - %elif comic['ComicPublisher'] == 'Midtown Comics': - Midtown - %elif comic['ComicPublisher'] == 'Boom! Studios': - Boom! - %elif comic['ComicPublisher'] == 'Skybound': - Skybound - %elif comic['ComicPublisher'] == 'Vertigo': - Dynamite - %elif comic['ComicPublisher'] == 'Top Cow': - Top Cow - %elif comic['ComicPublisher'] == 'Dynamite Entertainment': - Dynamite - %elif comic['ComicPublisher'] == 'Cartoon Books': - Cartoon Books - %elif comic['ComicPublisher'] == 'Valiant': - Valiant - %elif comic['ComicPublisher'] == 'Action Lab': - Action Lab - %elif comic['ComicPublisher'] == 'Zenescope Entertainment': - Zenescope + %if comicConfig['publisher_image'] is not None: + ${comicConfig['publisher_image_alt']} %endif
@@ -213,19 +171,10 @@
${css}
${comicConfig['haveissues']}/${comicConfig['totalissues']}
- %if comic['ComicPublisher'] == 'DC Comics': - DC - %elif comic['ComicPublisher'] == 'Marvel': - Marvel - %elif comic['ComicPublisher'] == 'Image': - Image - %elif comic['ComicPublisher'] == 'Dark Horse Comics': - Darkhorse - %elif comic['ComicPublisher'] == 'IDW Publishing': - IDW - %endif - -
+ %if comicConfig['publisher_image'] is not None: + ${comicConfig['publisher_image_alt']} + %endif +

@@ -364,7 +313,7 @@ ${issue['Issue_Number']} <% if len(issue['IssueName']) > 70: - issuename = issue['IssueName'][:70] + '...' + issuename = "%s..." % issue['IssueName'][:70] else: issuename = issue['IssueName'] endif diff --git a/data/interfaces/default/images/publisherlogos/logo-2000ad.jpg b/data/interfaces/default/images/publisherlogos/logo-2000ad.jpg new file mode 100644 index 00000000..6f3ad9e9 Binary files /dev/null and b/data/interfaces/default/images/publisherlogos/logo-2000ad.jpg differ diff --git a/data/interfaces/default/images/publisherlogos/logo-aardvark.png b/data/interfaces/default/images/publisherlogos/logo-aardvark.png new file mode 100644 index 00000000..ecc1d9e3 Binary files /dev/null and b/data/interfaces/default/images/publisherlogos/logo-aardvark.png differ diff --git a/data/interfaces/default/images/publisherlogos/logo-abstract.jpg b/data/interfaces/default/images/publisherlogos/logo-abstract.jpg new file mode 100644 index 00000000..446ae43a Binary files /dev/null and b/data/interfaces/default/images/publisherlogos/logo-abstract.jpg differ diff --git a/data/interfaces/default/images/publisherlogos/logo-aftershock.jpg b/data/interfaces/default/images/publisherlogos/logo-aftershock.jpg new file mode 100644 index 00000000..9e8ba1eb Binary files /dev/null and b/data/interfaces/default/images/publisherlogos/logo-aftershock.jpg differ diff --git a/data/interfaces/default/images/publisherlogos/logo-archiecomics.jpg b/data/interfaces/default/images/publisherlogos/logo-archiecomics.jpg old mode 100755 new mode 100644 diff --git a/data/interfaces/default/images/publisherlogos/logo-avatarpress.jpg b/data/interfaces/default/images/publisherlogos/logo-avatarpress.jpg new file mode 100644 index 00000000..49848453 Binary files /dev/null and b/data/interfaces/default/images/publisherlogos/logo-avatarpress.jpg differ diff --git a/data/interfaces/default/images/publisherlogos/logo-benitez.png b/data/interfaces/default/images/publisherlogos/logo-benitez.png new file mode 100644 index 00000000..85a83a4e Binary files /dev/null and b/data/interfaces/default/images/publisherlogos/logo-benitez.png differ diff --git a/data/interfaces/default/images/publisherlogos/logo-bluewatercomics.png b/data/interfaces/default/images/publisherlogos/logo-bluewatercomics.png old mode 100755 new mode 100644 diff --git a/data/interfaces/default/images/publisherlogos/logo-boom.jpg b/data/interfaces/default/images/publisherlogos/logo-boom.jpg old mode 100755 new mode 100644 diff --git a/data/interfaces/default/images/publisherlogos/logo-boundless.png b/data/interfaces/default/images/publisherlogos/logo-boundless.png new file mode 100644 index 00000000..89a555a4 Binary files /dev/null and b/data/interfaces/default/images/publisherlogos/logo-boundless.png differ diff --git a/data/interfaces/default/images/publisherlogos/logo-cartoonbooks.jpg b/data/interfaces/default/images/publisherlogos/logo-cartoonbooks.jpg old mode 100755 new mode 100644 diff --git a/data/interfaces/default/images/publisherlogos/logo-darbypop.png b/data/interfaces/default/images/publisherlogos/logo-darbypop.png new file mode 100644 index 00000000..b07463a8 Binary files /dev/null and b/data/interfaces/default/images/publisherlogos/logo-darbypop.png differ diff --git a/data/interfaces/default/images/publisherlogos/logo-darkhorse.jpg b/data/interfaces/default/images/publisherlogos/logo-darkhorse.jpg deleted file mode 100755 index 30e2ff6f..00000000 Binary files a/data/interfaces/default/images/publisherlogos/logo-darkhorse.jpg and /dev/null differ diff --git a/data/interfaces/default/images/publisherlogos/logo-darkhorse.png b/data/interfaces/default/images/publisherlogos/logo-darkhorse.png old mode 100755 new mode 100644 diff --git a/data/interfaces/default/images/publisherlogos/logo-dccomics.png b/data/interfaces/default/images/publisherlogos/logo-dccomics.png old mode 100755 new mode 100644 diff --git a/data/interfaces/default/images/publisherlogos/logo-devilsdue.png b/data/interfaces/default/images/publisherlogos/logo-devilsdue.png new file mode 100644 index 00000000..5147c244 Binary files /dev/null and b/data/interfaces/default/images/publisherlogos/logo-devilsdue.png differ diff --git a/data/interfaces/default/images/publisherlogos/logo-dynamite.png b/data/interfaces/default/images/publisherlogos/logo-dynamite.png old mode 100755 new mode 100644 index c8ae14d2..c149b970 Binary files a/data/interfaces/default/images/publisherlogos/logo-dynamite.png and b/data/interfaces/default/images/publisherlogos/logo-dynamite.png differ diff --git a/data/interfaces/default/images/publisherlogos/logo-iconcomics.png b/data/interfaces/default/images/publisherlogos/logo-iconcomics.png old mode 100755 new mode 100644 diff --git a/data/interfaces/default/images/publisherlogos/logo-idwpublish.png b/data/interfaces/default/images/publisherlogos/logo-idwpublish.png old mode 100755 new mode 100644 diff --git a/data/interfaces/default/images/publisherlogos/logo-imagecomics.png b/data/interfaces/default/images/publisherlogos/logo-imagecomics.png old mode 100755 new mode 100644 diff --git a/data/interfaces/default/images/publisherlogos/logo-joebooks.png b/data/interfaces/default/images/publisherlogos/logo-joebooks.png new file mode 100644 index 00000000..fa03f073 Binary files /dev/null and b/data/interfaces/default/images/publisherlogos/logo-joebooks.png differ diff --git a/data/interfaces/default/images/publisherlogos/logo-marvel.jpg b/data/interfaces/default/images/publisherlogos/logo-marvel.jpg old mode 100755 new mode 100644 diff --git a/data/interfaces/default/images/publisherlogos/logo-midtowncomics.jpg b/data/interfaces/default/images/publisherlogos/logo-midtowncomics.jpg old mode 100755 new mode 100644 diff --git a/data/interfaces/default/images/publisherlogos/logo-onipress.jpg b/data/interfaces/default/images/publisherlogos/logo-onipress.jpg new file mode 100644 index 00000000..58ea3002 Binary files /dev/null and b/data/interfaces/default/images/publisherlogos/logo-onipress.jpg differ diff --git a/data/interfaces/default/images/publisherlogos/logo-onipress.png b/data/interfaces/default/images/publisherlogos/logo-onipress.png deleted file mode 100755 index 3e8fee80..00000000 Binary files a/data/interfaces/default/images/publisherlogos/logo-onipress.png and /dev/null differ diff --git a/data/interfaces/default/images/publisherlogos/logo-red5comics.png b/data/interfaces/default/images/publisherlogos/logo-red5comics.png old mode 100755 new mode 100644 diff --git a/data/interfaces/default/images/publisherlogos/logo-shadowline.png b/data/interfaces/default/images/publisherlogos/logo-shadowline.png old mode 100755 new mode 100644 index 55261f8d..9f618af8 Binary files a/data/interfaces/default/images/publisherlogos/logo-shadowline.png and b/data/interfaces/default/images/publisherlogos/logo-shadowline.png differ diff --git a/data/interfaces/default/images/publisherlogos/logo-skybound.jpg b/data/interfaces/default/images/publisherlogos/logo-skybound.jpg old mode 100755 new mode 100644 diff --git a/data/interfaces/default/images/publisherlogos/logo-titan.png b/data/interfaces/default/images/publisherlogos/logo-titan.png new file mode 100644 index 00000000..058c76af Binary files /dev/null and b/data/interfaces/default/images/publisherlogos/logo-titan.png differ diff --git a/data/interfaces/default/images/publisherlogos/logo-tokyopop.jpg b/data/interfaces/default/images/publisherlogos/logo-tokyopop.jpg deleted file mode 100755 index c7a857b7..00000000 Binary files a/data/interfaces/default/images/publisherlogos/logo-tokyopop.jpg and /dev/null differ diff --git a/data/interfaces/default/images/publisherlogos/logo-tokyopop.png b/data/interfaces/default/images/publisherlogos/logo-tokyopop.png new file mode 100644 index 00000000..7508bc5c Binary files /dev/null and b/data/interfaces/default/images/publisherlogos/logo-tokyopop.png differ diff --git a/data/interfaces/default/images/publisherlogos/logo-topcow.gif b/data/interfaces/default/images/publisherlogos/logo-topcow.gif old mode 100755 new mode 100644 diff --git a/data/interfaces/default/images/publisherlogos/logo-vertigo.jpg b/data/interfaces/default/images/publisherlogos/logo-vertigo.jpg deleted file mode 100755 index 4d9641e5..00000000 Binary files a/data/interfaces/default/images/publisherlogos/logo-vertigo.jpg and /dev/null differ diff --git a/data/interfaces/default/images/publisherlogos/logo-vertigo.png b/data/interfaces/default/images/publisherlogos/logo-vertigo.png new file mode 100644 index 00000000..78f53b4e Binary files /dev/null and b/data/interfaces/default/images/publisherlogos/logo-vertigo.png differ diff --git a/data/interfaces/default/images/publisherlogos/logo-viz.png b/data/interfaces/default/images/publisherlogos/logo-viz.png new file mode 100644 index 00000000..1c9fd7a9 Binary files /dev/null and b/data/interfaces/default/images/publisherlogos/logo-viz.png differ diff --git a/data/interfaces/default/images/publisherlogos/logo-warpgraphics.png b/data/interfaces/default/images/publisherlogos/logo-warpgraphics.png new file mode 100644 index 00000000..56fdd118 Binary files /dev/null and b/data/interfaces/default/images/publisherlogos/logo-warpgraphics.png differ diff --git a/data/interfaces/default/images/publisherlogos/logo-wildstorm.png b/data/interfaces/default/images/publisherlogos/logo-wildstorm.png new file mode 100644 index 00000000..d72da8f0 Binary files /dev/null and b/data/interfaces/default/images/publisherlogos/logo-wildstorm.png differ diff --git a/data/interfaces/default/images/publisherlogos/logo-zenescope.jpg b/data/interfaces/default/images/publisherlogos/logo-zenescope.jpg deleted file mode 100755 index 02d496ea..00000000 Binary files a/data/interfaces/default/images/publisherlogos/logo-zenescope.jpg and /dev/null differ diff --git a/data/interfaces/default/images/publisherlogos/logo-zenescope.png b/data/interfaces/default/images/publisherlogos/logo-zenescope.png index a9338d47..77c091aa 100644 Binary files a/data/interfaces/default/images/publisherlogos/logo-zenescope.png and b/data/interfaces/default/images/publisherlogos/logo-zenescope.png differ diff --git a/data/interfaces/default/images/publisherlogos/logos.png b/data/interfaces/default/images/publisherlogos/logos.png deleted file mode 100755 index 65be5d0f..00000000 Binary files a/data/interfaces/default/images/publisherlogos/logos.png and /dev/null differ diff --git a/data/interfaces/default/weeklypull.html b/data/interfaces/default/weeklypull.html index 7800ed70..b6264de6 100755 --- a/data/interfaces/default/weeklypull.html +++ b/data/interfaces/default/weeklypull.html @@ -200,8 +200,9 @@ %elif weekly['HASH'] is not None: + %if mylar.CONFIG.SHOW_ICONS: - + %else: Auto-Snatch %endif diff --git a/mylar/cmtagmylar.py b/mylar/cmtagmylar.py index a0f98317..e58e54cd 100644 --- a/mylar/cmtagmylar.py +++ b/mylar/cmtagmylar.py @@ -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: diff --git a/mylar/helpers.py b/mylar/helpers.py index 76b51a1e..ef5cbc75 100755 --- a/mylar/helpers.py +++ b/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 diff --git a/mylar/webserve.py b/mylar/webserve.py index ed4d9431..82dce609 100644 --- a/mylar/webserve.py +++ b/mylar/webserve.py @@ -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'