Code improvements

ordigi/cli.py

@@ -1,8 +1,6 @@
 #!/usr/bin/env python
 
-import os
 from pathlib import Path
-import re
 import sys
 
 import click
@@ -102,6 +100,7 @@ _sort_options = [
     ),
 ]
 
+
 def print_help(command):
     click.echo(command.get_help(click.Context(command)))
 
@@ -127,7 +126,33 @@ def _get_paths(paths, root):
     return paths, root
 
 
-@click.command('check')
+def _cli_get_location(collection):
+    gopt = collection.opt['Geolocation']
+    return GeoLocation(
+        {
+            'geocoder': gopt['geocoder'],
+            'prefer_english_names': gopt['prefer_english_names'],
+            'timeout': gopt['timeout'],
+        }
+    )
+
+
+def _cli_sort(collection, src_paths, import_mode, remove_duplicates):
+    loc = _cli_get_location(collection)
+
+    path_format = collection.opt['Path']['path_format']
+
+    return collection.sort_files(
+        src_paths, path_format, loc, import_mode, remove_duplicates
+    )
+
+
+@click.group()
+def cli(**kwargs):
+    pass
+
+
+@cli.command('check')
 @add_options(_logger_options)
 @click.argument('path', required=True, nargs=1, type=click.Path())
 def _check(**kwargs):
@@ -152,7 +177,7 @@ def _check(**kwargs):
         sys.exit(1)
 
 
-@click.command('clean')
+@cli.command('clean')
 @add_options(_logger_options)
 @add_options(_dry_run_options)
 @add_options(_filter_options)
@@ -202,9 +227,11 @@ def _clean(**kwargs):
         },
     )
 
-    # TODO
+    # os.path.join(
+    # TODO make function to remove duplicates
+    # path_format = collection.opt['Path']['path_format']
     # summary = collection.sort_files(
-    #     paths, remove_duplicates=kwargs['remove_duplicates']
+    #     paths, path_format, None, remove_duplicates=kwargs['remove_duplicates']
     # )
 
     if kwargs['path_string']:
@@ -229,7 +256,7 @@ def _clean(**kwargs):
         sys.exit(1)
 
 
-@click.command('compare')
+@cli.command('compare')
 @add_options(_logger_options)
 @add_options(_dry_run_options)
 @add_options(_filter_options)
@@ -283,7 +310,7 @@ def _compare(**kwargs):
         sys.exit(1)
 
 
-@click.command('init')
+@cli.command('init')
 @add_options(_logger_options)
 @click.argument('path', required=True, nargs=1, type=click.Path())
 def _init(**kwargs):
@@ -296,11 +323,7 @@ def _init(**kwargs):
 
     collection = Collection(root)
 
-    # TODO retrieve collection.opt
+    loc = _cli_get_location(collection)
-    geocoder='Nominatim'
-    prefer_english_names=False
-    timeout=1
-    loc = GeoLocation(geocoder, prefer_english_names, timeout)
 
     summary = collection.init(loc)
 
@@ -308,7 +331,7 @@ def _init(**kwargs):
         summary.print()
 
 
-@click.command('import')
+@cli.command('import')
 @add_options(_logger_options)
 @add_options(_input_options)
 @add_options(_dry_run_options)
@@ -333,11 +356,6 @@ def _import(**kwargs):
 
     src_paths, root = _get_paths(kwargs['src'], kwargs['dest'])
 
-    if kwargs['copy']:
-        import_mode = 'copy'
-    else:
-        import_mode = 'move'
-
     collection = Collection(
         root,
         {
@@ -351,19 +369,16 @@ def _import(**kwargs):
             'glob': kwargs['glob'],
             'dry_run': kwargs['dry_run'],
             'interactive': kwargs['interactive'],
+            'path_format': kwargs['path_format'],
+
         }
     )
 
-    # TODO retrieve collection.opt
+    if kwargs['copy']:
-    # Use loc function
+        import_mode = 'copy'
-    geocoder='Nominatim'
+    else:
-    prefer_english_names=False
+        import_mode = 'move'
-    timeout=1
+    summary = _cli_sort(collection, src_paths, import_mode, kwargs['remove_duplicates'])
-    loc = GeoLocation(geocoder, prefer_english_names, timeout)
-
-    summary = collection.sort_files(
-        src_paths, kwargs['path_format'], loc, import_mode, kwargs['remove_duplicates']
-    )
 
     if log_level < 30:
         summary.print()
@@ -371,7 +386,8 @@ def _import(**kwargs):
     if summary.errors:
         sys.exit(1)
 
-@click.command('sort')
+
+@cli.command('sort')
 @add_options(_logger_options)
 @add_options(_input_options)
 @add_options(_dry_run_options)
@@ -414,15 +430,7 @@ def _sort(**kwargs):
         }
     )
 
-    # TODO retrieve collection.opt
+    summary = _cli_sort(collection, paths, False, kwargs['remove_duplicates'])
-    geocoder='Nominatim'
-    prefer_english_names=False
-    timeout=1
-    loc = GeoLocation(geocoder, prefer_english_names, timeout)
-
-    summary = collection.sort_files(
-        paths, kwargs['path_format'], loc, kwargs['remove_duplicates']
-    )
 
     if kwargs['clean']:
         collection.remove_empty_folders(root)
@@ -434,7 +442,7 @@ def _sort(**kwargs):
         sys.exit(1)
 
 
-@click.command('update')
+@cli.command('update')
 @add_options(_logger_options)
 @click.argument('path', required=True, nargs=1, type=click.Path())
 def _update(**kwargs):
@@ -445,26 +453,13 @@ def _update(**kwargs):
     log_level = log.get_level(kwargs['verbose'])
     log.console(LOG, level=log_level)
 
-    geocoder='Nominatim'
-    prefer_english_names=False
-    timeout=1
-    loc = GeoLocation(geocoder, prefer_english_names, timeout)
     collection = Collection(root)
+    loc = _cli_get_location(collection)
     summary = collection.update(loc)
 
     if log_level < 30:
         summary.print()
 
 
-@click.group()
+if __name__ == '__main__':
-def main(**kwargs):
+    cli()
-    pass
-
-
-main.add_command(_clean)
-main.add_command(_check)
-main.add_command(_compare)
-main.add_command(_init)
-main.add_command(_import)
-main.add_command(_sort)
-main.add_command(_update)

ordigi/collection.py

@@ -59,8 +59,8 @@ class FPath:
         """check for early hour photos to be grouped with previous day"""
 
         for i in '%H', '%M', '%S', '%I', '%p', '%f':
+            # D'ont change date format if datestring contain hour, minutes or seconds.
             if i in mask:
-                # D'ont change date format if datestring contain hour, minutes or seconds...
                 return date.strftime(mask)
 
         if date.hour < self.day_begins:
@@ -127,6 +127,7 @@ class FPath:
         # Each item has its own custom logic and we evaluate a single item and return
         # the evaluated string.
         part = ''
+
         filename = metadata['filename']
         stem = os.path.splitext(filename)[0]
         if item == 'stem':
@@ -515,7 +516,6 @@ class SortMedias:
             else:
                 self.summary.append('sort', False, src_path, dest_path)
 
-
     def sort_file(self, src_path, dest_path, metadata, imp=False):
         """Sort file and register it to db"""
         if imp == 'copy':
@@ -664,8 +664,9 @@ class SortMedias:
                 pass
 
         if conflicts != []:
-            for files_data, conflict in self._solve_conflicts(conflicts,
+            for files_data, conflict in self._solve_conflicts(
-                remove_duplicates):
+                conflicts, remove_duplicates
+            ):
 
                 src_path, dest_path, metadata = files_data
                 if not conflict:
@@ -839,7 +840,7 @@ class Collection(SortMedias):
                         metadata['src_path'] = row['SrcPath']
                         # Check if row FilePath is a subpath of relpath
                         if relpath.startswith(row['FilePath']):
-                            path = os.path.relpath(relpath, row['FilePath'])
+                            path = os.path.relpath(rlpath, row['FilePath'])
                             metadata['subdirs'] = row['Subdirs'] + path
                         metadata['Filename'] = row['Filename']
                         break

ordigi/config.py

@@ -2,12 +2,10 @@ import json
 import re
 
 from configparser import RawConfigParser
-from os import path
 from ordigi import constants
 from geopy.geocoders import options as gopt
 
 
-# TODO make one method???
 def check_option(getoption):
     """Check option type int or boolean"""
     try:
@@ -18,6 +16,7 @@ def check_option(getoption):
     else:
         return getoption
 
+
 def check_json(getoption):
     """Check if json string is valid"""
     try:
@@ -28,6 +27,7 @@ def check_json(getoption):
     else:
         return getoption
 
+
 def check_re(getoption):
     """Check if regex string is valid"""
     try:
@@ -165,9 +165,9 @@ class Config:
             if option == 'geocoder' and value in ('Nominatim',):
                 return self.conf[section][option]
             if option == 'glob':
-                return self.conf[section][option]
-            if option == 'path_format':
                 return self.getre(section, option)
+            if option == 'path_format':
+                return self.conf[section][option]
             if option in multi_options:
                 return set(self.getjson(section, option))
 

ordigi/constants.py

@@ -8,6 +8,7 @@ from pathlib import Path
 #: If True, debug messages will be printed.
 debug = False
 
+
 # Ordigi settings directory.
 def get_config_dir(name):
     if 'XDG_CONFIG_HOME' in environ:
@@ -19,6 +20,7 @@ def get_config_dir(name):
 
     return confighome / name
 
+
 APPLICATION_DIRECTORY = get_config_dir('ordigi')
 
 DEFAULT_PATH = '{%Y-%m-%b}/{album}|{city}'

setup.cfg

@@ -30,4 +30,10 @@ exclude =
 
 [options.entry_points]
 console_scripts =
-    ordigi = ordigi.cli:main
+    ordigi = ordigi.cli:cli
+
+[flake8]
+
+[pycodestyle]
+max-line-length = 88
+