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

...

Browse Source
This commit is contained in:
Kovid Goyal 2011-04-05 11:52:52 -06:00
parent 8dd435ecdb
commit 4285654352
2 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/calibre/ebooks/metadata/sources/identify.py
View File

@ -208,7 +208,7 @@ def merge_identify_results(result_map, log):
# }}}
def identify(log, abort, title=None, authors=None, identifiers=[], timeout=30):
def identify(log, abort, title=None, authors=None, identifiers={}, timeout=30):
start_time = time.time()
plugins = list(metadata_plugins(['identify']))
@ -222,7 +222,7 @@ def identify(log, abort, title=None, authors=None, identifiers=[], timeout=30):
log('Running identify query with parameters:')
log(kwargs)
log('Using plugins:', ', '.join([p.name for p in plugins]))
log('The log (if any) from individual plugins is below')
log('The log from individual plugins is below')
workers = [Worker(p, kwargs, abort) for p in plugins]
for w in workers:
@ -273,7 +273,7 @@ def identify(log, abort, title=None, authors=None, identifiers=[], timeout=30):
for plugin, presults in results.iteritems():
presults.sort(key=plugin.identify_results_keygen(**sort_kwargs))
plog = logs[plugin].getvalue().strip()
log('\n'+'*'*35, plugin.name, '*'*35)
log('\n'+'*'*30, plugin.name, '*'*30)
log('Request extra headers:', plugin.browser.addheaders)
log('Found %d results'%len(presults))
if plog:
@ -324,10 +324,10 @@ if __name__ == '__main__': # tests {{{
),
( # This isbn not on amazon
{'identifiers':{'isbn': '8324616489'}, 'title':'Learning Python',
( # Test absence of identifiers
{'title':'Learning Python',
'authors':['Lutz']},
[title_test('Learning Python, 3rd Edition',
[title_test('Learning Python',
exact=True), authors_test(['Mark Lutz'])
]
@ -353,6 +353,7 @@ if __name__ == '__main__': # tests {{{
),
]
test_identify(tests[4:5])
#test_identify(tests[1:2])
test_identify(tests)
# }}}

8
src/calibre/ebooks/metadata/sources/test.py
View File

@ -69,6 +69,9 @@ def test_identify(tests): # {{{
times = []
for kwargs, test_funcs in tests:
log('#'*80)
log('### Running test with:', kwargs)
log('#'*80)
prints('Running test with:', kwargs)
args = (log, abort)
start_time = time.time()
@ -108,10 +111,11 @@ def test_identify(tests): # {{{
prints('Most relevant result failed the tests')
raise SystemExit(1)
log('\n\n')
prints('Average time per query', sum(times)/len(times))
if os.stat(lf).st_size > 10:
prints('There were some errors/warnings, see log', lf)
prints('Full log is at:', lf)
# }}}