diff --git a/.gitignore b/.gitignore index 57d22c9..d97e103 100644 --- a/.gitignore +++ b/.gitignore @@ -6,6 +6,7 @@ phototag/config/*.json *.nef *.xmp .vscode +.idea # Byte-compiled / optimized / DLL files __pycache__/ diff --git a/phototag/__init__.py b/phototag/__init__.py index 6291d43..8ea77fb 100644 --- a/phototag/__init__.py +++ b/phototag/__init__.py @@ -1,6 +1,6 @@ -import os -import sys import logging +import os + import progressbar from . import config diff --git a/phototag/app.py b/phototag/app.py index ddbacd0..a3579ca 100644 --- a/phototag/app.py +++ b/phototag/app.py @@ -1,22 +1,12 @@ -import io -import sys -import os -import time -import rawpy -import imageio -import progressbar -import shutil import logging - +import os from threading import Thread -from google.cloud import vision -from package import xmp -from PIL import Image -from .xmp import XMPParser -from .process import FileProcessor -from . import INPUT_PATH, TEMP_PATH, OUTPUT_PATH +from google.cloud import vision + +from . import INPUT_PATH, TEMP_PATH from . import RAW_EXTS, LOSSY_EXTS +from .process import FileProcessor log = logging.getLogger("app") diff --git a/phototag/cli.py b/phototag/cli.py index e09da7d..3c3f946 100644 --- a/phototag/cli.py +++ b/phototag/cli.py @@ -1,8 +1,8 @@ import logging -import click -import shutil -import sys import os +import shutil + +import click from . import config diff --git a/phototag/config.py b/phototag/config.py index 8ee7f5f..13b5684 100644 --- a/phototag/config.py +++ b/phototag/config.py @@ -1,6 +1,5 @@ -import os -import sys import configparser +import os SCRIPT_ROOT = os.path.dirname(os.path.realpath(__file__)) CONFIG_DIR = os.path.join(SCRIPT_ROOT, "config") diff --git a/phototag/process.py b/phototag/process.py index 923841f..ce181e7 100644 --- a/phototag/process.py +++ b/phototag/process.py @@ -1,18 +1,15 @@ -import os -import sys -import rawpy -import imageio import io -import iptcinfo3 import logging -import string -import random +import os import shutil + +import imageio +import iptcinfo3 +import rawpy from PIL import Image -from google.cloud.vision import types from google.cloud import vision -from . import TEMP_PATH, INPUT_PATH, OUTPUT_PATH, RAW_EXTS, LOSSY_EXTS +from . import TEMP_PATH, INPUT_PATH, RAW_EXTS from .xmp import XMPParser log = logging.getLogger("process") @@ -36,9 +33,7 @@ class FileProcessor(object): ) # Optimizes a file using JPEG thumbnailing and compression. - def _optimize( - self, file: str, size: tuple = (512, 512), quality: int = 85, copy: str = None - ): + def _optimize(self, file: str, size: tuple = (512, 512), quality: int = 85, copy: str = None): image = Image.open(file) image.thumbnail(size, resample=Image.ANTIALIAS) if copy: diff --git a/requirements.txt b/requirements.txt index ff34b75..3fd38c8 100644 --- a/requirements.txt +++ b/requirements.txt @@ -5,4 +5,5 @@ setuptools==40.8.0 Click==7.0 Pillow==7.0.0 protobuf==3.11.3 -progressbar2==3.47.0 \ No newline at end of file +progressbar2==3.47.0 +google-cloud-vision~=2.0