streamlit-octostar-utils 0.2.4__py3-none-any.whl → 0.2.5__py3-none-any.whl

streamlit_octostar_utils/core/filetypes.py

@@ -6,20 +6,26 @@ def add_filetypes():
     mimetypes.add_type("text/csv", ".csv")
 
 
-def recognize_filetype(file, filename):
-    from_name_guess, _ = mimetypes.guess_type(filename)
-    from_file_guess = filetype.guess(file)
-    if from_file_guess:
-        from_file_guess = from_file_guess.mime
-    recognized_filetype = None
+def recognize_filetype(file=None, filename=None):
+    if not (file or filename):
+        raise ValueError("Must provide either file content or filename")
+    from_name_guess = None
+    from_file_guess = None
+    if filename:
+        from_name_guess, _ = mimetypes.guess_type(filename)
+    if file:
+        ft = filetype.guess(file)
+        from_file_guess = ft.mime if ft else None
+    def _family(m):
+        return m.split("/", 1)[0] if isinstance(m, str) and "/" in m else None
+    def _subtype(m):
+        return m.split("/", 1)[-1] if isinstance(m, str) and "/" in m else None
     if not from_file_guess and not from_name_guess:
-        recognized_filetype = "unknown"
-    elif not (from_file_guess and from_name_guess):
-        recognized_filetype = from_file_guess or from_name_guess
-    elif from_file_guess.split("/", 1)[0] != from_name_guess.split("/", 1)[0]:
-        recognized_filetype = from_file_guess
-    elif from_file_guess.split("/", 1)[-1] != from_name_guess.split("/", 1)[-1]:
-        recognized_filetype = from_name_guess
-    else:
-        recognized_filetype = from_name_guess
-    return recognized_filetype
+        return "unknown"
+    if not (from_file_guess and from_name_guess):
+        return from_file_guess or from_name_guess
+    if _family(from_file_guess) != _family(from_name_guess):
+        return from_file_guess
+    if _subtype(from_file_guess) != _subtype(from_name_guess):
+        return from_name_guess
+    return from_name_guess

{streamlit_octostar_utils-0.2.4.dist-info → streamlit_octostar_utils-0.2.5.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: streamlit-octostar-utils
-Version: 0.2.4
+Version: 0.2.5
 Summary: 
 License: MIT
 Author: Octostar

{streamlit_octostar_utils-0.2.4.dist-info → streamlit_octostar_utils-0.2.5.dist-info}/RECORD

@@ -15,7 +15,7 @@ streamlit_octostar_utils/api_crafter/parser/rules.py,sha256=hY2saX-CYpDBoxfK7BqZ
 streamlit_octostar_utils/api_crafter/parser/signals.py,sha256=cX1mHHGoolls7DBUwBZNHItlkKNYImEIUrr4M3btQko,4408
 streamlit_octostar_utils/core/__init__.py,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
 streamlit_octostar_utils/core/dict.py,sha256=b-gOCXLNuTY6WePCOeq20QLYHAPHpfivG6sxZZMw-b8,2802
-streamlit_octostar_utils/core/filetypes.py,sha256=C4h4WDU8voMIdQETC3n1cd-CDgw9aN_kinxXcwWpU0c,915
+streamlit_octostar_utils/core/filetypes.py,sha256=kOcEnQUj4RKkyIekhrBzDBQsgWHDNe12JiQjt3mlUNc,1104
 streamlit_octostar_utils/core/threading/__init__.py,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
 streamlit_octostar_utils/core/threading/key_queue.py,sha256=7CJpj0gvZMQd8eC5wKQi3Ak5SQQ4zQ1OPTs_OP_kD20,2255
 streamlit_octostar_utils/core/timestamp.py,sha256=a3s4xfm1nctLzYsHOJxqoWIDTdbNY_yN1OByl8ahLc8,383
@@ -36,7 +36,7 @@ streamlit_octostar_utils/threading/__init__.py,sha256=AbpHGcgLb-kRsJGnwFEktk7uzp
 streamlit_octostar_utils/threading/async_task_manager.py,sha256=q7N6YZwUvIYMzkSHmsJNheNVCv93c03H6Hyg9uH8pvk,4747
 streamlit_octostar_utils/threading/session_callback_manager.py,sha256=LvZVP4g6tvKtYmI13f2j1sX_7hm61Groqp5xJine9_k,3973
 streamlit_octostar_utils/threading/session_state_hot_swapper.py,sha256=6eeCQI6A42hp4DmW2NQw2rbeR-k9N8DhfBKQdN_fbLU,811
-streamlit_octostar_utils-0.2.4.dist-info/LICENSE,sha256=dkwVPyV03fPHHtERnF6RnvRXcll__tud9gWca1RcgnQ,1073
-streamlit_octostar_utils-0.2.4.dist-info/METADATA,sha256=BOVhRaR1Sz8WEu-FxFKN3v7S-YoEqZP1yiZw_Ts5TII,2256
-streamlit_octostar_utils-0.2.4.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-streamlit_octostar_utils-0.2.4.dist-info/RECORD,,
+streamlit_octostar_utils-0.2.5.dist-info/LICENSE,sha256=dkwVPyV03fPHHtERnF6RnvRXcll__tud9gWca1RcgnQ,1073
+streamlit_octostar_utils-0.2.5.dist-info/METADATA,sha256=3wOatPx3Q2H3rqp3Y9ynkoKTeNf77SlL2YK-DdhgaPE,2256
+streamlit_octostar_utils-0.2.5.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+streamlit_octostar_utils-0.2.5.dist-info/RECORD,,