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

Fix 0 case in rtf cp + case when there is no pictures in a file

Browse Source
This commit is contained in:
Sengian 2011-01-10 21:27:45 +01:00
parent 5873c1e35a
commit 6e831360a2
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/calibre/ebooks/rtf2xml/default_encoding.py
View File

@ -101,7 +101,7 @@ class DefaultEncoding:
break break
if self.__token_info == 'cw<ri<ansi-codpg': if self.__token_info == 'cw<ri<ansi-codpg':
#cw<ri<ansi-codpg<nu<10000 #cw<ri<ansi-codpg<nu<10000
self.__code_page = line[20:-1] if line[20:-1] \ self.__code_page = line[20:-1] if int(line[20:-1]) \
else '1252' else '1252'
if self.__token_info == 'cw<ri<macintosh_': if self.__token_info == 'cw<ri<macintosh_':
self.__platform = 'Macintosh' self.__platform = 'Macintosh'
@ -120,7 +120,9 @@ class DefaultEncoding:
fenccp = re.compile(r'\\ansicpg(\d+)[\\ \{\}\t\n]+') fenccp = re.compile(r'\\ansicpg(\d+)[\\ \{\}\t\n]+')
for line in read_obj: for line in read_obj:
if fenccp.search(line): if fenccp.search(line):
self.__code_page = fenccp.search(line).group(1) cp = fenccp.search(line).group(1)
if not int(cp):
self.__code_page = cp
break break
if fenc.search(line): if fenc.search(line):
enc = fenc.search(line).group(1) enc = fenc.search(line).group(1)

3
src/calibre/ebooks/rtf2xml/pict.py
View File

@ -168,7 +168,10 @@ class Pict:
copy_obj = copy.Copy(bug_handler = self.__bug_handler) copy_obj = copy.Copy(bug_handler = self.__bug_handler)
if self.__copy: if self.__copy:
copy_obj.copy_file(self.__write_to, "pict.data") copy_obj.copy_file(self.__write_to, "pict.data")
try:
copy_obj.copy_file(self.__pict_file, "pict.rtf") copy_obj.copy_file(self.__pict_file, "pict.rtf")
except:
pass
copy_obj.rename(self.__write_to, self.__file) copy_obj.rename(self.__write_to, self.__file)
os.remove(self.__write_to) os.remove(self.__write_to)
if self.__pict_count == 0: if self.__pict_count == 0: