Refactoring

apache · Nov 14, 2022 · 653f818 · 653f818
1 parent 6a5c2ff
commit 653f818
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 12 deletions.
diff --git a/superset/charts/commands/export.py b/superset/charts/commands/export.py
@@ -27,7 +27,8 @@
 from superset.datasets.commands.export import ExportDatasetsCommand
 from superset.commands.export.models import ExportModelsCommand
 from superset.models.slice import Slice
-from superset.utils.dict_import_export import EXPORT_VERSION, get_filename
+from superset.utils.dict_import_export import EXPORT_VERSION
+from superset.utils.file import get_filename
 
 logger = logging.getLogger(__name__)
 

diff --git a/superset/dashboards/commands/export.py b/superset/dashboards/commands/export.py
@@ -33,7 +33,8 @@
 from superset.datasets.dao import DatasetDAO
 from superset.models.dashboard import Dashboard
 from superset.models.slice import Slice
-from superset.utils.dict_import_export import EXPORT_VERSION, get_filename
+from superset.utils.dict_import_export import EXPORT_VERSION
+from superset.utils.file import get_filename
 
 logger = logging.getLogger(__name__)
 

diff --git a/superset/databases/commands/export.py b/superset/databases/commands/export.py
@@ -26,7 +26,8 @@
 from superset.databases.dao import DatabaseDAO
 from superset.commands.export.models import ExportModelsCommand
 from superset.models.core import Database
-from superset.utils.dict_import_export import EXPORT_VERSION, get_filename
+from superset.utils.dict_import_export import EXPORT_VERSION
+from superset.utils.file import get_filename
 
 logger = logging.getLogger(__name__)
 

diff --git a/superset/datasets/commands/export.py b/superset/datasets/commands/export.py
@@ -26,7 +26,8 @@
 from superset.connectors.sqla.models import SqlaTable
 from superset.datasets.commands.exceptions import DatasetNotFoundError
 from superset.datasets.dao import DatasetDAO
-from superset.utils.dict_import_export import EXPORT_VERSION, get_filename
+from superset.utils.dict_import_export import EXPORT_VERSION
+from superset.utils.file import get_filename
 
 logger = logging.getLogger(__name__)
 

diff --git a/superset/utils/dict_import_export.py b/superset/utils/dict_import_export.py
@@ -18,7 +18,6 @@
 from typing import Any, Dict
 
 from sqlalchemy.orm import Session
-from werkzeug.utils import secure_filename
 
 from superset.models.core import Database
 
@@ -27,12 +26,6 @@
 logger = logging.getLogger(__name__)
 
 
-def get_filename(model_name: str, model_id: int, skip_id: bool = False) -> str:
-    slug = secure_filename(model_name)
-    filename = slug if skip_id else f"{slug}_{model_id}"
-    return filename if slug else str(model_id)
-
-
 def export_schema_to_dict(back_references: bool) -> Dict[str, Any]:
     """Exports the supported import/export schema to a dictionary"""
     databases = [

diff --git a/superset/utils/import_export.py → superset/utils/file.py b/superset/utils/import_export.py → superset/utils/file.py
diff --git a/tests/unit_tests/utils/test_import_export.py → tests/unit_tests/utils/test_file.py b/tests/unit_tests/utils/test_import_export.py → tests/unit_tests/utils/test_file.py
@@ -17,7 +17,7 @@
 # under the License.
 import pytest
 
-from superset.utils.import_export import get_filename
+from superset.utils.file import get_filename
 
 
 @pytest.mark.parametrize(
@@ -29,8 +29,12 @@
         ("D:\\Charts\\Energy Sankey", 132, True, "DChartsEnergy_Sankey"),
         ("🥴🥴🥴", 4751, False, "4751"),
         ("🥴🥴🥴", 4751, True, "4751"),
+        ("Energy Sankey 🥴🥴🥴", 4751, False, "Energy_Sankey_4751"),
+        ("Energy Sankey 🥴🥴🥴", 4751, True, "Energy_Sankey"),
         ("你好", 475, False, "475"),
         ("你好", 475, True, "475"),
+        ("Energy Sankey 你好", 475, False, "Energy_Sankey_475"),
+        ("Energy Sankey 你好", 475, True, "Energy_Sankey"),
     ],
 )
 def test_get_filename(