diff --git a/cli/add.py b/cli/add.py index 77bcfcb..b1d59f4 100644 --- a/cli/add.py +++ b/cli/add.py @@ -12,7 +12,7 @@ from imgdb.log import log -async def main(): +def main(): parser = argparse.ArgumentParser(prog='ImageAdd') parser.add_argument('inputs', nargs='+') parser.add_argument('--dbname', default='imgdb.htm', help='DB file name') @@ -43,6 +43,10 @@ async def main(): parser.add_argument('--shuffle', action='store_true', help='randomize files before import') args = parser.parse_args() + asyncio.run(add(args)) + + +async def add(args): file_start = timeit.default_timer() dargs = vars(args) @@ -98,4 +102,4 @@ async def _add_img(p: Path): if __name__ == '__main__': - asyncio.run(main()) + main() diff --git a/cli/info.py b/cli/info.py index 3235d8c..918a76f 100644 --- a/cli/info.py +++ b/cli/info.py @@ -29,8 +29,12 @@ def main(): parser.add_argument('--thumb-sz', default=96, type=int, help='DB thumb size') parser.add_argument('--thumb-qual', default=70, type=int, help='DB thumb quality') parser.add_argument('--thumb-type', default='webp', help='DB thumb type') + args = parser.parse_args() + info(args) + +def info(args): file_start = timeit.default_timer() cfg = config.Config(**vars(args)) diff --git a/imgdb/config.py b/imgdb/config.py index 2e12ac1..8bffb00 100644 --- a/imgdb/config.py +++ b/imgdb/config.py @@ -221,7 +221,6 @@ def __attrs_post_init__(self): JSON_SAFE = ( 'deep', 'exts', - 'hashes', 'metadata', 'shuffle', 'sym_links', @@ -229,6 +228,7 @@ def __attrs_post_init__(self): 'thumb_sz', 'thumb_type', 'top_color_cut', + 'c_hashes', 'v_hashes', 'wrap_at', ) diff --git a/test/conftest.py b/test/conftest.py index 3b6ca52..db0932c 100644 --- a/test/conftest.py +++ b/test/conftest.py @@ -1,4 +1,5 @@ from tempfile import TemporaryDirectory + import pytest diff --git a/test/test_add.py b/test/test_add.py index 9ee665a..a75f14d 100644 --- a/test/test_add.py +++ b/test/test_add.py @@ -1,7 +1,8 @@ +from os import listdir, mkdir + from imgdb.__main__ import add -from imgdb.config import g_config, Config +from imgdb.config import Config, g_config from imgdb.db import * -from os import mkdir, listdir IMGS = listdir('test/pics') diff --git a/test/test_gallery.py b/test/test_gallery.py index 01541a0..84390a2 100644 --- a/test/test_gallery.py +++ b/test/test_gallery.py @@ -1,8 +1,9 @@ +from os import listdir + from imgdb.__main__ import add, gallery -from imgdb.config import g_config, Config +from imgdb.config import Config, g_config from imgdb.db import * from imgdb.gallery import * -from os import listdir IMGS = listdir('test/pics') diff --git a/test/test_img.py b/test/test_img.py index bbc81df..ac4a79a 100644 --- a/test/test_img.py +++ b/test/test_img.py @@ -1,8 +1,9 @@ +from bs4 import BeautifulSoup +from PIL import Image + from imgdb.algorithm import * from imgdb.config import Config from imgdb.img import * -from PIL import Image -from bs4 import BeautifulSoup def test_img_meta(): diff --git a/test/test_links.py b/test/test_links.py index 734f48e..89cbbad 100644 --- a/test/test_links.py +++ b/test/test_links.py @@ -1,8 +1,9 @@ +from os import listdir + from imgdb.__main__ import add, links -from imgdb.config import g_config, Config +from imgdb.config import Config, g_config from imgdb.db import * from imgdb.gallery import * -from os import listdir IMGS = listdir('test/pics') diff --git a/test/test_rename.py b/test/test_rename.py index 049c6ac..ed566ba 100644 --- a/test/test_rename.py +++ b/test/test_rename.py @@ -1,7 +1,8 @@ -from imgdb.__main__ import rename from os import listdir, makedirs from shutil import copytree +from imgdb.__main__ import rename + IMGS = listdir('test/pics')