From c9446605bc25cd50f03683e1d0b258dcdcb57a69 Mon Sep 17 00:00:00 2001
From: Marc Di Luzio <marc.diluzio@gmail.com>
Date: Fri, 16 Aug 2024 23:21:20 +0100
Subject: [PATCH] Move ops functions into state

---
 matchy/files/ops.py   | 26 --------------------------
 matchy/files/state.py | 31 +++++++++++++++++++++++++++----
 tests/state_test.py   | 15 +++++++--------
 3 files changed, 34 insertions(+), 38 deletions(-)
 delete mode 100644 matchy/files/ops.py

diff --git a/matchy/files/ops.py b/matchy/files/ops.py
deleted file mode 100644
index 1c159b8..0000000
--- a/matchy/files/ops.py
+++ /dev/null
@@ -1,26 +0,0 @@
-"""File operation helpers"""
-import json
-import shutil
-import pathlib
-import os
-
-
-def load(file: str) -> dict:
-    """Load a json file directly as a dict"""
-    with open(file) as f:
-        return json.load(f)
-
-
-def save(file: str, content: dict):
-    """
-    Save out a content dictionary to a file
-    """
-    # Ensure the save directory exists first
-    dir = pathlib.Path(os.path.dirname(file))
-    dir.mkdir(parents=True, exist_ok=True)
-
-    # Store in an intermediary directory first
-    intermediate = file + ".nxt"
-    with open(intermediate, "w") as f:
-        json.dump(content, f, indent=4)
-    shutil.move(intermediate, file)
diff --git a/matchy/files/state.py b/matchy/files/state.py
index 33c3122..b00507d 100644
--- a/matchy/files/state.py
+++ b/matchy/files/state.py
@@ -4,7 +4,9 @@ from datetime import datetime
 from schema import Schema, Use, Optional
 from collections.abc import Generator
 from typing import Protocol
-import matchy.files.ops as ops
+import json
+import shutil
+import pathlib
 import copy
 import logging
 from functools import wraps
@@ -169,6 +171,27 @@ def datetime_to_ts(ts: datetime) -> str:
     return datetime.strftime(ts, _TIME_FORMAT)
 
 
+def _load(file: str) -> dict:
+    """Load a json file directly as a dict"""
+    with open(file) as f:
+        return json.load(f)
+
+
+def _save(file: str, content: dict):
+    """
+    Save out a content dictionary to a file
+    """
+    # Ensure the save directory exists first
+    dir = pathlib.Path(os.path.dirname(file))
+    dir.mkdir(parents=True, exist_ok=True)
+
+    # Store in an intermediary directory first
+    intermediate = file + ".nxt"
+    with open(intermediate, "w") as f:
+        json.dump(content, f, indent=4)
+    shutil.move(intermediate, file)
+
+
 class State():
     def __init__(self, data: dict, file: str | None = None):
         """Copy the data, migrate if needed, and validate"""
@@ -196,7 +219,7 @@ class State():
             func(tmp, *args, **kwargs)
             _SCHEMA.validate(tmp._dict)
             if tmp._file:
-                ops.save(tmp._file, tmp._dict)
+                _save(tmp._file, tmp._dict)
             self._dict = tmp._dict
 
         return inner
@@ -367,7 +390,7 @@ def load_from_file(file: str) -> State:
     """
     Load the state from a files
     """
-    loaded = ops.load(file) if os.path.isfile(file) else _EMPTY_DICT
+    loaded = _load(file) if os.path.isfile(file) else _EMPTY_DICT
     st = State(loaded, file)
-    ops.save(file, st._dict)
+    _save(file, st._dict)
     return st
diff --git a/tests/state_test.py b/tests/state_test.py
index f34578f..d078046 100644
--- a/tests/state_test.py
+++ b/tests/state_test.py
@@ -4,7 +4,6 @@
 import matchy.files.state as state
 import tempfile
 import os
-import matchy.files.ops as ops
 
 
 def test_basic_state():
@@ -19,11 +18,11 @@ def test_simple_load_reload():
     with tempfile.TemporaryDirectory() as tmp:
         path = os.path.join(tmp, 'tmp.json')
         st = state.load_from_file(path)
-        ops.save(st._file, st._dict)
-        ops.save(st._file, st._dict)
+        state._save(st._file, st._dict)
+        state._save(st._file, st._dict)
 
         st = state.load_from_file(path)
-        ops.save(st._file, st._dict)
+        state._save(st._file, st._dict)
         st = state.load_from_file(path)
 
 
@@ -32,13 +31,13 @@ def test_authscope():
     with tempfile.TemporaryDirectory() as tmp:
         path = os.path.join(tmp, 'tmp.json')
         st = state.load_from_file(path)
-        ops.save(st._file, st._dict)
+        state._save(st._file, st._dict)
 
         assert not st.get_user_has_scope(1, state.AuthScope.MATCHER)
 
         st = state.load_from_file(path)
         st.set_user_scope(1, state.AuthScope.MATCHER)
-        ops.save(st._file, st._dict)
+        state._save(st._file, st._dict)
 
         st = state.load_from_file(path)
         assert st.get_user_has_scope(1, state.AuthScope.MATCHER)
@@ -52,13 +51,13 @@ def test_channeljoin():
     with tempfile.TemporaryDirectory() as tmp:
         path = os.path.join(tmp, 'tmp.json')
         st = state.load_from_file(path)
-        ops.save(st._file, st._dict)
+        state._save(st._file, st._dict)
 
         assert not st.get_user_active_in_channel(1, "2")
 
         st = state.load_from_file(path)
         st.set_user_active_in_channel(1, "2", True)
-        ops.save(st._file, st._dict)
+        state._save(st._file, st._dict)
 
         st = state.load_from_file(path)
         assert st.get_user_active_in_channel(1, "2")