Updated tests 2

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()

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))
 

imgdb/config.py

@@ -221,14 +221,14 @@ def __attrs_post_init__(self):
 JSON_SAFE = (
     'deep',
     'exts',
-    'hashes',
     'metadata',
     'shuffle',
     'sym_links',
     'thumb_qual',
     'thumb_sz',
     'thumb_type',
     'top_color_cut',
+    'c_hashes',
     'v_hashes',
     'wrap_at',
 )

test/conftest.py

@@ -1,4 +1,5 @@
 from tempfile import TemporaryDirectory
+
 import pytest
 
 

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')
 

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')
 

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():

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')
 

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')