Closed stoduk closed 8 years ago
author_profile branch doesn't work, looks likely to be merge damage. I have a diff that fixes it, but worth @szarroug3 checking over in case more was broken.
anthony$ diff -C5 -r ~/Downloads/Downloads-April2015/X-Ray_Calibre_Plugin-dev-author_profile ../X-Ray_Calibre_Plugin-dev-author_profile/ Only in ../X-Ray_Calibre_Plugin-dev-author_profile/: calibre_restart.sh diff -C5 -r /Users/anthony/Downloads/Downloads-April2015/X-Ray_Calibre_Plugin-dev-author_profile/lib/book.py ../X-Ray_Calibre_Plugin-dev-author_profile/lib/book.py *** /Users/anthony/Downloads/Downloads-April2015/X-Ray_Calibre_Plugin-dev-author_profile/lib/book.py 2016-07-06 16:19:08.000000000 +0100 --- ../X-Ray_Calibre_Plugin-dev-author_profile/lib/book.py 2016-07-12 17:24:03.000000000 +0100 *************** *** 53,63 **** FMTS = ['mobi', 'azw3'] def __init__(self, db, book_id, goodreads_conn, amazon_conn, formats, send_to_device, create_xray, expand_aliases, send_author_profile): self._db = db self._book_id = book_id - self._gConnection = gConnection self._formats = formats self._send_to_device = send_to_device self._create_xray = create_xray self._send_author_profile= send_author_profile --- 53,62 ---- *************** *** 306,315 **** --- 305,315 ---- continue device_xray_files = glob(os.path.join(info['device_xray'], 'XRAY.entities.*_' + info['format'].lower() + '*.asc')) device_author_profile_files = glob(os.path.join(info['device_xray'], 'AuthorProfile.profile.*_' + info['format'].lower() + '*.asc')) if not overwrite: + if len(device_xray_files) > 0: info['send_status'] = self.SUCCESS info['status_message'] = 'Book already has x-ray.' send_xray = False if send_author_profile and len(device_author_profile_files) > 0: anthony$
I must've accidentally removed that line or something.. fixed
author_profile branch doesn't work, looks likely to be merge damage. I have a diff that fixes it, but worth @szarroug3 checking over in case more was broken.