save now just has one filename parameter

Author: alexhroom

RATapi/project.py

@@ -837,18 +837,17 @@ def classlist_script(name, classlist):
             + "\n)"
         )
 
-    def save(self, filepath: Union[str, Path], filename: str = "project"):
+    def save(self, filepath: Union[str, Path] = "./project.json"):
         """Save a project to a JSON file.
 
         Parameters
         ----------
         filepath : str or Path
-            The path in which the project will be written.
-        filename : str
-            The name of the generated project file.
+            The path to where the project file will be written.
 
         """
-        filepath = Path(filepath)
+        filepath = Path(filepath).with_suffix(".json")
+
         json_dict = {}
         for field in self.model_fields:
             attr = getattr(self, field)
@@ -882,8 +881,7 @@ def make_custom_file_dict(item):
             else:
                 json_dict[field] = attr
 
-        file = Path(filepath, f"{filename.removesuffix('.json')}.json")
-        file.write_text(json.dumps(json_dict))
+        filepath.write_text(json.dumps(json_dict))
 
     @classmethod
     def load(cls, path: Union[str, Path]) -> "Project":
@@ -979,17 +977,23 @@ def try_relative_to(path: Path, relative_to: Path) -> Path:
         try:
             relative_path = abs_path.relative_to(abs_base)
         except ValueError as err:
-            warnings.warn("Could not save a custom file path as relative to the project directory. "
-                          "This may mean the project may not open on other devices. "
-                          f"Error message: {err}", stacklevel=2)
-            return abs_path 
+            warnings.warn(
+                "Could not save a custom file path as relative to the project directory. "
+                "This may mean the project may not open on other devices. "
+                f"Error message: {err}",
+                stacklevel=2,
+            )
+            return abs_path
     else:
         try:
-            relative_path = abs_path.relative_to(abs_base, walk_up = True)
+            relative_path = abs_path.relative_to(abs_base, walk_up=True)
         except ValueError as err:
-            warnings.warn("Could not save a custom file path as relative to the project directory. "
-                          "This may mean the project may not open on other devices. "
-                          f"Error message: {err}", stacklevel=2)
-            return abs_path 
+            warnings.warn(
+                "Could not save a custom file path as relative to the project directory. "
+                "This may mean the project may not open on other devices. "
+                f"Error message: {err}",
+                stacklevel=2,
+            )
+            return abs_path
 
     return relative_path

tests/test_project.py

@@ -1559,10 +1559,11 @@ def test_save_load(project, request):
 
     with tempfile.TemporaryDirectory() as tmp:
         # ignore relative path warnings
+        path = Path(tmp, "project.json")
         with warnings.catch_warnings():
             warnings.simplefilter("ignore")
-            original_project.save(tmp)
-        converted_project = RATapi.Project.load(Path(tmp, "project.json"))
+            original_project.save(path)
+        converted_project = RATapi.Project.load(path)
 
     # resolve custom files in case the original project had unresolvable relative paths
     for file in original_project.custom_files:
@@ -1583,16 +1584,18 @@ def test_relative_paths():
 
 def test_relative_paths_version():
     """Test that we only walk up paths on Python 3.12 or greater."""
-    
+
     data_path = "/tmp/project/data/mydata.dat"
     relative_path = "/tmp/project/project_path/myproj.dat"
 
     if version_info.minor >= 12:
         with warnings.catch_warnings():
             warnings.simplefilter("error")
             assert RATapi.project.try_relative_to(data_path, relative_path) == Path("../../data/mydata.dat")
-    else: 
-        with pytest.warns(match="Could not save a custom file path as relative to the project directory. "
-                          "This may mean the project may not open on other devices. "
-                          "Error message:"):
+    else:
+        with pytest.warns(
+            match="Could not save a custom file path as relative to the project directory. "
+            "This may mean the project may not open on other devices. "
+            "Error message:"
+        ):
             assert RATapi.project.try_relative_to(data_path, relative_path) == Path("/tmp/project/data/mydata.dat")