Updated to version 0.2.2

Main update is to "path.py", adding canceler compatibility to the `getall` function
TheElementalOfDestruction · Oct 30, 2018 · 5f76821 · 5f76821
1 parent 06ca209
commit 5f76821
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/creatorUtils/path.py b/creatorUtils/path.py
@@ -1,4 +1,5 @@
 import os;
+from creatorUtils import canceler;
 from creatorUtils.compat.types import *;
 from creatorUtils.compat import progress_bar as pb;
 
@@ -39,7 +40,7 @@ def get_long_path_name(input):
 	def get_short_path_name(input):
 		return input;
 
-def getall(inp, specExt = True, ext = ['msg'], extsep = '.', progressBar = None, onerror = None):
+def getall(inp, specExt = True, ext = ['msg'], extsep = '.', progressBar = None, onerror = None, _canceler = canceler.FAKE):
 	"""
 	Return format:
 		PathTable, NameTable, outPath
@@ -76,6 +77,8 @@ def getall(inp, specExt = True, ext = ['msg'], extsep = '.', progressBar = None,
 	isfile = True;
 	try:
 		while True:
+			if _canceler.get():
+				return;
 			current = iterator.next();
 			isfile = False;
 			for x in current[2]:

diff --git a/setup.py b/setup.py
@@ -8,7 +8,7 @@
 
 setuptools.setup(
 	name = "creatorUtils",
-	version = "0.2.1",
+	version = "0.2.2",
 	author = "The Elemental of Creation",
 	author_email = "[email protected]",
 	description = "creatorUtils main package",