The path update, 1.0.5

Author: AlexFlipnote

README.md

@@ -1,5 +1,5 @@
 # diskspace
-Making it possible to use Linux df & du command on Windows
+Making it possible to use Linux df & du command on Windows/Linux.
 
 # Requirements
 Python 3.6 or up
@@ -29,3 +29,19 @@ optional arguments:
   -nf, --nofolders      Ingore folders
   -ns, --nostats        Don't display disk space at top
 ```
+
+# Usage in code example
+```py
+>>> import diskspace
+>>> show_dir = diskspace.ShowPath("./Desktop")
+>>> print(show_dir.all_files)
+# [<FileInfo name=Adios.png bytes=267391 human=261.1KiB folder=False created=1571303626.1382277>, <FileInfo name=Baby yoda flip pancakes.jpg bytes=47487 human=46.4KiB folder=False created=1574946741.9886782>, <FileInfo name=big sipp.jpg bytes=47076 human=46.0KiB folder=False created=1574028168.9891481>]
+```
+
+### ShowPath()
+- path: str = Path to find files (Default: ".")
+- exclude: str = Exclude files (Default: None)
+- include_folder = Include folders in result (Default: True)
+- human: bool = Show disk space in human-readable value (Default: False)
+- include_stats: bool = Include stats of current disk in ShowPath.pretty_print (Default: True)
+- whitelist: str = Only include X files (Default: None)

diskspace/__init__.py

@@ -1,3 +1,3 @@
-__version__ = "1.0.4.1"
+__version__ = "1.0.5"
 
 from .pathRender import ShowPath

diskspace/diskspace.py

@@ -1,6 +1,7 @@
 import shlex
 import diskspace
 import argparse
+import re
 
 from . import argpar, utils, pathRender
 
@@ -10,39 +11,43 @@ def shell():
     parser = argpar.Arguments(description="Making it possible to use Linux df & du command on Windows", add_help=False)
     parser.add_argument('--help', action='help', default=argparse.SUPPRESS, help='Show this help message and exit.')
     parser.add_argument('-v', '--version', action='store_true', help='Show the version number and exit')
-    parser.add_argument('-e', '--exclude', nargs='+', help='Exclude name or file extensions matching arguments', default=None)
-    parser.add_argument('-o', '--only', nargs='+', help='Only include name or file extensions matching arguments', default=None)
+    parser.add_argument('-bl', '--blacklist', nargs='+', help='Exclude name or file extensions matching arguments', default=None)
+    parser.add_argument('-wl', '--whitelist', nargs='+', help='Only include name or file extensions matching arguments', default=None)
     parser.add_argument('-h', '--human', action='store_true', help='Convert bytes in to readable format')
     parser.add_argument('-nf', '--nofolders', action='store_true', help='Ingore folders')
+    parser.add_argument('-p', '--path', nargs='+', help="Choose a different path to check diskspace")
     parser.add_argument('-ns', '--nostats', action='store_true', help="Don't display disk space at top")
 
     try:
+        arguments = arguments.replace("\\", "/")
         args = parser.parse_args(shlex.split(arguments))
     except Exception as e:
         utils.exitcode(e)
 
     if args.version:
-        utils.exitcode(diskspace.__version__)
+        utils.exitcode(f"DiskSpace version: {diskspace.__version__}")
 
-    if args.nofolders:
-        nofolders = False
-    else:
-        nofolders = True
+    nofolders = False if args.nofolders else True
+    nostats = False if args.nostats else True
 
-    if args.nostats:
-        nostats = False
+    if args.path:
+        custom_path = " ".join(args.path)
+        if not re.compile("^[A-Za-z]:\/|^\/").search(custom_path):
+            # Custom path from current dir
+            custom_path = "./" + " ".join(args.path)
     else:
-        nostats = True
+        custom_path = "."
 
-    if args.exclude and args.only:
-        utils.exitcode("You can't define what to exclude and what to only include at the same time.")
+    if args.blacklist and args.whitelist:
+        utils.exitcode("You can't define blacklist/whitelist alone.")
 
     print(pathRender.ShowPath(
+        path=custom_path,
         include_folder=nofolders,
         include_stats=nostats,
-        exclude=args.exclude,
-        human=args.human,
-        whitelist=args.only
+        whitelist=args.whitelist,
+        blacklist=args.blacklist,
+        human=args.human
     ).pretty_print)
 
 

diskspace/pathRender.py

@@ -17,7 +17,7 @@ def __init__(self, total: int, used: int, free: int,
     def __repr__(self):
         return '<OSInfo total={0.total} used={0.used} free={0.free}' \
                ' total_human={0.total_human} used_human={0.used_human}' \
-               ' free_human={0.free_human}> used_percent={0.used_percent}'.format(self)
+               ' free_human={0.free_human}> used_percent={0.used_percent}>'.format(self)
 
 
 class FileInfo:
@@ -30,19 +30,20 @@ def __init__(self, name: str, bytes: int, human: str, folder: False, created: fl
 
     def __repr__(self):
         return '<FileInfo name={0.name} bytes={0.bytes}' \
-               ' human={0.human} folder={0.folder} created={0.created}'.format(self)
+               ' human={0.human} folder={0.folder} created={0.created}>'.format(self)
 
 
 class ShowPath:
-    def __init__(self, path='.', exclude=None, include_folder=True,
-                 human=False, include_stats=True, whitelist=False):
+    def __init__(self, path: str = '.', blacklist: str = None, include_folder: bool = True,
+                 human: bool = False, include_stats: bool = True, whitelist: str = None):
         self.files = {}
         self.path = path
-        self.exclude = exclude
+        self.blacklist = blacklist
         self.human = human
         self.whitelist = whitelist
         self.include_folder = include_folder
         self.include_stats = include_stats
+        self.path_size = 0
 
     def readable(self, num, suffix='B'):
         """ Convert Bytes into human readable formats """
@@ -94,6 +95,8 @@ def getPathFiles(self):
         and converts them to class FileInfo """
         for i, file in enumerate(os.listdir(self.path)):
             is_folder = False
+            filename = file
+            file = f"{self.path}/{file}"
 
             try:
                 size = os.path.getsize(file)
@@ -113,7 +116,7 @@ def getPathFiles(self):
                 continue
 
             try:
-                if any([x.lower() in file.lower() for x in self.exclude]):
+                if any([x.lower() in file.lower() for x in self.blacklist]):
                     continue
             except TypeError:
                 pass
@@ -126,11 +129,18 @@ def getPathFiles(self):
             except TypeError:
                 pass
 
+            self.path_size += size
             self.files[i] = FileInfo(
-                file, size, self.readable(size),
+                filename, size, self.readable(size),
                 is_folder, self.creation_date(file)
             )
 
+        # Now add the current dir as a last touch
+        self.files[len(self.files) + 1] = FileInfo(
+            self.path, self.path_size, self.readable(self.path_size),
+            True, self.creation_date(self.path)
+        )
+
         return self.files
 
     @property