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

linux install: make file blobs start as unicode and get encoded while writing

Browse Source 
Kovid wants to be cautious about future refactoring maybe trying to
modify them, and would prefer Things™ be unicode for flexibility when
using them, and only be bytes when actually write()'ing them.

See https://github.com/kovidgoyal/calibre/pull/1065#issuecomment-547893895
This commit is contained in:
Eli Schwartz 2019-10-30 10:34:50 -04:00
parent 1cbdabbbb7
commit 53f30d9b7f
No known key found for this signature in database
GPG Key ID: CEB167EFB5722BD6
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/calibre/linux.py
View File

@ -866,16 +866,16 @@ class PostInstall:
from calibre.ebooks.oeb.polish.main import SUPPORTED from calibre.ebooks.oeb.polish.main import SUPPORTED
from calibre.ebooks.oeb.polish.import_book import IMPORTABLE from calibre.ebooks.oeb.polish.import_book import IMPORTABLE
with open('calibre-lrfviewer.desktop', 'wb') as f: with open('calibre-lrfviewer.desktop', 'wb') as f:
f.write(VIEWER) f.write(VIEWER.encode('utf-8'))
with open('calibre-ebook-viewer.desktop', 'wb') as f: with open('calibre-ebook-viewer.desktop', 'wb') as f:
f.write(EVIEWER) f.write(EVIEWER.encode('utf-8'))
write_mimetypes(f) write_mimetypes(f)
with open('calibre-ebook-edit.desktop', 'wb') as f: with open('calibre-ebook-edit.desktop', 'wb') as f:
f.write(ETWEAK) f.write(ETWEAK.encode('utf-8'))
mt = {guess_type('a.' + x.lower())[0] for x in (SUPPORTED|IMPORTABLE)} - {None, 'application/octet-stream'} mt = {guess_type('a.' + x.lower())[0] for x in (SUPPORTED|IMPORTABLE)} - {None, 'application/octet-stream'}
f.write(('MimeType=%s;\n'%';'.join(mt)).encode('utf-8')) f.write(('MimeType=%s;\n'%';'.join(mt)).encode('utf-8'))
with open('calibre-gui.desktop', 'wb') as f: with open('calibre-gui.desktop', 'wb') as f:
f.write(GUI) f.write(GUI.encode('utf-8'))
write_mimetypes(f) write_mimetypes(f)
des = ('calibre-gui.desktop', 'calibre-lrfviewer.desktop', des = ('calibre-gui.desktop', 'calibre-lrfviewer.desktop',
'calibre-ebook-viewer.desktop', 'calibre-ebook-edit.desktop') 'calibre-ebook-viewer.desktop', 'calibre-ebook-edit.desktop')
@ -1029,7 +1029,7 @@ complete -o filenames -F _'''%dict(pics=spics,
opts=opts, extras=extras, exts=exts) + fname + ' ' + name +"\n\n").encode('utf-8') opts=opts, extras=extras, exts=exts) + fname + ' ' + name +"\n\n").encode('utf-8')
VIEWER = b'''\ VIEWER = '''\
[Desktop Entry] [Desktop Entry]
Version=1.0 Version=1.0
Type=Application Type=Application
@ -1043,7 +1043,7 @@ MimeType=application/x-sony-bbeb;
Categories=Graphics;Viewer; Categories=Graphics;Viewer;
''' '''
EVIEWER = b'''\ EVIEWER = '''\
[Desktop Entry] [Desktop Entry]
Version=1.0 Version=1.0
Type=Application Type=Application
@ -1056,7 +1056,7 @@ Icon=calibre-viewer
Categories=Graphics;Viewer; Categories=Graphics;Viewer;
''' '''
ETWEAK = b'''\ ETWEAK = '''\
[Desktop Entry] [Desktop Entry]
Version=1.0 Version=1.0
Type=Application Type=Application
@ -1069,7 +1069,7 @@ Icon=calibre-ebook-edit
Categories=Office; Categories=Office;
''' '''
GUI = b'''\ GUI = '''\
[Desktop Entry] [Desktop Entry]
Version=1.0 Version=1.0
Type=Application Type=Application