mirror of
https://github.com/kovidgoyal/calibre.git
synced 2025-06-23 15:30:45 -04:00
Catalog tweaks and MOBI metadata: ignore cover records with value < 0
This commit is contained in:
Kovid Goyal
commit
cd6a6ea91f
157
resources/images/catalog.svg
Normal file
157
resources/images/catalog.svg
Normal file
@ -0,0 +1,157 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 43363) -->
|
||||
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
|
||||
<svg version="1.1" id="svg2" xmlns:svg="http://www.w3.org/2000/svg" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
|
||||
xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="128px" height="128px"
|
||||
viewBox="0 0 128 128" enable-background="new 0 0 128 128" xml:space="preserve">
|
||||
<filter id="filter5365">
|
||||
<feGaussianBlur stdDeviation="1.3829225" inkscape:collect="always" id="feGaussianBlur5367"></feGaussianBlur>
|
||||
</filter>
|
||||
<g id="layer1">
|
||||
</g>
|
||||
<g id="layer2">
|
||||
<polygon id="rect3200" opacity="0.5722" fill="#0000A4" enable-background="new " points="167.5,297.005 171.429,297.005
|
||||
171.429,297.005 "/>
|
||||
<g id="path5265" filter="url(#filter5365)">
|
||||
<polygon fill="#362D2D" points="21.951,79.904 70.397,63.09 119.953,80.636 70.397,97.084 "/>
|
||||
<polygon fill="none" stroke="#362D2D" stroke-width="1.2507" stroke-linejoin="bevel" points="21.951,79.904 70.397,63.09
|
||||
119.953,80.636 70.397,97.084 "/>
|
||||
</g>
|
||||
<g id="path5267" filter="url(#filter5365)">
|
||||
<path fill="#362D2D" d="M118.639,100.902v1.724l-46.437,15.432c-3.723-9.284-1.901-16.34,0.089-20.69l46.883-15.518l-6.34,2.068
|
||||
l2.322,16.553L118.639,100.902z"/>
|
||||
<path fill="none" stroke="#362D2D" stroke-width="1.9" d="M118.639,100.902v1.724l-46.437,15.432
|
||||
c-3.723-9.284-1.901-16.34,0.089-20.69l46.883-15.518l-6.34,2.068l2.322,16.553L118.639,100.902z"/>
|
||||
</g>
|
||||
<g id="path5269" filter="url(#filter5365)">
|
||||
<path fill="#362D2D" d="M70.711,98.81l47.581-15.743l0.29,18.582l-47.56,15.986c0,0-1.515-3.455-1.942-9.812
|
||||
C68.936,101.726,70.711,98.81,70.711,98.81z"/>
|
||||
<path fill="none" stroke="#362D2D" stroke-width="2.1" d="M70.711,98.81l47.581-15.743l0.29,18.582l-47.56,15.986
|
||||
c0,0-1.515-3.455-1.942-9.812C68.936,101.726,70.711,98.81,70.711,98.81z"/>
|
||||
</g>
|
||||
<g id="path5271" filter="url(#filter5365)">
|
||||
<path fill="#362D2D" d="M21.479,79.607l49.115,17.501c-3.287,7.816-2.385,15.202,0.982,23.019l-50.008-16.208
|
||||
C17.974,94.288,17.113,87.874,21.479,79.607z"/>
|
||||
<path fill="none" stroke="#362D2D" stroke-width="1.6" d="M21.479,79.607l49.115,17.501c-3.287,7.816-2.385,15.202,0.982,23.019
|
||||
l-50.008-16.208C17.974,94.288,17.113,87.874,21.479,79.607z"/>
|
||||
</g>
|
||||
<g id="path5273" filter="url(#filter5365)">
|
||||
<path fill="#362D2D" d="M120.871,99.092v4.827l-50.008,16.897l-49.651-15.863c-4.763-11.162-1.987-18.682,0.714-25.346
|
||||
l49.651-16.724l48.579,17.242v3.449l-2.143,1.033l0.357,14.139L120.871,99.092z"/>
|
||||
<path fill="none" stroke="#362D2D" stroke-width="2.7" stroke-linejoin="bevel" d="M120.871,99.092v4.827l-50.008,16.897
|
||||
l-49.651-15.863c-4.763-11.162-1.987-18.682,0.714-25.346l49.651-16.724l48.579,17.242v3.449l-2.143,1.033l0.357,14.139
|
||||
L120.871,99.092z"/>
|
||||
</g>
|
||||
<path id="path5385" fill="#78CE4F" d="M19.316,78.05l48.438-17.414l49.548,18.171L67.754,95.842L19.316,78.05z"/>
|
||||
<path id="path5387" fill="none" stroke="#0F973B" stroke-width="1.9" d="M115.988,99.796v1.786l-46.43,15.982
|
||||
c-3.722-9.616-1.901-16.924,0.09-21.43l46.875-16.07l-6.34,2.143l2.322,17.143L115.988,99.796z"/>
|
||||
|
||||
<radialGradient id="path5389_1_" cx="498.3457" cy="267.1621" r="27.1927" gradientTransform="matrix(-0.064 0.175 1.8694 0.6835 -425.1342 -169.6643)" gradientUnits="userSpaceOnUse">
|
||||
<stop offset="0" style="stop-color:#B5FFA6"/>
|
||||
<stop offset="1" style="stop-color:#76E976"/>
|
||||
</radialGradient>
|
||||
<path id="path5389" fill="url(#path5389_1_)" stroke="#003131" stroke-width="1.6" stroke-opacity="0.9608" d="M18.845,77.742
|
||||
l49.107,18.125c-3.287,8.096-2.385,15.744,0.981,23.84l-50-16.786C15.339,92.946,14.479,86.304,18.845,77.742z"/>
|
||||
<path id="path5391" fill="none" stroke="#003131" stroke-width="2.7" stroke-linejoin="bevel" stroke-opacity="0.9608" d="
|
||||
M118.22,97.921v5l-50,17.5l-49.643-16.429c-4.762-11.561-1.987-19.348,0.714-26.25l49.642-17.321l48.572,17.857v3.571l-2.143,1.071
|
||||
l0.356,14.644L118.22,97.921z"/>
|
||||
<path id="path5393" fill="#FFFFFF" d="M68.068,97.629l47.572-16.305l0.29,19.245l-47.194,16.423c0,0-1.424-2.819-2.12-10.029
|
||||
C66.471,100.649,68.068,97.629,68.068,97.629z"/>
|
||||
<g id="path5419" filter="url(#filter5365)">
|
||||
<polygon fill="#362D2D" points="8.737,52.047 57.183,35.233 106.738,52.778 57.183,69.227 "/>
|
||||
<polygon fill="none" stroke="#362D2D" stroke-width="1.2507" stroke-linejoin="bevel" points="8.737,52.047 57.183,35.233
|
||||
106.738,52.778 57.183,69.227 "/>
|
||||
</g>
|
||||
<g id="path5421" filter="url(#filter5365)">
|
||||
<path fill="#362D2D" d="M105.424,73.045v1.724L58.988,90.2c-3.723-9.284-1.902-16.34,0.089-20.69l46.882-15.518l-6.341,2.069
|
||||
l2.322,16.552L105.424,73.045z"/>
|
||||
<path fill="none" stroke="#362D2D" stroke-width="1.9" d="M105.424,73.045v1.724L58.988,90.2
|
||||
c-3.723-9.284-1.902-16.34,0.089-20.69l46.882-15.518l-6.341,2.069l2.322,16.552L105.424,73.045z"/>
|
||||
</g>
|
||||
<g id="path5423" filter="url(#filter5365)">
|
||||
<path fill="#362D2D" d="M57.497,70.953l47.581-15.744l0.289,18.582L57.809,89.777c0,0-1.515-3.455-1.942-9.812
|
||||
C55.721,73.869,57.497,70.953,57.497,70.953z"/>
|
||||
<path fill="none" stroke="#362D2D" stroke-width="2.1" d="M57.497,70.953l47.581-15.744l0.289,18.582L57.809,89.777
|
||||
c0,0-1.515-3.455-1.942-9.812C55.721,73.869,57.497,70.953,57.497,70.953z"/>
|
||||
</g>
|
||||
<g id="path5425" filter="url(#filter5365)">
|
||||
<path fill="#362D2D" d="M8.265,51.751l49.116,17.501c-3.288,7.816-2.385,15.201,0.982,23.018L8.354,76.062
|
||||
C4.759,66.431,3.899,60.017,8.265,51.751z"/>
|
||||
<path fill="none" stroke="#362D2D" stroke-width="1.6" d="M8.265,51.751l49.116,17.501c-3.288,7.816-2.385,15.201,0.982,23.018
|
||||
L8.354,76.062C4.759,66.431,3.899,60.017,8.265,51.751z"/>
|
||||
</g>
|
||||
<g id="path5427" filter="url(#filter5365)">
|
||||
<path fill="#362D2D" d="M107.656,71.234v4.828L57.648,92.959L7.998,77.097C3.234,65.934,6.011,58.415,8.712,51.751l49.651-16.725
|
||||
l48.58,17.242v3.448l-2.144,1.035l0.357,14.139L107.656,71.234z"/>
|
||||
<path fill="none" stroke="#362D2D" stroke-width="2.7" stroke-linejoin="bevel" d="M107.656,71.234v4.828L57.648,92.959
|
||||
L7.998,77.097C3.234,65.934,6.011,58.415,8.712,51.751l49.651-16.725l48.58,17.242v3.448l-2.144,1.035l0.357,14.139
|
||||
L107.656,71.234z"/>
|
||||
</g>
|
||||
<path id="path5431" fill="#60BAFF" stroke="#003244" stroke-width="1.2507" stroke-linejoin="bevel" d="M6.102,50.193L54.54,32.779
|
||||
l49.548,18.171L54.54,67.985L6.102,50.193z"/>
|
||||
<path id="path5433" fill="none" stroke="#0056D5" stroke-width="2.8104" d="M102.768,71.76v1.803L56.35,89.701
|
||||
c-3.721-9.71-1.901-17.089,0.089-21.639l46.865-16.229l-6.338,2.164l2.321,17.312L102.768,71.76z"/>
|
||||
|
||||
<radialGradient id="path5435_1_" cx="316.8916" cy="261.2949" r="27.1937" gradientTransform="matrix(-0.0902 0.2793 1.9257 0.6218 -445.576 -180.1955)" gradientUnits="userSpaceOnUse">
|
||||
<stop offset="0" style="stop-color:#789DED"/>
|
||||
<stop offset="1" style="stop-color:#2381E8"/>
|
||||
</radialGradient>
|
||||
<path id="path5435" fill="url(#path5435_1_)" stroke="#003244" stroke-width="1.6" d="M5.63,49.885L54.738,68.01
|
||||
c-3.287,8.096-2.385,15.744,0.982,23.84l-50-16.785C2.125,65.09,1.265,58.447,5.63,49.885z"/>
|
||||
<path id="path5437" fill="none" stroke="#003244" stroke-width="2.7" stroke-linejoin="bevel" d="M105.006,70.064v5l-50,17.5
|
||||
L5.363,76.135c-4.762-11.561-1.987-19.348,0.714-26.25L55.72,32.564l48.571,17.857v3.572l-2.143,1.071l0.357,14.643L105.006,70.064
|
||||
z"/>
|
||||
<path id="path5439" fill="#FFFFFF" d="M54.854,69.772l47.573-16.306l0.29,19.245L55.522,89.135c0,0-1.425-2.819-2.121-10.028
|
||||
C53.256,72.793,54.854,69.772,54.854,69.772z"/>
|
||||
<g id="path5447" filter="url(#filter5365)">
|
||||
<polygon fill="#362D2D" points="25.88,28.119 74.326,11.305 123.882,28.85 74.326,45.299 "/>
|
||||
<polygon fill="none" stroke="#362D2D" stroke-width="1.2507" stroke-linejoin="bevel" points="25.88,28.119 74.326,11.305
|
||||
123.882,28.85 74.326,45.299 "/>
|
||||
</g>
|
||||
<g id="path5449" filter="url(#filter5365)">
|
||||
<path fill="#362D2D" d="M122.567,49.116v1.724L76.131,66.271c-3.723-9.284-1.902-16.34,0.09-20.69l46.883-15.518l-6.341,2.069
|
||||
l2.321,16.552L122.567,49.116z"/>
|
||||
<path fill="none" stroke="#362D2D" stroke-width="1.9" d="M122.567,49.116v1.724L76.131,66.271
|
||||
c-3.723-9.284-1.902-16.34,0.09-20.69l46.883-15.518l-6.341,2.069l2.321,16.552L122.567,49.116z"/>
|
||||
</g>
|
||||
<g id="path5451" filter="url(#filter5365)">
|
||||
<path fill="#362D2D" d="M74.641,47.024l47.58-15.744l0.289,18.582L74.951,65.849c0,0-1.514-3.455-1.941-9.812
|
||||
C72.863,49.94,74.641,47.024,74.641,47.024z"/>
|
||||
<path fill="none" stroke="#362D2D" stroke-width="2.1" d="M74.641,47.024l47.58-15.744l0.289,18.582L74.951,65.849
|
||||
c0,0-1.514-3.455-1.941-9.812C72.863,49.94,74.641,47.024,74.641,47.024z"/>
|
||||
</g>
|
||||
<g id="path5453" filter="url(#filter5365)">
|
||||
<path fill="#362D2D" d="M25.408,27.822l49.115,17.5c-3.287,7.816-2.385,15.202,0.982,23.018L25.498,52.133
|
||||
C21.902,42.502,21.042,36.088,25.408,27.822z"/>
|
||||
<path fill="none" stroke="#362D2D" stroke-width="1.6" d="M25.408,27.822l49.115,17.5c-3.287,7.816-2.385,15.202,0.982,23.018
|
||||
L25.498,52.133C21.902,42.502,21.042,36.088,25.408,27.822z"/>
|
||||
</g>
|
||||
<g id="path5455" filter="url(#filter5365)">
|
||||
<path fill="#362D2D" d="M124.8,47.306v4.828L74.791,69.03L25.14,53.168c-4.763-11.163-1.987-18.682,0.714-25.346l49.651-16.725
|
||||
l48.58,17.242v3.449l-2.145,1.034l0.357,14.139L124.8,47.306z"/>
|
||||
<path fill="none" stroke="#362D2D" stroke-width="2.7" stroke-linejoin="bevel" d="M124.8,47.306v4.828L74.791,69.03L25.14,53.168
|
||||
c-4.763-11.163-1.987-18.682,0.714-25.346l49.651-16.725l48.58,17.242v3.449l-2.145,1.034l0.357,14.139L124.8,47.306z"/>
|
||||
</g>
|
||||
<path id="path5459" fill="#FF7272" d="M23.245,26.264L71.684,8.85l49.547,18.171L71.684,44.057L23.245,26.264z"/>
|
||||
<path id="path5461" fill="none" stroke="#CF0505" stroke-width="1.9" d="M119.916,48.01v1.786L73.488,65.778
|
||||
c-3.723-9.616-1.902-16.923,0.089-21.429l46.875-16.071l-6.339,2.143l2.32,17.143L119.916,48.01z"/>
|
||||
|
||||
<radialGradient id="path5463_1_" cx="14.938" cy="-466.4766" r="27.3207" gradientTransform="matrix(2.5834 0.998 0.0835 -0.2162 46.7076 -68.8071)" gradientUnits="userSpaceOnUse">
|
||||
<stop offset="0" style="stop-color:#FD8A8A"/>
|
||||
<stop offset="1" style="stop-color:#FF7878"/>
|
||||
</radialGradient>
|
||||
<path id="path5463" fill="url(#path5463_1_)" stroke="#600101" stroke-width="1.6" d="M22.773,25.957l49.107,18.125
|
||||
c-3.287,8.095-2.385,15.744,0.982,23.839l-50-18.806C19.268,39.14,18.408,34.518,22.773,25.957z"/>
|
||||
|
||||
<linearGradient id="path3311_1_" gradientUnits="userSpaceOnUse" x1="-1.3145" y1="103.2168" x2="67.4683" y2="103.2168" gradientTransform="matrix(1 0 0 -1 5.4287 129.1426)">
|
||||
<stop offset="0" style="stop-color:#FFFFFF"/>
|
||||
<stop offset="1" style="stop-color:#FFFFFF;stop-opacity:0.2471"/>
|
||||
</linearGradient>
|
||||
<path id="path3311" fill="url(#path3311_1_)" d="M23.904,25.736L72.342,8.322l49.548,18.171L72.342,43.529L23.904,25.736z"/>
|
||||
<path id="path5465" fill="none" stroke="#600101" stroke-width="2.7" stroke-linejoin="bevel" d="M122.148,46.135v5l-50,17.5
|
||||
l-49.39-18.701c-4.762-11.562-2.239-17.076,0.461-23.977L72.863,8.635l48.57,17.857v3.571l-2.143,1.071l0.357,14.643
|
||||
L122.148,46.135z"/>
|
||||
<path id="path5467" fill="#FFFFFF" d="M71.997,45.844l47.573-16.306l0.289,19.246L72.666,65.206c0,0-1.426-2.819-2.121-10.028
|
||||
C70.399,48.864,71.997,45.844,71.997,45.844z"/>
|
||||
</g>
|
||||
</svg>
|
||||
|
After Width: | Height: | Size: 11 KiB |
@ -134,11 +134,13 @@ class MetadataUpdater(object):
|
||||
if id == 106:
|
||||
self.timestamp = content
|
||||
elif id == 201:
|
||||
rindex, = self.cover_rindex, = unpack('>I', content)
|
||||
self.cover_record = self.record(rindex + image_base)
|
||||
rindex, = self.cover_rindex, = unpack('>i', content)
|
||||
if rindex > 0 :
|
||||
self.cover_record = self.record(rindex + image_base)
|
||||
elif id == 202:
|
||||
rindex, = self.thumbnail_rindex, = unpack('>I', content)
|
||||
self.thumbnail_record = self.record(rindex + image_base)
|
||||
rindex, = self.thumbnail_rindex, = unpack('>i', content)
|
||||
if rindex > 0 :
|
||||
self.thumbnail_record = self.record(rindex + image_base)
|
||||
|
||||
def patch(self, off, new_record0):
|
||||
# Save the current size of each record
|
||||
|
||||
@ -583,7 +583,7 @@ class EPUB_MOBI(CatalogPlugin):
|
||||
self.__totalSteps = 11.0
|
||||
self.__verbose = opts.verbose
|
||||
|
||||
# Tweak build steps based on optional sections
|
||||
# Tweak build steps based on optional sections. 1 call for HTML, 1 for NCX
|
||||
if self.opts.generate_titles:
|
||||
self.__totalSteps += 2
|
||||
if self.opts.generate_recently_added:
|
||||
@ -831,8 +831,9 @@ class EPUB_MOBI(CatalogPlugin):
|
||||
|
||||
# Methods
|
||||
def buildSources(self):
|
||||
self.fetchBooksByTitle()
|
||||
if not self.booksByTitle:
|
||||
if self.booksByTitle is None:
|
||||
self.fetchBooksByTitle()
|
||||
if self.booksByTitle is None:
|
||||
return False
|
||||
self.fetchBooksByAuthor()
|
||||
self.generateHTMLDescriptions()
|
||||
@ -888,6 +889,7 @@ class EPUB_MOBI(CatalogPlugin):
|
||||
pass
|
||||
|
||||
def fetchBooksByTitle(self):
|
||||
|
||||
self.updateProgressFullStep("Fetching database")
|
||||
|
||||
# Get the database as a dictionary
|
||||
@ -939,11 +941,11 @@ class EPUB_MOBI(CatalogPlugin):
|
||||
this_title['series_index'] = 0.0
|
||||
|
||||
this_title['title_sort'] = self.generateSortTitle(this_title['title'])
|
||||
if 'authors' in record and len(record['authors']):
|
||||
if 'authors' in record and record['authors'] is not None:
|
||||
this_title['author'] = " & ".join(record['authors'])
|
||||
else:
|
||||
this_title['author'] = 'Unknown'
|
||||
this_title['author_sort'] = record['author_sort'].capitalize() if len(record['author_sort']) \
|
||||
this_title['author_sort'] = record['author_sort'].title() if len(record['author_sort'].strip()) \
|
||||
else self.author_to_author_sort(this_title['author'])
|
||||
this_title['id'] = record['id']
|
||||
if record['publisher']:
|
||||
@ -1213,10 +1215,11 @@ class EPUB_MOBI(CatalogPlugin):
|
||||
imgTag['src'] = "../images/thumbnail_default.jpg"
|
||||
imgTag['alt'] = "cover"
|
||||
|
||||
'''
|
||||
if self.opts.fmt == 'mobi':
|
||||
imgTag['style'] = 'width: %dpx; height:%dpx;' % (self.thumbWidth, self.thumbHeight)
|
||||
'''
|
||||
|
||||
# Tweak image size if we're building EPUB, not sure why this is needed
|
||||
# if self.opts.fmt == 'mobi':
|
||||
# imgTag['style'] = 'width: %dpx; height:%dpx;' % (self.thumbWidth, self.thumbHeight)
|
||||
thumbnailTag = body.find(attrs={'class':'thumbnail'})
|
||||
thumbnailTag.insert(0,imgTag)
|
||||
|
||||
@ -1777,8 +1780,6 @@ class EPUB_MOBI(CatalogPlugin):
|
||||
self.updateProgressFullStep("'Thumbnails'")
|
||||
thumbs = ['thumbnail_default.jpg']
|
||||
image_dir = "%s/images" % self.catalogPath
|
||||
self.calculateThumbnailSize()
|
||||
|
||||
for (i,title) in enumerate(self.booksByTitle):
|
||||
# Update status
|
||||
self.updateProgressMicroStep("Thumbnail %d of %d" % \
|
||||
@ -2500,16 +2501,16 @@ class EPUB_MOBI(CatalogPlugin):
|
||||
from calibre.customize.ui import output_profiles
|
||||
for x in output_profiles():
|
||||
if x.short_name == self.opts.output_profile:
|
||||
# 1" width
|
||||
self.thumbWidth = int(x.dpi * 1)
|
||||
self.thumbHeight = int(self.thumbWidth * 1.34)
|
||||
if 'kindle' in x.short_name:
|
||||
# .9" width aspect ratio: 3:4
|
||||
self.thumbWidth = int(x.dpi * .9)
|
||||
self.thumbHeight = int(self.thumbWidth * 1.33)
|
||||
if 'kindle' in x.short_name and self.opts.fmt == 'mobi':
|
||||
# Kindle DPI appears to be off by a factor of 2
|
||||
self.thumbWidth /= 2
|
||||
self.thumbHeight /= 2
|
||||
self.thumbWidth = int(self.thumbWidth/2)
|
||||
self.thumbHeight = int(self.thumbHeight/2)
|
||||
break
|
||||
if self.opts.verbose:
|
||||
self.opts.log(" DPI = %d; thumbnail dimensions: %d x %d" % \
|
||||
if self.verbose:
|
||||
self.opts.log(" DPI = %d; thumbnail dimensions: %d x %d" % \
|
||||
(x.dpi, self.thumbWidth, self.thumbHeight))
|
||||
|
||||
def convertHTMLEntities(self, s):
|
||||
@ -3167,6 +3168,7 @@ class EPUB_MOBI(CatalogPlugin):
|
||||
log.info("Begin catalog source generation")
|
||||
catalog.createDirectoryStructure()
|
||||
catalog.copyResources()
|
||||
catalog.calculateThumbnailSize()
|
||||
catalog_source_built = catalog.buildSources()
|
||||
if opts.verbose:
|
||||
if catalog_source_built:
|
||||
@ -3176,6 +3178,7 @@ class EPUB_MOBI(CatalogPlugin):
|
||||
|
||||
if catalog_source_built:
|
||||
recommendations = []
|
||||
# recommendations.append(('cover', I('catalog.svg'), OptionRecommendation.HIGH))
|
||||
|
||||
dp = getattr(opts, 'debug_pipeline', None)
|
||||
if dp is not None:
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user