Advertisement
Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- *** eReader2html003.py 2009-08-05 20:22:19.000000000 -0400
- --- eReader2html003b.py 2009-08-05 20:32:48.000000000 -0400
- ***************
- *** 261,267 ****
- self.section_reader = section_reader
- data = section_reader(0)
- version, = struct.unpack('>H', data[0:2])
- ! if version != 272 and version != 260:
- raise ValueError('incorrect eReader version %d (error 1)' % version)
- data = section_reader(1)
- self.data = data
- --- 261,267 ----
- self.section_reader = section_reader
- data = section_reader(0)
- version, = struct.unpack('>H', data[0:2])
- ! if version != 272 and version != 260 and version != 259:
- raise ValueError('incorrect eReader version %d (error 1)' % version)
- data = section_reader(1)
- self.data = data
- ***************
- *** 296,302 ****
- print "Flags: 0x%X" % self.flags
- raise ValueError('incompatible eReader file')
- des = Des(fixKey(user_key))
- ! if version == 260:
- if drm_sub_version != 13:
- raise ValueError('incorrect eReader version %d (error 3)' % drm_sub_version)
- encrypted_key = r[44:44+8]
- --- 296,307 ----
- print "Flags: 0x%X" % self.flags
- raise ValueError('incompatible eReader file')
- des = Des(fixKey(user_key))
- ! if version == 259:
- ! if drm_sub_version != 7:
- ! raise ValueError('incorrect eReader version %d (error 3)' % drm_sub_version)
- ! encrypted_key_sha = r[44:44+20]
- ! encrypted_key = r[64:64+8]
- ! elif version == 260:
- if drm_sub_version != 13:
- raise ValueError('incorrect eReader version %d (error 3)' % drm_sub_version)
- encrypted_key = r[44:44+8]
- ***************
- *** 476,482 ****
- pml = PmlConverter(er.getText())
- file(os.path.join(outdir, 'book.html'),'wb').write(pml.process())
- ! print "eReader2Html v0.03. Copyright (c) 2008 The Dark Reverser"
- if len(sys.argv)!=5:
- print "Converts eReader books to HTML"
- print "Usage:"
- --- 481,490 ----
- pml = PmlConverter(er.getText())
- file(os.path.join(outdir, 'book.html'),'wb').write(pml.process())
- ! print "eReader2Html v0.03b, derived from:"
- ! print "\teReader2Html v0.03. Copyright (c) 2008 The Dark Reverser"
- ! print "with enhancement by DeBockle"
- !
- if len(sys.argv)!=5:
- print "Converts eReader books to HTML"
- print "Usage:"
- ***************
- *** 490,493 ****
- convertEreaderToHtml(infile, name, cc, outdir)
- print "done"
- except ValueError, e:
- ! print "Error: %s" % e
- \ No newline at end of file
- --- 498,501 ----
- convertEreaderToHtml(infile, name, cc, outdir)
- print "done"
- except ValueError, e:
- ! print "Error: %s" % e
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement