diff --git a/mopidy/core/actor.py b/mopidy/core/actor.py index 56fe6e74..7b457ac1 100644 --- a/mopidy/core/actor.py +++ b/mopidy/core/actor.py @@ -184,7 +184,7 @@ class Core( history=self.history._export_state(), playback=self.playback._export_state(), mixer=self.mixer._export_state()) - storage.save(file_name, data) + storage.dump(file_name, data) logger.debug('Save state done.') def _load_state(self, coverage): diff --git a/mopidy/internal/storage.py b/mopidy/internal/storage.py index faa53d57..660b22ae 100644 --- a/mopidy/internal/storage.py +++ b/mopidy/internal/storage.py @@ -35,7 +35,7 @@ def load(path): return {} -def save(path, data): +def dump(path, data): """ Serialize data to file. diff --git a/mopidy/local/json.py b/mopidy/local/json.py index 378cab75..1a0307e5 100644 --- a/mopidy/local/json.py +++ b/mopidy/local/json.py @@ -9,7 +9,7 @@ import sys import mopidy from mopidy import compat, local, models -from mopidy import internal +from mopidy.internal import storage as internal_storage from mopidy.internal import timer from mopidy.local import search, storage, translator @@ -99,7 +99,7 @@ class JsonLibrary(local.Library): self._json_file) self._tracks = {} else: - library = internal.storage.load(self._json_file) + library = internal_storage.load(self._json_file) self._tracks = dict((t.uri, t) for t in library.get('tracks', [])) with timer.time_logger('Building browse cache'): @@ -167,7 +167,7 @@ class JsonLibrary(local.Library): self._tracks.pop(uri, None) def close(self): - internal.storage.save(self._json_file, + internal_storage.dump(self._json_file, {'version': mopidy.__version__, 'tracks': self._tracks.values()}) diff --git a/tests/core/test_actor.py b/tests/core/test_actor.py index 9d71fcef..a83ae93e 100644 --- a/tests/core/test_actor.py +++ b/tests/core/test_actor.py @@ -81,7 +81,7 @@ class CoreActorExportRestoreTest(unittest.TestCase): file_path = os.path.join(self.temp_dir, 'core', 'state.json.gz') data = {} - storage.save(file_path, data) + storage.dump(file_path, data) self.assertTrue(os.path.isfile(file_path), 'missing persistent file') self.core.setup().get()