Fix copy folder in camflasher

Author: remibert

modules/lib/motion/historic.py

@@ -187,7 +187,7 @@ async def extract():
 	async def scan_dir(path, pattern, older=True, directory=True):
 		""" Scan directory """
 		result = []
-		for fileinfo in uos.ilistdir(path):
+		for fileinfo in filesystem.list_directory(path):
 			name = fileinfo[0]
 			typ  = fileinfo[1]
 			if directory:
@@ -267,7 +267,7 @@ async def remove_files(directory, simulate=False, force=False):
 			dirs_to_remove  = []
 
 			# Parse all directories in sdcard (WARNING : TO AVOID CRASH, NEVER DELETE DIRECTORY OR FILE IN ilistdir LOOP)
-			for fileinfo in uos.ilistdir(directory):
+			for fileinfo in filesystem.list_directory(directory):
 				filename = fileinfo[0]
 				typ      = fileinfo[1]
 				# If file found

modules/lib/server/ftpservercore.py

@@ -100,7 +100,7 @@ def send_file_list_with_pattern(self, path, stream_, full, now, pattern=None):
 		description = b""
 		quantity = 0
 		counter = 0
-		for fileinfo in uos.ilistdir(strings.tostrings(path)):
+		for fileinfo in filesystem.list_directory(strings.tostrings(path)):
 			filename = fileinfo[0]
 			typ = fileinfo[1]
 			if len(fileinfo) > 3:

modules/lib/tools/builddate.py

@@ -1,2 +1,2 @@
 ''' Build date '''
-date=b'2023/02/05  14:05:02'
+date=b'2023/02/05  16:28:55'

modules/lib/tools/filesystem.py

@@ -173,14 +173,29 @@ def ismicropython():
 		return True
 	return False
 
+try:
+	import uos
+	list_directory = uos.ilistdir
+except:
+	def list_directory(path_):
+		""" List directory """
+		result = []
+		for filename in os.listdir(path_):
+			fileinfo_ = os.stat(path_ + "/" + filename)
+			typ = fileinfo_[0]
+			size = fileinfo_[6]
+
+			result.append((filename, typ, 0, size))
+		return result
+
 def scandir(path, pattern, recursive, displayer=None):
 	""" Scan recursively a directory """
 	filenames   = []
 	directories = []
 	if path == "":
 		path = "."
 	if path is not None and pattern is not None:
-		for file_info in uos.ilistdir(path):
+		for file_info in list_directory(path):
 			name = file_info[0]
 			typ  = file_info[1]
 			if path != "":
@@ -217,7 +232,7 @@ async def ascandir(path, pattern, recursive, displayer=None):
 	if path == "":
 		path = "."
 	if path is not None and pattern is not None:
-		for file_info in uos.ilistdir(path):
+		for file_info in list_directory(path):
 			name = file_info[0]
 			typ  = file_info[1]
 			if path != "":

modules/lib/tools/jsonconfig.py

@@ -63,7 +63,7 @@ def list_all(self):
 		""" List all configuration files """
 		result = []
 		pattern = self.get_filename() + ".*"
-		for fileinfo in uos.ilistdir(self.config_root()):
+		for fileinfo in filesystem.list_directory(self.config_root()):
 			name = fileinfo[0]
 			typ  = fileinfo[1]
 			if typ & 0xF000 != 0x4000:

modules/lib/tools/lang_english.py

@@ -206,4 +206,3 @@
 month_format                            =b"%(year)d %(month)s"
 weekdays                                = [monday,tuesday,wednesday,thursday,friday,saturday,sunday]
 months                                  = [january,february,march,april,may,june,july,august,september,october,november,december]
-activation_precaution                   =b"The camera should be activated only when you are connected to your wifi network. When the wifi access point mode is active with camera then this produces instabilities."