Finish implementing quick_tag with simple results
This commit is contained in:
Timmy Welch
parent
2cbbaa0d65
commit
a9630ac31e
35
cmd/hash.py
35
cmd/hash.py
@ -1,11 +1,19 @@
|
||||
from typing import Collection, Sequence
|
||||
from __future__ import annotations
|
||||
|
||||
import argparse
|
||||
import pathlib
|
||||
import sys
|
||||
from typing import Collection
|
||||
from typing import Sequence
|
||||
|
||||
import imagehash
|
||||
import numpy
|
||||
from PIL import Image
|
||||
import argparse,pathlib,numpy,imagehash,sys
|
||||
|
||||
ap = argparse.ArgumentParser()
|
||||
|
||||
ap.add_argument("--file", type=pathlib.Path)
|
||||
ap.add_argument("--debug", action='store_true')
|
||||
ap.add_argument('--file', type=pathlib.Path)
|
||||
ap.add_argument('--debug', action='store_true')
|
||||
|
||||
opts = ap.parse_args()
|
||||
opts.file = pathlib.Path(opts.file)
|
||||
@ -33,28 +41,29 @@ def print_image(image: Image.Image) -> None:
|
||||
print(f'{int(i):03d}, ', end='', file=sys.stderr)
|
||||
print(']', file=sys.stderr)
|
||||
|
||||
|
||||
def bin_str(hash):
|
||||
return ''.join(str(b) for b in 1 * hash.hash.flatten())
|
||||
|
||||
|
||||
if opts.debug:
|
||||
image.save("py.rgb.png")
|
||||
print("rgb", file=sys.stderr)
|
||||
image.save('py.rgb.png')
|
||||
print('rgb', file=sys.stderr)
|
||||
print_image(image)
|
||||
print(file=sys.stderr)
|
||||
|
||||
if opts.debug:
|
||||
gray.save("py.gray.png")
|
||||
print("gray", file=sys.stderr)
|
||||
gray.save('py.gray.png')
|
||||
print('gray', file=sys.stderr)
|
||||
print_image(gray)
|
||||
print(file=sys.stderr)
|
||||
|
||||
if opts.debug:
|
||||
resized.save("py.resized.png")
|
||||
print("resized", file=sys.stderr)
|
||||
resized.save('py.resized.png')
|
||||
print('resized', file=sys.stderr)
|
||||
print_image(resized)
|
||||
print(file=sys.stderr)
|
||||
|
||||
print('ahash: ', bin_str(imagehash.average_hash(image)))
|
||||
print('dhash: ', bin_str(imagehash.dhash(image)))
|
||||
print('phash: ', bin_str(imagehash.phash(image)))
|
||||
print('ahash: ', str(imagehash.average_hash(image)))
|
||||
print('dhash: ', str(imagehash.dhash(image)))
|
||||
print('phash: ', str(imagehash.phash(image)))
|
||||
|
||||
167
cmd/quick_tag.py
167
cmd/quick_tag.py
@ -1,46 +1,76 @@
|
||||
from __future__ import annotations
|
||||
|
||||
import argparse
|
||||
import itertools
|
||||
import logging
|
||||
import pathlib
|
||||
from datetime import datetime
|
||||
from io import BytesIO
|
||||
from typing import TypedDict
|
||||
from urllib.parse import urljoin
|
||||
from PIL import Image
|
||||
|
||||
import appdirs
|
||||
from comicapi.genericmetadata import GenericMetadata
|
||||
import pathlib, imagehash, requests
|
||||
import settngs, comictaggerlib.cli
|
||||
from io import BytesIO
|
||||
from comicapi import comicarchive, merge
|
||||
|
||||
from datetime import datetime
|
||||
|
||||
import comictaggerlib.cli
|
||||
import imagehash
|
||||
import requests
|
||||
import settngs
|
||||
from comicapi import comicarchive
|
||||
from comicapi import merge
|
||||
from comicapi import utils
|
||||
from comicapi.genericmetadata import GenericMetadata
|
||||
from comictaggerlib import ctversion
|
||||
from comictaggerlib.cbltransformer import CBLTransformer
|
||||
from comictaggerlib.ctsettings.settngs_namespace import SettngsNS
|
||||
from comicapi.issuestring import IssueString
|
||||
from comictalker.talker_utils import cleanup_html
|
||||
from PIL import Image
|
||||
|
||||
logger = logging.getLogger("quick_tag")
|
||||
logger = logging.getLogger('quick_tag')
|
||||
|
||||
__version__ = '0.1'
|
||||
|
||||
|
||||
class SimpleResult(TypedDict):
|
||||
Distance: int
|
||||
IDList: dict[str, list[str]] # Mapping of domains (eg comicvine.gamespot.com) to IDs
|
||||
# Mapping of domains (eg comicvine.gamespot.com) to IDs
|
||||
IDList: dict[str, list[str]]
|
||||
|
||||
|
||||
def settings(manager: settngs.Manager):
|
||||
manager.add_setting("--url", '-u', default='https://comic-hasher.narnian.us', type=utils.parse_url, help='Website to use for searching cover hashes')
|
||||
manager.add_setting("--max","-m", default=8, type=int, help='Maximum score to allow. Lower score means more accurate')
|
||||
manager.add_setting("--simple", "-s", default=True, action=argparse.BooleanOptionalAction, help='Whether to retrieve simple results or full results')
|
||||
manager.add_setting("--force-interactive", "-f", default=True, action=argparse.BooleanOptionalAction, help='When not set will automatically tag comics that have a single match with a score of 4 or lower')
|
||||
manager.add_setting("--cv-api-key", "-c")
|
||||
manager.add_setting("comic_archive", type=pathlib.Path)
|
||||
manager.add_setting(
|
||||
'--url', '-u', default='https://comic-hasher.narnian.us',
|
||||
type=utils.parse_url, help='Website to use for searching cover hashes',
|
||||
)
|
||||
manager.add_setting(
|
||||
'--max', '-m', default=8, type=int,
|
||||
help='Maximum score to allow. Lower score means more accurate',
|
||||
)
|
||||
manager.add_setting(
|
||||
'--simple', '-s', default=True, action=argparse.BooleanOptionalAction,
|
||||
help='Whether to retrieve simple results or full results',
|
||||
)
|
||||
manager.add_setting(
|
||||
'--force-interactive', '-f', default=True, action=argparse.BooleanOptionalAction,
|
||||
help='When not set will automatically tag comics that have a single match with a score of 4 or lower',
|
||||
)
|
||||
manager.add_setting(
|
||||
'--aggressive-filtering', '-a', default=False, action=argparse.BooleanOptionalAction,
|
||||
help='Will filter out worse matches if better matches are found',
|
||||
)
|
||||
manager.add_setting('--cv-api-key', '-c')
|
||||
manager.add_setting('comic_archive', type=pathlib.Path)
|
||||
|
||||
|
||||
def SearchHashes(url: str, simple: bool, max: int, ahash: str, dhash: str, phash: str) -> list[SimpleResult]:
|
||||
resp = requests.get(urljoin(url, '/match_cover_hash'), {"simple": simple, "max": max, "ahash":ahash, "dhash": dhash, "phash": phash})
|
||||
resp = requests.get(
|
||||
urljoin(url, '/match_cover_hash'),
|
||||
{
|
||||
'simple': simple,
|
||||
'max': max,
|
||||
'ahash': ahash,
|
||||
'dhash': dhash,
|
||||
'phash': phash,
|
||||
},
|
||||
)
|
||||
if resp.status_code != 200:
|
||||
logger.error("bad response from server: %s", resp.text)
|
||||
logger.error('bad response from server: %s', resp.text)
|
||||
raise SystemExit(3)
|
||||
return resp.json()
|
||||
|
||||
@ -50,21 +80,61 @@ def get_simple_results(results: list[SimpleResult], cv_api_key: str | None = Non
|
||||
cache_dir = pathlib.Path(appdirs.user_cache_dir('quick_tag'))
|
||||
cache_dir.mkdir(parents=True, exist_ok=True)
|
||||
cv = ComicVineTalker(f"quick_tag/{__version__}", cache_dir)
|
||||
cv.parse_settings({"comicvine_key": cv_api_key})
|
||||
cv.parse_settings({
|
||||
'comicvine_key': cv_api_key,
|
||||
'cv_use_series_start_as_volume': True,
|
||||
})
|
||||
md_results: list[tuple[int, GenericMetadata]] = []
|
||||
results.sort(key=lambda r: r['Distance'])
|
||||
for result in results:
|
||||
for cv_id in result['IDList']['comicvine.gamespot.com']:
|
||||
md_results.append((result['Distance'], cv.fetch_comic_data(issue_id=cv_id)))
|
||||
for md in cv.fetch_comics(issue_ids=result['IDList']['comicvine.gamespot.com']):
|
||||
md_results.append((result['Distance'], md))
|
||||
return md_results
|
||||
|
||||
|
||||
def display_simple_results(md_results: list[tuple[int, GenericMetadata]], force_interactive=True) -> GenericMetadata:
|
||||
if len(md_results) == 1 and md_results[0][0] <= 4 and not force_interactive:
|
||||
def filter_simple_results(results: list[SimpleResult], force_interactive=True, aggressive_filtering=False) -> list[SimpleResult]:
|
||||
if not force_interactive:
|
||||
exact = [r for r in results if r['Distance'] == 0]
|
||||
if len(exact) == 1:
|
||||
return exact
|
||||
if len(results) > 4:
|
||||
dist: list[tuple[int, list[SimpleResult]]] = []
|
||||
filtered_results: list[SimpleResult] = []
|
||||
for distance, group in itertools.groupby(results, key=lambda r: r['Distance']):
|
||||
dist.append((distance, list(group)))
|
||||
if aggressive_filtering and dist[0][0] < 6:
|
||||
for _, res in dist[:1]:
|
||||
filtered_results.extend(res)
|
||||
|
||||
return filtered_results
|
||||
|
||||
return results
|
||||
|
||||
|
||||
def display_simple_results(md_results: list[tuple[int, GenericMetadata]], ca: comictaggerlib.cli.ComicArchive, force_interactive=True) -> GenericMetadata:
|
||||
filename_md = ca.metadata_from_filename(utils.Parser.COMICFN2DICT)
|
||||
if len(md_results) < 1:
|
||||
logger.warning('No results found for comic')
|
||||
raise SystemExit(4)
|
||||
if not force_interactive:
|
||||
if len(md_results) == 1 and md_results[0][0] <= 4:
|
||||
return md_results[0][1]
|
||||
series_match = []
|
||||
for score, md in md_results:
|
||||
if (
|
||||
score < 10
|
||||
and filename_md.series
|
||||
and md.series
|
||||
and utils.titles_match(filename_md.series, md.series)
|
||||
and IssueString(filename_md.issue).as_string() == IssueString(md.issue).as_string()
|
||||
):
|
||||
series_match.append(md)
|
||||
if len(series_match) == 1:
|
||||
return series_match[0]
|
||||
for counter, r in enumerate(md_results, 1):
|
||||
print(
|
||||
" {}. {} #{} [{}] ({}/{}) - {} score: {}".format(
|
||||
' {}. {} #{} [{}] ({}/{}) - {} score: {}'.format(
|
||||
counter,
|
||||
r[1].series,
|
||||
r[1].issue,
|
||||
@ -72,22 +142,22 @@ def display_simple_results(md_results: list[tuple[int, GenericMetadata]], force_
|
||||
r[1].month,
|
||||
r[1].year,
|
||||
r[1].title,
|
||||
r[0]
|
||||
r[0],
|
||||
),
|
||||
)
|
||||
while True:
|
||||
i = input(f'Please select a result to tag the comic with or "q" to quit: [1-{len(md_results)}] ').casefold()
|
||||
i = input(
|
||||
f'Please select a result to tag the comic with or "q" to quit: [1-{len(md_results)}] ',
|
||||
).casefold()
|
||||
if (i.isdigit() and int(i) in range(1, len(md_results) + 1)):
|
||||
break
|
||||
if i == 'q':
|
||||
logger.warning("User quit without saving metadata")
|
||||
logger.warning('User quit without saving metadata')
|
||||
raise SystemExit(4)
|
||||
|
||||
return md_results[int(i) - 1][1]
|
||||
|
||||
|
||||
|
||||
|
||||
def prepare_metadata(md: GenericMetadata, new_md: GenericMetadata, clear_tags: bool, auto_imprint: bool, remove_html_tables: bool) -> GenericMetadata:
|
||||
|
||||
final_md = md.copy()
|
||||
@ -96,11 +166,11 @@ def prepare_metadata(md: GenericMetadata, new_md: GenericMetadata, clear_tags: b
|
||||
|
||||
final_md.overlay(new_md, merge.Mode.OVERLAY, True)
|
||||
|
||||
issue_id = ""
|
||||
issue_id = ''
|
||||
if final_md.issue_id:
|
||||
issue_id = f" [Issue ID {final_md.issue_id}]"
|
||||
|
||||
origin = ""
|
||||
origin = ''
|
||||
if final_md.data_origin is not None:
|
||||
origin = f" using info from {final_md.data_origin.name}"
|
||||
notes = f"Tagged with quick_tag {__version__}{origin} on {datetime.now():%Y-%m-%d %H:%M:%S}.{issue_id}"
|
||||
@ -110,23 +180,25 @@ def prepare_metadata(md: GenericMetadata, new_md: GenericMetadata, clear_tags: b
|
||||
|
||||
return final_md.replace(
|
||||
is_empty=False,
|
||||
notes=utils.combine_notes(final_md.notes, notes, "Tagged with quick_tag"),
|
||||
description=cleanup_html(final_md.description, remove_html_tables) or None,
|
||||
notes=utils.combine_notes(final_md.notes, notes, 'Tagged with quick_tag'),
|
||||
description=cleanup_html(final_md.description, remove_html_tables),
|
||||
)
|
||||
|
||||
|
||||
def main():
|
||||
manager = settngs.Manager('Simple comictagging script using ImageHash: https://pypi.org/project/ImageHash/')
|
||||
manager.add_group("runtime", settings)
|
||||
manager.add_group('runtime', settings)
|
||||
opts, _ = manager.parse_cmdline()
|
||||
url: utils.Url = opts['runtime']['url']
|
||||
print(url)
|
||||
max_hamming_distance: int = opts['runtime']['max']
|
||||
simple: bool = opts['runtime']['simple']
|
||||
if not simple:
|
||||
logger.error("Full results not implemented yet")
|
||||
logger.error('Full results not implemented yet')
|
||||
raise SystemExit(1)
|
||||
ca = comicarchive.ComicArchive(opts['runtime']['comic_archive'])
|
||||
if not ca.seems_to_be_a_comic_archive():
|
||||
logger.error("Could not open %s as an archive", ca.path)
|
||||
logger.error('Could not open %s as an archive', ca.path)
|
||||
raise SystemExit(1)
|
||||
|
||||
try:
|
||||
@ -134,19 +206,23 @@ def main():
|
||||
cover_index = tags.get_cover_page_index_list()[0]
|
||||
cover_image = Image.open(BytesIO(ca.get_page(cover_index)))
|
||||
except Exception:
|
||||
logger.exception("Unable to read cover image from archive")
|
||||
logger.exception('Unable to read cover image from archive')
|
||||
raise SystemExit(2)
|
||||
print('Tagging: ', ca.path)
|
||||
|
||||
print("hashing cover")
|
||||
ahash = imagehash.average_hash(cover_image)
|
||||
dhash = imagehash.dhash(cover_image)
|
||||
phash = imagehash.phash(cover_image)
|
||||
|
||||
print("Searching hashes")
|
||||
results = SearchHashes(url.url, simple, max_hamming_distance, str(ahash), str(dhash), str(phash))
|
||||
print(results)
|
||||
|
||||
print("Retrieving ComicVine data")
|
||||
if simple:
|
||||
metadata_results = get_simple_results(results, opts['runtime']['cv_api_key'])
|
||||
chosen_result = display_simple_results(metadata_results, opts['runtime']['force_interactive'])
|
||||
filtered_results = filter_simple_results(results, opts['runtime']['force_interactive'], opts['runtime']['aggressive_filtering'])
|
||||
metadata_results = get_simple_results(filtered_results, opts['runtime']['cv_api_key'])
|
||||
chosen_result = display_simple_results(metadata_results, ca, opts['runtime']['force_interactive'])
|
||||
else:
|
||||
metadata_results = get_full_results(results)
|
||||
chosen_result = display_full_results(metadata_results)
|
||||
@ -154,10 +230,9 @@ def main():
|
||||
if ca.write_tags(prepare_metadata(GenericMetadata(), chosen_result, clear_tags=False, auto_imprint=True, remove_html_tables=True), 'cr'):
|
||||
print(f'successfully saved metadata to {ca.path}')
|
||||
raise SystemExit(0)
|
||||
logger.error("Failed to save metadata to %s", ca.path)
|
||||
logger.error('Failed to save metadata to %s', ca.path)
|
||||
raise SystemExit(2)
|
||||
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
if __name__ == '__main__':
|
||||
main()
|
||||
|
||||
Loading…
Reference in New Issue
Block a user