Merge pull request #26 from t-sullivan/master

Add support for popular e-readers, consolidate existing formats
This commit is contained in:
Alex Yatskov 2016-08-13 20:27:52 -07:00 committed by GitHub
commit d9a78e3379
4 changed files with 55 additions and 21 deletions

28
.gitignore vendored
View File

@ -5,3 +5,31 @@ dist
*.mngl
*.cbz
*.bat
.idea/
*.DS_Store
.AppleDouble
.LSOverride
# Icon must end with two \r
Icon
# Thumbnails
._*
# Files that might appear in the root of a volume
.DocumentRevisions-V100
.fseventsd
.Spotlight-V100
.TemporaryItems
.Trashes
.VolumeIcon.icns
.com.apple.timemachine.donotpresent
# Directories potentially created on remote AFP share
.AppleDB
.AppleDesktop
Network Trash Folder
Temporary Items
.apdisk

View File

@ -45,7 +45,7 @@ def natural_key(string_):
class Book(object):
DefaultDevice = 'Kindle Paperwhite'
DefaultDevice = 'Kindle Paperwhite 3/Voyage/Oasis'
DefaultOutputFormat = 'CBZ only'
DefaultOverwrite = True
DefaultImageFlags = ImageFlags.Orient | ImageFlags.Resize | ImageFlags.Quantize

View File

@ -78,16 +78,17 @@ class KindleData:
Profiles = {
'Kindle 1': ((600, 800), Palette4),
'Kindle 2': ((600, 800), Palette15a),
'Kindle 3': ((600, 800), Palette15a),
'Kindle 4': ((600, 800), Palette15b),
'Kindle 5': ((600, 800), Palette15b),
'Kindle DX': ((824, 1200), Palette15a),
'Kindle DXG': ((824, 1200), Palette15a),
'Kindle Touch': ((600, 800), Palette15a),
'Kindle Paperwhite': ((758, 1024), Palette15b), # resolution given in manual, see http://kindle.s3.amazonaws.com/Kindle_Paperwhite_Users_Guide.pdf
'Kindle Paperwhite 3': ((1072, 1448), Palette15b),
'KoBo Aura H2o': ((1080, 1430), Palette15a), # resolution from http://www.fnac.com/Liseuse-Numerique-Kobo-by-Fnac-Kobo-Aura-H2O-Noir/a7745120/w-4
'Kindle 2/3/Touch': ((600, 800), Palette15a),
'Kindle 4 & 5': ((600, 800), Palette15b),
'Kindle DX/DXG': ((824, 1200), Palette15a),
'Kindle Paperwhite 1 & 2': ((758, 1024), Palette15b),
'Kindle Paperwhite 3/Voyage/Oasis': ((1072, 1448), Palette15b),
'Kobo Mini/Touch': ((600, 800), Palette15b),
'Kobo Glo': ((768, 1024), Palette15b),
'Kobo Glo HD': ((1072, 1448), Palette15b),
'Kobo Aura': ((758, 1024), Palette15b),
'Kobo Aura HD': ((1080, 1440), Palette15b),
'Kobo Aura H2O': ((1080, 1430), Palette15a),
}

View File

@ -63,52 +63,57 @@
</item>
<item>
<property name="text">
<string>Kindle 2</string>
<string>Kindle 2/3/Touch</string>
</property>
</item>
<item>
<property name="text">
<string>Kindle 3</string>
<string>Kindle 4 &amp; 5</string>
</property>
</item>
<item>
<property name="text">
<string>Kindle 4</string>
<string>Kindle DX/DXG</string>
</property>
</item>
<item>
<property name="text">
<string>Kindle 5</string>
<string>Kindle Paperwhite 1 &amp; 2</string>
</property>
</item>
<item>
<property name="text">
<string>Kindle DX</string>
<string>Kindle Paperwhite 3/Voyage/Oasis</string>
</property>
</item>
<item>
<property name="text">
<string>Kindle DXG</string>
<string>Kobo Mini/Touch</string>
</property>
</item>
<item>
<property name="text">
<string>Kindle Touch</string>
<string>Kobo Glo</string>
</property>
</item>
<item>
<property name="text">
<string>Kindle Paperwhite</string>
<string>Kobo Glo HD</string>
</property>
</item>
<item>
<property name="text">
<string>Kindle Paperwhite 3</string>
<string>Kobo Aura</string>
</property>
</item>
<item>
<property name="text">
<string>KoBo Aura H2o</string>
<string>Kobo Aura HD</string>
</property>
</item>
<item>
<property name="text">
<string>Kobo Aura H2O</string>
</property>
</item>
</widget>