Merge branch 'main' of git.opencomputing.cn:yumoqing/apppublic

appPublic/base64_to_file.py

@@ -0,0 +1,60 @@
+import os
+import re
+import base64
+from appPublic.uniqueID import getID
+
+MIME_EXT = {
+	# 图片
+	"image/jpeg": "jpg",
+	"image/png": "png",
+	"image/gif": "gif",
+	"image/webp": "webp",
+	"image/bmp": "bmp",
+	"image/svg+xml": "svg",
+	"image/x-icon": "ico",
+	"image/tiff": "tiff",
+
+	# 音频
+	"audio/mpeg": "mp3",
+	"audio/wav": "wav",
+	"audio/ogg": "ogg",
+	"audio/webm": "weba",
+	"audio/aac": "aac",
+	"audio/flac": "flac",
+	"audio/mp4": "m4a",
+	"audio/3gpp": "3gp",
+
+	# 视频
+	"video/mp4": "mp4",
+	"video/webm": "webm",
+	"video/ogg": "ogv",
+	"video/x-msvideo": "avi",
+	"video/quicktime": "mov",
+	"video/x-matroska": "mkv",
+	"video/3gpp": "3gp",
+	"video/x-flv": "flv",
+}
+
+def getFilenameFromBase64(base64String):
+	match = re.match(r"data:(.*?);base64,(.*)", base64String)
+	if not match:
+		raise ValueError("不是合法的 base64 Data URL")
+	mime_type, b64_data = match.groups()
+	ext = MIME_EXT.get(mime_type, mime_type.split("/")[-1])
+	name = getID()
+	fname = f'{name}.{ext}'
+	return fname
+
+def base64_to_file(base64_string, output_path):
+	# Remove data URL prefix if present (e.g., "data:image/png;base64,")
+	if ',' in base64_string:
+		header, base64_data = base64_string.split(',', 1)
+	else:
+		base64_data = base64_string
+
+	# Decode Base64 string
+	binary_data = base64.b64decode(base64_data)
+	
+	# Write binary data to file
+	with open(output_path, 'wb') as file:
+		file.write(binary_data)

appPublic/folderUtils.py

@@ -142,18 +142,7 @@ def _mkdir(newdir) :
 		- regular file in the way, raise an exception
 		- parent directory(ies) does not exist, make them as well
 	"""
-    if os.path.isdir(newdir):
+	return os.makedirs(newdir, exist_ok=True)
-        pass
-    elif os.path.isfile(newdir):
-        raise OSError("a file with the same name as the desired " \
-                      "dir, '%s', already exists." % newdir)
-    else:
-        head, tail = os.path.split(newdir)
-        if head and not os.path.isdir(head):
-            _mkdir(head)
-        #print "_mkdir %s" % repr(newdir)
-        if tail:
-            os.mkdir(newdir)
 
 def _copyfile(fp,dir) :
 	fs = open(fp,'rb')