Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-09 03:04:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

iTunes driver: Better series_index sorting

Browse Source
This commit is contained in:
Kovid Goyal 2010-07-12 17:02:12 -06:00
commit 60c86d4744
2 changed files with 101 additions and 156 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

238
resources/images/help.svg
View File

@ -1,234 +1,176 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?> <?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Generator: Adobe Illustrator 12.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 51448) --> <!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg <svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://web.resource.org/cc/"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg"
xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xlink="http://www.w3.org/1999/xlink"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
version="1.0" version="1.0"
id="Livello_1"
width="128" width="128"
height="128" height="128"
viewBox="0 0 139 139" viewBox="0 0 139 139"
overflow="visible" id="Livello_1"
enable-background="new 0 0 139 139"
xml:space="preserve" xml:space="preserve"
sodipodi:version="0.32" style="overflow:visible"><defs
inkscape:version="0.45+devel"
sodipodi:docname="system-help.svgz"
inkscape:output_extension="org.inkscape.output.svgz.inkscape"
style="overflow:visible"><metadata
id="metadata3164"><rdf:RDF><cc:Work
rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
id="defs3162"><filter id="defs3162"><filter
inkscape:collect="always"
x="-0.132641" x="-0.132641"
width="1.265282"
y="-0.34752154" y="-0.34752154"
width="1.265282"
height="1.6950431" height="1.6950431"
color-interpolation-filters="sRGB"
id="filter3547"><feGaussianBlur id="filter3547"><feGaussianBlur
inkscape:collect="always" id="feGaussianBlur3549"
stdDeviation="2.7512044" stdDeviation="2.7512044" /></filter><filter
id="feGaussianBlur3549" /></filter><filter color-interpolation-filters="sRGB"
inkscape:collect="always"
id="filter5097"><feGaussianBlur id="filter5097"><feGaussianBlur
inkscape:collect="always" id="feGaussianBlur5099"
stdDeviation="2.32" stdDeviation="2.32" /></filter><filter
id="feGaussianBlur5099" /></filter><filter
inkscape:collect="always"
x="-0.143268" x="-0.143268"
width="1.286536"
y="-0.072184406" y="-0.072184406"
width="1.286536"
height="1.1443688" height="1.1443688"
color-interpolation-filters="sRGB"
id="filter5125"><feGaussianBlur id="filter5125"><feGaussianBlur
inkscape:collect="always" id="feGaussianBlur5127"
stdDeviation="1.91024" stdDeviation="1.91024" /></filter></defs>
id="feGaussianBlur5127" /></filter></defs><sodipodi:namedview
inkscape:window-height="697"
inkscape:window-width="1024"
inkscape:pageshadow="2"
inkscape:pageopacity="0.0"
guidetolerance="10.0"
gridtolerance="10.0"
objecttolerance="10.0"
borderopacity="1.0"
bordercolor="#666666"
pagecolor="#ffffff"
id="base"
inkscape:zoom="2.9352518"
inkscape:cx="99.496726"
inkscape:cy="69.329657"
inkscape:window-x="0"
inkscape:window-y="0"
inkscape:current-layer="Livello_1"
height="128px"
width="128px" />
<filter <filter
color-interpolation-filters="sRGB"
id="AI_Sfocatura_4"> id="AI_Sfocatura_4">
<feGaussianBlur <feGaussianBlur
stdDeviation="4" id="feGaussianBlur3096"
id="feGaussianBlur3096" /> stdDeviation="4" />
</filter> </filter>
<filter <filter
color-interpolation-filters="sRGB"
id="AI_Sfocatura_2"> id="AI_Sfocatura_2">
<feGaussianBlur <feGaussianBlur
stdDeviation="2" id="feGaussianBlur3099"
id="feGaussianBlur3099" /> stdDeviation="2" />
</filter> </filter>
<radialGradient <radialGradient
id="XMLID_12_"
cx="69.600098" cx="69.600098"
cy="69.576698" cy="69.576698"
r="58" r="58"
gradientTransform="matrix(1,0,0,-0.1823,0,134.8566)" id="XMLID_12_"
gradientUnits="userSpaceOnUse"> gradientUnits="userSpaceOnUse"
gradientTransform="matrix(1,0,0,-0.1823,0,134.8566)">
<stop <stop
offset="0" id="stop3102"
style="stop-color:#000000" style="stop-color:#000000;stop-opacity:1"
id="stop3102" /> offset="0" />
<stop <stop
offset="1" id="stop3104"
style="stop-color:#000000;stop-opacity:0;" style="stop-color:#000000;stop-opacity:0"
id="stop3104" /> offset="1" />
</radialGradient> </radialGradient>
<circle <circle
sodipodi:ry="58" cx="69.599998"
sodipodi:rx="58"
sodipodi:cy="69.599998"
sodipodi:cx="69.599998"
style="opacity:0.7;fill:#000000;fill-opacity:1;stroke:none;filter:url(#filter5097)"
id="circle5091"
r="58"
cy="69.599998" cy="69.599998"
cx="69.599998" r="58"
transform="matrix(1.0859375,0,0,1.0859375,-3.9093733,-8.2531233)" /><ellipse transform="matrix(1.0859375,0,0,1.0859375,-3.9093733,-8.2531233)"
cx="69.599998" id="circle5091"
cy="122.173" style="opacity:0.7;fill:#000000;fill-opacity:1;stroke:none;filter:url(#filter5097)" />
rx="58"
ry="10.573"
id="ellipse3106"
style="opacity:0.6;fill:url(#XMLID_12_)"
sodipodi:cx="69.599998"
sodipodi:cy="122.173"
sodipodi:rx="58"
sodipodi:ry="10.573"
transform="translate(-9.9998474e-2,1.9102535)" />
<radialGradient <radialGradient
id="XMLID_13_"
cx="69.600098" cx="69.600098"
cy="69.600098" cy="69.600098"
r="58" r="58"
id="XMLID_13_"
gradientUnits="userSpaceOnUse"> gradientUnits="userSpaceOnUse">
<stop <stop
offset="0.6154" id="stop3113"
style="stop-color:#EEEEEE" style="stop-color:#eeeeee;stop-opacity:1"
id="stop3113" /> offset="0.61540002" />
<stop <stop
offset="0.8225" id="stop3115"
style="stop-color:#DDDDDD" style="stop-color:#dddddd;stop-opacity:1"
id="stop3115" /> offset="0.82249999" />
<stop <stop
offset="1" id="stop3117"
style="stop-color:#FFFFFF" style="stop-color:#ffffff;stop-opacity:1"
id="stop3117" /> offset="1" />
</radialGradient> </radialGradient>
<circle <circle
cx="69.599998" cx="69.599998"
cy="69.599998" cy="69.599998"
r="58" r="58"
transform="matrix(1.0859375,0,0,1.0859375,-3.9093733,-8.2531233)"
id="circle3119" id="circle3119"
style="fill:url(#XMLID_13_)" style="fill:url(#XMLID_13_)" />
sodipodi:cx="69.599998"
sodipodi:cy="69.599998"
sodipodi:rx="58"
sodipodi:ry="58"
transform="matrix(1.0859375,0,0,1.0859375,-3.9093733,-8.2531233)" />
<linearGradient <linearGradient
id="XMLID_14_"
gradientUnits="userSpaceOnUse"
x1="27.6001" x1="27.6001"
y1="69.600098" y1="69.600098"
x2="111.6001" x2="111.6001"
y2="69.600098" y2="69.600098"
id="XMLID_14_"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(1.0859375,0,0,1.0859375,-3.9093733,-8.2531233)"> gradientTransform="matrix(1.0859375,0,0,1.0859375,-3.9093733,-8.2531233)">
<stop <stop
offset="0" id="stop3122"
style="stop-color:#2A94EC" style="stop-color:#2a94ec;stop-opacity:1"
id="stop3122" /> offset="0" />
<stop <stop
offset="1" id="stop3124"
style="stop-color:#0057AE" style="stop-color:#0057ae;stop-opacity:1"
id="stop3124" /> offset="1" />
</linearGradient> </linearGradient>
<path <path
d="M 26.062502,67.328127 C 26.062502,92.477355 46.522651,112.9375 71.671877,112.9375 C 96.821104,112.9375 117.28125,92.477355 117.28125,67.328127 C 117.28125,42.178901 96.821104,21.718753 71.671877,21.718753 C 46.522651,21.718753 26.062502,42.178901 26.062502,67.328127 z" d="m 26.062502,67.328127 c 0,25.149228 20.460149,45.609373 45.609375,45.609373 25.149227,0 45.609373,-20.460145 45.609373,-45.609373 0,-25.149226 -20.460146,-45.609374 -45.609373,-45.609374 -25.149226,0 -45.609375,20.460148 -45.609375,45.609374 z"
id="path3126" id="path3126"
style="fill:url(#XMLID_14_)" /> style="fill:url(#XMLID_14_)" />
<g <g
transform="matrix(1.0859375,0,0,1.0859375,-3.9093733,-8.2531233)"
id="circle22111" id="circle22111"
cy="92" style="opacity:0.3;filter:url(#filter3547)">
rx="36"
ry="36"
cx="343.99899"
enable-background="new "
style="opacity:0.3;filter:url(#filter3547)"
transform="matrix(1.0859375,0,0,1.0859375,-3.9093733,-8.2531233)">
<path <path
d="M 77.041,104.759 C 63.767,106.115 50.122,103.11 46.565,98.042 C 43.007,92.976 50.885,87.768 64.16,86.41 C 77.434,85.054 91.079,88.058 94.637,93.126 C 98.193,98.194 90.315,103.401 77.041,104.759 z" d="M 77.041,104.759 C 63.767,106.115 50.122,103.11 46.565,98.042 43.007,92.976 50.885,87.768 64.16,86.41 c 13.274,-1.356 26.919,1.648 30.477,6.716 3.556,5.068 -4.322,10.275 -17.596,11.633 z"
id="path3129" id="path3129"
style="fill:#a8dde0" /> style="fill:#a8dde0" />
</g> </g>
<linearGradient <linearGradient
id="circle16776_1_"
gradientUnits="userSpaceOnUse"
x1="135.5601" x1="135.5601"
y1="417.66461" y1="417.66461"
x2="161.87621" x2="161.87621"
y2="417.66461" y2="417.66461"
id="circle16776_1_"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(0,1.7280523,1.7280523,0,-650.07477,-218.71693)"> gradientTransform="matrix(0,1.7280523,1.7280523,0,-650.07477,-218.71693)">
<stop <stop
offset="0" id="stop3132"
style="stop-color:#FFFFFF" style="stop-color:#ffffff;stop-opacity:1"
id="stop3132" /> offset="0" />
<stop <stop
offset="1" id="stop3134"
style="stop-color:#ffffff;stop-opacity:0;" style="stop-color:#ffffff;stop-opacity:0"
id="stop3134" /> offset="1" />
</linearGradient> </linearGradient>
<path <path
d="m 71.671877,24.06655 c -21.383195,0 -39.252297,14.70468 -43.558039,34.283047 8.584336,7.792687 24.872313,-3.99082 43.558039,-3.99082 18.685727,0 34.974783,11.783507 43.558033,3.99082 C 110.92417,38.77123 93.056158,24.06655 71.671877,24.06655 z"
id="circle16776" id="circle16776"
enable-background="new "
d="M 71.671877,24.06655 C 50.288682,24.06655 32.41958,38.77123 28.113838,58.349597 C 36.698174,66.142284 52.986151,54.358777 71.671877,54.358777 C 90.357604,54.358777 106.64666,66.142284 115.22991,58.349597 C 110.92417,38.77123 93.056158,24.06655 71.671877,24.06655 z"
style="opacity:0.8;fill:url(#circle16776_1_)" /> style="opacity:0.8;fill:url(#circle16776_1_)" />
<g <g
id="g3137" transform="matrix(1.0859375,0,0,1.0859375,-3.9093733,-8.2531233)"
transform="matrix(1.0859375,0,0,1.0859375,-3.9093733,-8.2531233)"> id="g3137">
<defs <defs
id="defs3139"><path id="defs3139"><path
id="XMLID_10_" d="m 27.6,69.6 c 0,23.159 18.841,42 42,42 23.159,0 42,-18.841 42,-42 0,-23.159 -18.841,-42 -42,-42 -23.159,0 -42,18.841 -42,42 z"
d="M 27.6,69.6 C 27.6,92.759 46.441,111.6 69.6,111.6 C 92.759,111.6 111.6,92.759 111.6,69.6 C 111.6,46.441 92.759,27.6 69.6,27.6 C 46.441,27.6 27.6,46.441 27.6,69.6 z" /></defs> id="XMLID_10_" /></defs>
<clipPath <clipPath
id="XMLID_6_"> id="XMLID_6_">
<use <use
xlink:href="#XMLID_10_"
id="use3143" id="use3143"
x="0" x="0"
y="0" y="0"
width="139" width="139"
height="139" /> height="139"
xlink:href="#XMLID_10_" />
</clipPath> </clipPath>
<g <g
clip-path="url(#XMLID_6_)" clip-path="url(#XMLID_6_)"
id="g3145" id="g3145"
style="filter:url(#AI_Sfocatura_2)"> style="filter:url(#AI_Sfocatura_2)">
<path <path
d="M 27.6,69.6 C 27.6,92.759 46.441,111.6 69.6,111.6 C 92.759,111.6 111.6,92.759 111.6,69.6 C 111.6,46.441 92.759,27.6 69.6,27.6 C 46.441,27.6 27.6,46.441 27.6,69.6 z" d="m 27.6,69.6 c 0,23.159 18.841,42 42,42 23.159,0 42,-18.841 42,-42 0,-23.159 -18.841,-42 -42,-42 -23.159,0 -42,18.841 -42,42 z"
id="path3147" id="path3147"
style="fill:none;stroke:#00316e;stroke-width:2" /> style="fill:none;stroke:#00316e;stroke-width:2" />
</g> </g>
@ -240,30 +182,22 @@
transform="matrix(1.0859375,0,0,1.1113796,-3.201342,-9.3177223)" transform="matrix(1.0859375,0,0,1.1113796,-3.201342,-9.3177223)"
id="g5119" id="g5119"
style="fill:#00316e;filter:url(#filter5125)"><path style="fill:#00316e;filter:url(#filter5125)"><path
style="fill:#00316e" d="m 63.37,80.089 -0.178,-2.343 c -0.18,-4.598 1.248,-9.284 5.259,-14.062 2.853,-3.424 5.169,-6.398 5.169,-9.463 0,-3.064 -2.049,-5.227 -6.418,-5.318 -3.029,0 -6.506,0.992 -8.913,2.614 l -2.941,-9.733 c 3.208,-1.894 8.467,-3.696 14.885,-3.696 11.677,0 17.115,6.58 17.115,13.97 0,6.939 -4.279,11.357 -7.667,15.231 -3.209,3.605 -4.635,7.121 -4.546,11.177 l 0,1.622 -11.765,0 0,0.001 z"
d="M 63.37,80.089 L 63.192,77.746 C 63.012,73.148 64.44,68.462 68.451,63.684 C 71.304,60.26 73.62,57.286 73.62,54.221 C 73.62,51.157 71.571,48.994 67.202,48.903 C 64.173,48.903 60.696,49.895 58.289,51.517 L 55.348,41.784 C 58.556,39.89 63.815,38.088 70.233,38.088 C 81.91,38.088 87.348,44.668 87.348,52.058 C 87.348,58.997 83.069,63.415 79.681,67.289 C 76.472,70.894 75.046,74.41 75.135,78.466 L 75.135,80.088 L 63.37,80.088 L 63.37,80.089 z" id="path5121"
id="path5121" /><circle style="fill:#00316e" /><circle
style="fill:#00316e"
sodipodi:ry="8"
sodipodi:rx="8"
sodipodi:cy="93.599998"
sodipodi:cx="69.599998"
cx="69.599998" cx="69.599998"
cy="93.599998" cy="93.599998"
r="8" r="8"
id="circle5123" /></g><g id="circle5123"
id="g5101" style="fill:#00316e" /></g><g
transform="matrix(1.0859375,0,0,1.0859375,-3.201342,-8.2531233)"><path transform="matrix(1.0859375,0,0,1.0859375,-3.201342,-8.2531233)"
id="g5101"><path
d="m 63.37,80.089 -0.178,-2.343 c -0.18,-4.598 1.248,-9.284 5.259,-14.062 2.853,-3.424 5.169,-6.398 5.169,-9.463 0,-3.064 -2.049,-5.227 -6.418,-5.318 -3.029,0 -6.506,0.992 -8.913,2.614 l -2.941,-9.733 c 3.208,-1.894 8.467,-3.696 14.885,-3.696 11.677,0 17.115,6.58 17.115,13.97 0,6.939 -4.279,11.357 -7.667,15.231 -3.209,3.605 -4.635,7.121 -4.546,11.177 l 0,1.622 -11.765,0 0,0.001 z"
id="path3157" id="path3157"
d="M 63.37,80.089 L 63.192,77.746 C 63.012,73.148 64.44,68.462 68.451,63.684 C 71.304,60.26 73.62,57.286 73.62,54.221 C 73.62,51.157 71.571,48.994 67.202,48.903 C 64.173,48.903 60.696,49.895 58.289,51.517 L 55.348,41.784 C 58.556,39.89 63.815,38.088 70.233,38.088 C 81.91,38.088 87.348,44.668 87.348,52.058 C 87.348,58.997 83.069,63.415 79.681,67.289 C 76.472,70.894 75.046,74.41 75.135,78.466 L 75.135,80.088 L 63.37,80.088 L 63.37,80.089 z"
style="fill:#ffffff" /><circle style="fill:#ffffff" /><circle
id="circle3159"
r="8"
cy="93.599998"
cx="69.599998" cx="69.599998"
sodipodi:cx="69.599998" cy="93.599998"
sodipodi:cy="93.599998" r="8"
sodipodi:rx="8" id="circle3159"
sodipodi:ry="8"
style="fill:#ffffff" /></g> style="fill:#ffffff" /></g>
</svg> </svg>
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 8.4 KiB

After

Width:  |  Height:  |  Size: 6.3 KiB

19
src/calibre/devices/apple/driver.py
View File

@ -2586,14 +2586,20 @@ class ITUNES(DriverBase):
if metadata.series and self.settings().read_metadata: if metadata.series and self.settings().read_metadata:
if DEBUG: if DEBUG:
self.log.info(" using Series name as Genre") self.log.info(" using Series name as Genre")
# Format the index as a sort key
index = metadata.series_index
integer = int(index)
fraction = index-integer
series_index = '%04d%s' % (integer, str('%0.4f' % fraction).lstrip('0'))
if lb_added: if lb_added:
lb_added.sort_name.set("%s %04f" % (metadata.series, metadata.series_index)) lb_added.sort_name.set("%s %s" % (metadata.series, series_index))
lb_added.genre.set(metadata.series) lb_added.genre.set(metadata.series)
lb_added.episode_ID.set(metadata.series) lb_added.episode_ID.set(metadata.series)
lb_added.episode_number.set(metadata.series_index) lb_added.episode_number.set(metadata.series_index)
if db_added: if db_added:
db_added.sort_name.set("%s %04f" % (metadata.series, metadata.series_index)) db_added.sort_name.set("%s %s" % (metadata.series, series_index))
db_added.genre.set(metadata.series) db_added.genre.set(metadata.series)
db_added.episode_ID.set(metadata.series) db_added.episode_ID.set(metadata.series)
db_added.episode_number.set(metadata.series_index) db_added.episode_number.set(metadata.series_index)
@ -2658,8 +2664,13 @@ class ITUNES(DriverBase):
if metadata.series and self.settings().read_metadata: if metadata.series and self.settings().read_metadata:
if DEBUG: if DEBUG:
self.log.info(" using Series name as Genre") self.log.info(" using Series name as Genre")
# Format the index as a sort key
index = metadata.series_index
integer = int(index)
fraction = index-integer
series_index = '%04d%%s' % (integer, str('%0.4f' % fraction).lstrip('0'))
if lb_added: if lb_added:
lb_added.SortName = "%s %04f" % (metadata.series, metadata.series_index) lb_added.SortName = "%s %s" % (metadata.series, series_index)
lb_added.Genre = metadata.series lb_added.Genre = metadata.series
lb_added.EpisodeID = metadata.series lb_added.EpisodeID = metadata.series
try: try:
@ -2667,7 +2678,7 @@ class ITUNES(DriverBase):
except: except:
pass pass
if db_added: if db_added:
db_added.SortName = "%s %04f" % (metadata.series, metadata.series_index) db_added.SortName = "%s %s" % (metadata.series, series_index)
db_added.Genre = metadata.series db_added.Genre = metadata.series
db_added.EpisodeID = metadata.series db_added.EpisodeID = metadata.series
try: try: