diff --git a/.gitignore b/.gitignore index 59c031f..915eaf7 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,9 @@ -artifacts.genshinart.json +ArtScanner/artifacts.genshinart.json ArtScanner/artifacts.dat ArtScanner/artifacts.dat.index ArtScanner/artifacts.dat.lock ArtScanner/artifacts.dat.tmp **/__pycache__/** +ArtScanner/build/** +ArtScanner/dist/** +ArtScanner/*.spec diff --git a/ArtScanner/art_saver.py b/ArtScanner/art_saver.py index f9f9d48..bd309ac 100644 --- a/ArtScanner/art_saver.py +++ b/ArtScanner/art_saver.py @@ -89,7 +89,6 @@ def add(self, info, art_img): transaction.commit() return True except Exception as e: - raise return False def exportGenshinArtJSON(self, path): diff --git a/ArtScanner/build.cmd b/ArtScanner/build.cmd new file mode 100644 index 0000000..3222a41 --- /dev/null +++ b/ArtScanner/build.cmd @@ -0,0 +1 @@ +pyinstaller --onefile --add-data "mn_model.h5;." --hidden-import=h5py --hidden-import=h5py.defs --hidden-import=h5py.utils --hidden-import=h5py.h5ac --hidden-import=h5py._proxy --uac-admin -n ArtScanner main.py \ No newline at end of file diff --git a/ArtScanner/main.py b/ArtScanner/main.py index 30b7397..2bc3ed8 100644 --- a/ArtScanner/main.py +++ b/ArtScanner/main.py @@ -81,6 +81,7 @@ def is_admin(): saved = 0 skipped = 0 failed = 0 +star_dist = [0,0,0,0,0] os.makedirs('artifacts', exist_ok=True) @@ -121,7 +122,9 @@ def artscannerCallback(art_img): global art_id global skipped global failed + global star_dist info = ocr_model.detect_info(art_img) + star_dist[info['star']-1] += 1 if decodeValue(info['level'])