bugfix

appPublic/folderUtils.py

@@ -48,22 +48,22 @@ def timestamp2datatiemStr(ts):
 	
 """
 def findAllDrives():
-    Drives=[]
+	Drives=[]
-    # print "Searching for drives..."
+	# print "Searching for drives..."
-    drives=win32api.GetLogicalDriveStrings().split(":")
+	drives=win32api.GetLogicalDriveStrings().split(":")
-    for i in drives:
+	for i in drives:
-        # print "i=",i,":"
+		# print "i=",i,":"
-        dr=i[-1].lower()
+		dr=i[-1].lower()
-        if dr.isalpha():
+		if dr.isalpha():
-            dr+=":\\"
+			dr+=":\\"
-            inf=None
+			inf=None
-            try:
+			try:
-                inf=win32api.GetVolumeInformation(dr)
+				inf=win32api.GetVolumeInformation(dr)
-            except:
+			except:
-                pass # Removable drive, not ready
+				pass # Removable drive, not ready
-		     # You'll still get the drive letter, but inf will be None
+			 # You'll still get the drive letter, but inf will be None
-            Drives.append([dr,inf])
+			Drives.append([dr,inf])
-    return Drives
+	return Drives
 """
 
 ## list all folder name under folder named by path
@@ -77,19 +77,19 @@ def listFolder(path, rescursive=False) :
 			yield full_name
 
 def listFile(folder,suffixs=[],rescursive=False):
-    subffixs = [ i.lower() for i in suffixs ]
+	subffixs = [ i.lower() for i in suffixs ]
-    for f in os.listdir(folder):
+	for f in os.listdir(folder):
-        p = os.path.join(folder,f)
+		p = os.path.join(folder,f)
-        if rescursive and os.path.isdir(p):
+		if rescursive and os.path.isdir(p):
-            for p1 in listFile(p,suffixs=suffixs,rescursive=True):
+			for p1 in listFile(p,suffixs=suffixs,rescursive=True):
-	            yield p1
+				yield p1
-        if os.path.isfile(p):
+		if os.path.isfile(p):
-            e = p.lower()
+			e = p.lower()
-            if suffixs == [] :
+			if suffixs == [] :
-                yield p
+				yield p
-            for s in subffixs:
+			for s in subffixs:
-                if e.endswith(s):
+				if e.endswith(s):
-                    yield p
+					yield p
 
 def folderInfo(root,uri=''):
 	relpath = uri
@@ -137,11 +137,11 @@ def rmdir_recursive(dir):
 	os.rmdir(dir)
 
 def _mkdir(newdir) :
-    """works the way a good mkdir should :)
+	"""works the way a good mkdir should :)
-        - already exists, silently complete
+		- already exists, silently complete
-        - regular file in the way, raise an exception
+		- regular file in the way, raise an exception
-        - parent directory(ies) does not exist, make them as well
+		- parent directory(ies) does not exist, make them as well
-    """
+	"""
 	return os.makedirs(newdir, exist_ok=True)
 
 def _copyfile(fp,dir) :