Browse Source

Bug fix

master
deeppppp 3 years ago
parent
commit
08952cf7f1
  1. 4
      processing/folder.py
  2. 22
      processing/image.py

4
processing/folder.py

@ -8,7 +8,7 @@ from json import JSONDecodeError @@ -8,7 +8,7 @@ from json import JSONDecodeError
from config import Config as Conf
from processing.multiple import MultipleImageProcessing
from processing.utils import select_phases
from processing.utils import select_phases, is_file
from utils import is_a_supported_image_file_extension
@ -24,7 +24,7 @@ class FolderImageProcessing(MultipleImageProcessing): @@ -24,7 +24,7 @@ class FolderImageProcessing(MultipleImageProcessing):
for r, _, _ in os.walk(self._input_folder_path):
args = copy.deepcopy(self._args)
args['input'] = [
x.path for x in os.scandir(r) if x.is_file() and is_a_supported_image_file_extension(x.path)
x.path for x in os.scandir(r) if is_file(args, x.path) and is_a_supported_image_file_extension(x.path)
]
args['phases'] = select_phases(self._args)
args['output'] = [

22
processing/image.py

@ -1,6 +1,7 @@ @@ -1,6 +1,7 @@
"""Image Transform Processing."""
import os
import sys
import hashlib
from config import Config as Conf
from processing import Processing
@ -28,8 +29,18 @@ class ImageProcessing(Processing): @@ -28,8 +29,18 @@ class ImageProcessing(Processing):
Conf.log.debug("All Phases : {}".format(self.__phases))
Conf.log.debug("To Be Executed Phases : {}".format(self.__phases[self.__starting_step:self.__ending_step]))
path = self.__altered_path if os.path.isfile(self.__input_path) or not self._args.get('folder_altered') \
else os.path.join(self._args['folder_altered'], os.path.basename(self.__output_path))
if (self._args.get('folder_altered')):
checksum_path = os.path.join(self._args['folder_altered'], str(hashlib.md5(open(self.__input_path, 'rb').read()).hexdigest()))
if (not os.path.isdir(checksum_path)):
os.makedirs(checksum_path, exist_ok=True)
self._args['folder_altered'] = checksum_path
path = checksum_path
elif (self.__altered_path):
checksum_path = os.path.join(self.__altered_path, str(hashlib.md5(open(self.__input_path, 'rb').read()).hexdigest()))
if (not os.path.isdir(checksum_path)):
os.makedirs(checksum_path, exist_ok=True)
self.__altered_path = checksum_path
path = self.__altered_path
self.__image_steps = [self.__input_path] + [
os.path.join(path, "{}.png".format(p().__class__.__name__))
@ -61,9 +72,10 @@ class ImageProcessing(Processing): @@ -61,9 +72,10 @@ class ImageProcessing(Processing):
self.__image_steps.append(r)
if self.__altered_path:
path = self.__altered_path \
if os.path.isfile(self._args['input']) or not self._args.get('folder_altered') \
else os.path.join(self._args['folder_altered'], os.path.basename(self.__output_path))
if (self._args.get('folder_altered')):
path = self._args['folder_altered']
else:
path = self.__altered_path
write_image(r, os.path.join(path, "{}.png".format(p.__name__)))

Loading…
Cancel
Save