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

remove redundant txt metadata code.

Browse Source
This commit is contained in:
John Schember 2009-05-08 07:20:14 -04:00
parent b63bb79709
commit 88a5527dac
4 changed files with 6 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -11,7 +11,7 @@ __docformat__ = 'restructuredtext en'
import struct import struct
from calibre.ebooks.pdb.formatwriter import FormatWriter from calibre.ebooks.pdb.formatwriter import FormatWriter
from calibre.ebooks.txt.writer import TxtWriter, TxtNewlines, TxtMetadata from calibre.ebooks.txt.writer import TxtWriter, TxtNewlines
from calibre.ebooks.mobi.palmdoc import compress_doc from calibre.ebooks.mobi.palmdoc import compress_doc
from calibre.ebooks.pdb.header import PdbHeaderBuilder from calibre.ebooks.pdb.header import PdbHeaderBuilder
@ -45,7 +45,7 @@ class Writer(FormatWriter):
def _generate_text(self, spine): def _generate_text(self, spine):
txt_writer = TxtWriter(TxtNewlines('system').newline, self.log) txt_writer = TxtWriter(TxtNewlines('system').newline, self.log)
txt = txt_writer.dump(spine, TxtMetadata()) txt = txt_writer.dump(spine)
txt_length = len(txt) txt_length = len(txt)

4
src/calibre/ebooks/pdb/ztxt/writer.py
View File

@ -11,7 +11,7 @@ __docformat__ = 'restructuredtext en'
import struct, zlib import struct, zlib
from calibre.ebooks.pdb.formatwriter import FormatWriter from calibre.ebooks.pdb.formatwriter import FormatWriter
from calibre.ebooks.txt.writer import TxtWriter, TxtNewlines, TxtMetadata from calibre.ebooks.txt.writer import TxtWriter, TxtNewlines
from calibre.ebooks.pdb.header import PdbHeaderBuilder from calibre.ebooks.pdb.header import PdbHeaderBuilder
MAX_RECORD_SIZE = 8192 MAX_RECORD_SIZE = 8192
@ -50,7 +50,7 @@ class Writer(FormatWriter):
def _generate_text(self, spine): def _generate_text(self, spine):
txt_writer = TxtWriter(TxtNewlines('system').newline, self.log) txt_writer = TxtWriter(TxtNewlines('system').newline, self.log)
txt = txt_writer.dump(spine, TxtMetadata()) txt = txt_writer.dump(spine)
txt_length = len(txt) txt_length = len(txt)

7
src/calibre/ebooks/txt/output.py
View File

@ -28,13 +28,8 @@ class TXTOutput(OutputFormatPlugin):
]) ])
def convert(self, oeb_book, output_path, input_plugin, opts, log): def convert(self, oeb_book, output_path, input_plugin, opts, log):
metadata = TxtMetadata()
if opts.insert_metadata:
metadata.author = opts.authors if opts.authors else authors_to_string([x.value for x in oeb_book.metadata.creator]) if oeb_book.metadata.creator != [] else _('Unknown')
metadata.title = opts.title if opts.title else oeb_book.metadata.title[0].value if oeb_book.metadata.title != [] else _('Unknown')
writer = TxtWriter(TxtNewlines(opts.newline).newline, log) writer = TxtWriter(TxtNewlines(opts.newline).newline, log)
txt = writer.dump(oeb_book.spine, metadata) txt = writer.dump(oeb_book.spine)
close = False close = False
if not hasattr(output_path, 'write'): if not hasattr(output_path, 'write'):

13
src/calibre/ebooks/txt/writer.py
View File

@ -19,7 +19,7 @@ class TxtWriter(object):
self.newline = newline self.newline = newline
self.log = log self.log = log
def dump(self, spine, metadata): def dump(self, spine):
out = u'' out = u''
for item in spine: for item in spine:
content = unicode(item) content = unicode(item)
@ -32,12 +32,6 @@ class TxtWriter(object):
content = self.specified_newlines(content) content = self.specified_newlines(content)
out += content out += content
# Prepend metadata
if metadata.author != None and metadata.author != '':
if metadata.title != None and metadata.title != '':
out = (u'%s%s%s%s' % (metadata.author.upper(), self.newline, self.newline, self.newline)) + out
out = (u'%s%s%s%s' % (metadata.title.upper(), self.newline, self.newline, self.newline)) + out
# Put two blank lines at end of file # Put two blank lines at end of file
end = out[-3 * len(self.newline):] end = out[-3 * len(self.newline):]
for i in range(3 - end.count(self.newline)): for i in range(3 - end.count(self.newline)):
@ -145,8 +139,3 @@ class TxtNewlines(object):
def __init__(self, newline_type): def __init__(self, newline_type):
self.newline = self.NEWLINE_TYPES.get(newline_type.lower(), os.linesep) self.newline = self.NEWLINE_TYPES.get(newline_type.lower(), os.linesep)
class TxtMetadata(object):
def __init__(self):
self.title = None
self.author = None