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 setup.py --clean-all

Browse Source
This commit is contained in:
Kovid Goyal 2009-12-12 10:53:10 -07:00
parent f55b74bae4
commit 658bdb36cc
6 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
setup/extensions.py
View File

@ -375,9 +375,9 @@ class Build(Command):
for x in (dest, dest+'.manifest'): for x in (dest, dest+'.manifest'):
if os.path.exists(x): if os.path.exists(x):
os.remove(x) os.remove(x)
shutil.rmtree(self.j(self.d(self.SRC), 'build')) build_dir = self.j(self.d(self.SRC), 'build')
if os.path.exists(build_dir):
shutil.rmtree(build_dir)
class BuildPDF2XML(Command): class BuildPDF2XML(Command):

2
setup/installer/__init__.py
View File

@ -126,5 +126,5 @@ class VMInstaller(Command):
def clean(self): def clean(self):
installer = self.installer() installer = self.installer()
if os.patyh.exists(installer): if os.path.exists(installer):
os.remove(installer) os.remove(installer)

2
src/calibre/ebooks/pdb/ereader/reader132.py
View File

@ -15,7 +15,6 @@ import zlib
from calibre import CurrentDir from calibre import CurrentDir
from calibre.ebooks import DRMError from calibre.ebooks import DRMError
from calibre.ebooks.compression.palmdoc import decompress_doc
from calibre.ebooks.metadata.opf2 import OPFCreator from calibre.ebooks.metadata.opf2 import OPFCreator
from calibre.ebooks.pdb.ereader import EreaderError from calibre.ebooks.pdb.ereader import EreaderError
from calibre.ebooks.pdb.formatreader import FormatReader from calibre.ebooks.pdb.formatreader import FormatReader
@ -79,6 +78,7 @@ class Reader132(FormatReader):
def decompress_text(self, number): def decompress_text(self, number):
if self.header_record.compression == 2: if self.header_record.compression == 2:
from calibre.ebooks.compression.palmdoc import decompress_doc
return decompress_doc(self.section_data(number)).decode('cp1252' if self.encoding is None else self.encoding, 'replace') return decompress_doc(self.section_data(number)).decode('cp1252' if self.encoding is None else self.encoding, 'replace')
if self.header_record.compression == 10: if self.header_record.compression == 10:
return zlib.decompress(self.section_data(number)).decode('cp1252' if self.encoding is None else self.encoding, 'replace') return zlib.decompress(self.section_data(number)).decode('cp1252' if self.encoding is None else self.encoding, 'replace')

4
src/calibre/ebooks/pdb/ereader/reader202.py
View File

@ -12,7 +12,6 @@ import struct
from calibre import CurrentDir from calibre import CurrentDir
from calibre.ebooks.metadata.opf2 import OPFCreator from calibre.ebooks.metadata.opf2 import OPFCreator
from calibre.ebooks.compression.palmdoc import decompress_doc
from calibre.ebooks.pdb.formatreader import FormatReader from calibre.ebooks.pdb.formatreader import FormatReader
from calibre.ebooks.pdb.ereader import EreaderError from calibre.ebooks.pdb.ereader import EreaderError
@ -55,7 +54,8 @@ class Reader202(FormatReader):
return self.sections[number] return self.sections[number]
def decompress_text(self, number): def decompress_text(self, number):
return decompress_doc(''.join([chr(ord(x) ^ 0xA5) for x in self.section_data(number)])).decode('cp1252' if self.encoding is None else self.encoding, 'replace') from calibre.ebooks.compression.palmdoc import decompress_doc
return decompress_doc(''.join([chr(ord(x) ^ 0xA5) for x in self.section_data(number)])).decode('cp1252' if self.encoding is None else self.encoding, 'replace')
def get_image(self, number): def get_image(self, number):
name = None name = None

2
src/calibre/ebooks/pdb/palmdoc/reader.py
View File

@ -11,7 +11,6 @@ __docformat__ = 'restructuredtext en'
import os import os
import struct import struct
from calibre.ebooks.compression.palmdoc import decompress_doc
from calibre.ebooks.pdb.formatreader import FormatReader from calibre.ebooks.pdb.formatreader import FormatReader
from calibre.ebooks.txt.processor import convert_basic, opf_writer, \ from calibre.ebooks.txt.processor import convert_basic, opf_writer, \
separate_paragraphs_single_line, separate_paragraphs_print_formatted separate_paragraphs_single_line, separate_paragraphs_print_formatted
@ -51,6 +50,7 @@ class Reader(FormatReader):
if self.header_record.compression == 1: if self.header_record.compression == 1:
return self.section_data(number).decode('cp1252' if self.encoding is None else self.encoding) return self.section_data(number).decode('cp1252' if self.encoding is None else self.encoding)
if self.header_record.compression == 2: if self.header_record.compression == 2:
from calibre.ebooks.compression.palmdoc import decompress_doc
return decompress_doc(self.section_data(number)).decode('cp1252' if self.encoding is None else self.encoding, 'replace') return decompress_doc(self.section_data(number)).decode('cp1252' if self.encoding is None else self.encoding, 'replace')
return '' return ''

3
src/calibre/ebooks/pdb/palmdoc/writer.py
View File

@ -10,7 +10,6 @@ __docformat__ = 'restructuredtext en'
import struct import struct
from calibre.ebooks.compression.palmdoc import compress_doc
from calibre.ebooks.pdb.formatwriter import FormatWriter from calibre.ebooks.pdb.formatwriter import FormatWriter
from calibre.ebooks.pdb.header import PdbHeaderBuilder from calibre.ebooks.pdb.header import PdbHeaderBuilder
from calibre.ebooks.txt.txtml import TXTMLizer from calibre.ebooks.txt.txtml import TXTMLizer
@ -25,6 +24,8 @@ class Writer(FormatWriter):
self.log = log self.log = log
def write_content(self, oeb_book, out_stream, metadata=None): def write_content(self, oeb_book, out_stream, metadata=None):
from calibre.ebooks.compression.palmdoc import compress_doc
title = self.opts.title if self.opts.title else oeb_book.metadata.title[0].value if oeb_book.metadata.title != [] else _('Unknown') title = self.opts.title if self.opts.title else oeb_book.metadata.title[0].value if oeb_book.metadata.title != [] else _('Unknown')
txt_records, txt_length = self._generate_text(oeb_book) txt_records, txt_length = self._generate_text(oeb_book)