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

Merge from trunk

Browse Source
This commit is contained in:
Charles Haley 2010-09-12 20:55:09 +01:00
commit 9defefd7b2
1 changed files with 22 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/calibre/ebooks/metadata/book/json_codec.py
View File

@ -12,23 +12,18 @@ from calibre.ebooks.metadata.book import SERIALIZABLE_FIELDS
from calibre.constants import filesystem_encoding, preferred_encoding from calibre.constants import filesystem_encoding, preferred_encoding
from calibre.library.field_metadata import FieldMetadata from calibre.library.field_metadata import FieldMetadata
from calibre.utils.date import parse_date, isoformat, UNDEFINED_DATE from calibre.utils.date import parse_date, isoformat, UNDEFINED_DATE
from calibre import isbytestring
# Translate datetimes to and from strings. The string form is the datetime in # Translate datetimes to and from strings. The string form is the datetime in
# UTC. The returned date is also UTC # UTC. The returned date is also UTC
def string_to_datetime(src): def string_to_datetime(src):
if src == "None": if src == "None":
return None return None
# dt = strptime(src, '%d %m %Y %H:%M:%S', assume_utc=True, as_utc=True)
# if dt == UNDEFINED_DATE:
# return None
return parse_date(src) return parse_date(src)
def datetime_to_string(dateval): def datetime_to_string(dateval):
if dateval is None or dateval == UNDEFINED_DATE: if dateval is None or dateval == UNDEFINED_DATE:
return "None" return "None"
# tt = date_to_utc(dateval).timetuple()
# res = "%02d %02d %04d %02d:%02d:%02d"%(tt.tm_mday, tt.tm_mon, tt.tm_year,
# tt.tm_hour, tt.tm_min, tt.tm_sec)
return isoformat(dateval) return isoformat(dateval)
def encode_thumbnail(thumbnail): def encode_thumbnail(thumbnail):
@ -47,6 +42,24 @@ def decode_thumbnail(tup):
return None return None
return (tup[0], tup[1], b64decode(tup[2])) return (tup[0], tup[1], b64decode(tup[2]))
def object_to_unicode(obj, enc=preferred_encoding):
def dec(x):
return x.decode(enc, 'replace')
if isbytestring(obj):
return dec(obj)
if isinstance(obj, (list, tuple)):
return [dec(x) if isbytestring(x) else x for x in obj]
if isinstance(obj, dict):
ans = {}
for k, v in obj.items():
k = object_to_unicode(k)
v = object_to_unicode(v)
ans[k] = v
return ans
return obj
class JsonCodec(object): class JsonCodec(object):
def __init__(self): def __init__(self):
@ -81,16 +94,13 @@ class JsonCodec(object):
value = book.get(key) value = book.get(key)
if key == 'thumbnail': if key == 'thumbnail':
return encode_thumbnail(value) return encode_thumbnail(value)
elif isinstance(value, str): # str includes bytes elif isbytestring(value): # str includes bytes
enc = filesystem_encoding if key == 'lpath' else preferred_encoding enc = filesystem_encoding if key == 'lpath' else preferred_encoding
return value.decode(enc, 'replace') return object_to_unicode(value, enc=enc)
elif isinstance(value, (list, tuple)):
return [x.decode(preferred_encoding, 'replace') if
isinstance(x, str) else x for x in value]
elif datatype == 'datetime': elif datatype == 'datetime':
return datetime_to_string(value) return datetime_to_string(value)
else: else:
return value return object_to_unicode(value)
def decode_from_file(self, file, booklist, book_class, prefix): def decode_from_file(self, file, booklist, book_class, prefix):
js = [] js = []
@ -108,7 +118,6 @@ class JsonCodec(object):
except: except:
print 'exception during JSON decoding' print 'exception during JSON decoding'
traceback.print_exc() traceback.print_exc()
booklist = []
def decode_metadata(self, key, value): def decode_metadata(self, key, value):
if key == 'user_metadata': if key == 'user_metadata':