include __main__.py

Author: lindemann09

README.md

@@ -22,7 +22,7 @@ Run DIF GUI
 -----------
 
 ```
-python -m dataintegrityfingerprint.gui
+python -m dataintegrityfingerprint -G
 ```
 
 or if installed via pip:
@@ -36,13 +36,13 @@ DIF Command line interface
 --------------------------
 
 ```
-python -m dataintegrityfingerprint.cli
+python -m dataintegrityfingerprint
 ```
 
 or if installed via pip:
 
 ```
-dataintegrityfingerprint.cli
+dataintegrityfingerprint
 ```
 
 DIF Python library

dataintegrityfingerprint/__init__.py

@@ -1,7 +1,7 @@
 __author__ = 'Oliver Lindemann <oliver@expyriment.org>, ' \
              'Florian Krause <florian@expyriment.org>'
 
-__version__ = '0.6.0'
+__version__ = '0.6.1'
 
 from sys import version_info as _vi
 if _vi.major< 3:

dataintegrityfingerprint/__main__.py

@@ -0,0 +1,7 @@
+from .cli import cli
+
+def run():
+    cli()
+
+if __name__ == "__main__":
+    run()

dataintegrityfingerprint/cli.py

@@ -6,7 +6,7 @@
 from . import __version__
 
 
-def run():
+def cli():
 
     def progress(count, total, status=''):
         bar_len = 50
@@ -74,6 +74,7 @@ def progress(count, total, status=''):
                              "(Not suggested, please read documentation " +
                              "carefully!)",
                         default=False)
+
     args = vars(parser.parse_args())
 
     if args['listalgos']:
@@ -92,7 +93,7 @@ def progress(count, total, status=''):
         sys.exit()
 
     if args["PATH"] is None:
-        print("Use -h for help")
+        print("Use -G to launch the GUI interface or -h for help.")
         sys.exit()
 
     dif = DataIntegrityFingerprint(
@@ -135,8 +136,4 @@ def progress(count, total, status=''):
         print("Folder: {0}".format(dif.data))
         print("Files: {0} included".format(dif.count_files()))
         print("Algorithm: {0}".format(dif.hash_algorithm))
-        print("DIF: {}".format(dif))
-
-
-if __name__ == "__main__":
-    run()
+        print("DIF: {}".format(dif))

setup.py

@@ -9,9 +9,13 @@
 from sys import version_info as _vi
 
 package_name = "dataintegrityfingerprint"
+application_name = package_name
 
 install_requires = []
 
+entry_points = {'console_scripts':
+                ['{}={}.__main__:run'.format(application_name, package_name)]}
+
 if _vi.major< 1:
     raise RuntimeError("{0} requires Python 3 or larger.".format(package_name))
 
@@ -49,9 +53,7 @@ def get_version(package):
         include_package_data=True,
         setup_requires=[],
         install_requires=install_requires,
-        entry_points={
-            'console_scripts': ['dataintegrityfingerprint={0}.cli:run'.format(package_name)],
-            },
+        entry_points=entry_points,
         keywords = "", #ToDo
         classifiers=[ #ToDO
             "Intended Audience :: Education",