merge

docsrc/quickstart.rst

@@ -21,7 +21,7 @@ The simplest usage is to change to the folder containing the images with
 
 ::
 
-    cd /folder/wit/images
+    cd /folder/with/images
 
 and type
 

pyimgbatch/__main__.py

@@ -52,9 +52,11 @@ def get_args():
 
     image_manipulation_group = parser.add_argument_group('image manipulation')
     image_manipulation_group.add_argument('--width', type=int,
-                                          default=None, help='...')
+                                          default=None, help='width of the destination image.')
     image_manipulation_group.add_argument('--height', type=int,
-                                          default=None, help='...')
+                                          default=None, help='height of the destination image.')
+    image_manipulation_group.add_argument('--resample', type=str, choices=["none", "bilinear", "bicubic", "hamming", "box", "antialias"],
+                                          default="antialias", help='resample arlgorithm used for resizing, defaults to "antialias"')
 
     return parser.parse_args()
 

pyimgbatch/pyimgbatch.py

@@ -14,8 +14,6 @@
 from PIL import Image
 from PIL import ImageCms
 
-# from .helper import to_int_or_none
-
 
 WEBSETS = {'@2x': 2, '@3x': 3}
 SUPPORTED_FILES = ['*.jpg', '*.jpeg', '*.png', '*.tif']
@@ -51,12 +49,13 @@ class CONFKEY(metaclass=CONSTANTS):
 
 class OPTIONKEY(metaclass=CONSTANTS):
     SOURCE, DEST = 'source', 'dest'
-    CONFIGFILE = 'configfile'
+    # CONFIGFILE = 'configfile'
     OVERRIDE = 'override'
     NOPROGRESS = 'no_progress'
     DEBUG = 'debug'
     PROJECTS, CONFIGS = 'projects', 'configs'
     NAME = 'name'
+    PROJECT = 'project'
 
 
 class Entries(object):
@@ -94,13 +93,13 @@ def source(self):
     def dest(self):
         return self._value(OPTIONKEY.DEST, OPTIONKEY.DEST)
 
-    @property  # TODO: replace
-    def configfile(self):
-        return self._value(OPTIONKEY.CONFIGFILE, 'imagebatch.json')
+    # @property  # TODO: replace
+    # def configfile(self):
+    #     return self._value(OPTIONKEY.CONFIGFILE, 'imagebatch.json')
 
     @property
     def project_file_name(self):
-        return self._value('project', 'pyimgbatch.json')  # TODO: Constants
+        return self._value(OPTIONKEY.PROJECT, 'pyimgbatch.json')
 
     @property
     def override(self):
@@ -365,14 +364,7 @@ def exec(self):
 
 
 class Size(object):
-    """[summary]
 
-    :param object: [description]
-    :type object: [type]
-    :raises Exception: [description]
-    :return: [description]
-    :rtype: [type]
-    """
     def __init__(self, *args):
         if len(args) == 1 and type(args[0]) is tuple:
             # TODO: to_int_or_none for tuple too
@@ -434,10 +426,6 @@ class Out:
     def out(cls, *args):
         cls.outfunction(*args)
 
-    # @classmethod
-    # def __call__(cls, *args):
-    #     cls.out(*args)
-
     @classmethod
     def init_project_bar(cls, disable=True):
         cls.project_bar = ProgressBar(1, disable=disable)
@@ -457,15 +445,6 @@ def __del__(cls):
 
 
 def to_int_or_none(value, multiplier=1):
-    """[summary]
-
-    :param value: [description]
-    :type value: [type]
-    :param multiplier: [description], defaults to 1
-    :type multiplier: int, optional
-    :return: [description]
-    :rtype: [type]
-    """
     try:
         value = int(value) * multiplier
         return value

setup.py

@@ -3,19 +3,22 @@
 with open("README.md", "r") as readme:
     long_description = readme.read()
 
-with open('requirements.txt') as req_file:
-    requirements = req_file.read().splitlines()
+# with open('requirements.txt') as req_file:
+#     requirements = req_file.read().splitlines()
 
 setuptools.setup(
     name="pyimgbatch",
     author="Sören Kirchner",
     author_email="[email protected]",
-    description="A small example package",
+    description="PyImgBatch is a batch image processor for python including a command line interface.",
     long_description=long_description,
     long_description_content_type="text/markdown",
     url="https://github.com/soeren-kirchner/pyimgbatch",
     # packages=['pyimgbatch'],
-    install_requires=requirements,
+    install_requires=[
+        "Pillow>=6.2.1",
+        "tqdm>=4.36.1"
+    ],
     packages=setuptools.find_packages(),
     classifiers=[
         "Programming Language :: Python :: 3.6",
@@ -34,7 +37,7 @@
         "Topic :: Utilities"
     ],
     python_requires='>=3.6',
-    version="0.2.5",
+    version="0.2.6post2",
     # version_config={
     #     "version_format": "{tag}.dev{sha}",
     #     "starting_version": "0.1.0"