diff --git a/mopidy/core/actor.py b/mopidy/core/actor.py index 32b5f47f..bd77b37e 100644 --- a/mopidy/core/actor.py +++ b/mopidy/core/actor.py @@ -180,10 +180,10 @@ class Core( data = {} data['version'] = mopidy.__version__ data['state'] = CoreState( - tracklist=self.tracklist._export_state(), - history=self.history._export_state(), - playback=self.playback._export_state(), - mixer=self.mixer._export_state()) + tracklist=self.tracklist._save_state(), + history=self.history._save_state(), + playback=self.playback._save_state(), + mixer=self.mixer._save_state()) storage.dump(file_name, data) logger.debug('Save state done.') @@ -220,11 +220,11 @@ class Core( if 'state' in data: core_state = data['state'] validation.check_instance(core_state, CoreState) - self.history._restore_state(core_state.history, coverage) - self.tracklist._restore_state(core_state.tracklist, coverage) + self.history._load_state(core_state.history, coverage) + self.tracklist._load_state(core_state.tracklist, coverage) + self.mixer._load_state(core_state.mixer, coverage) # playback after tracklist - self.mixer._restore_state(core_state.mixer, coverage) - self.playback._restore_state(core_state.playback, coverage) + self.playback._load_state(core_state.playback, coverage) logger.debug('Load state done.') diff --git a/mopidy/core/history.py b/mopidy/core/history.py index d0c936ee..da688980 100644 --- a/mopidy/core/history.py +++ b/mopidy/core/history.py @@ -58,7 +58,7 @@ class HistoryController(object): """ return copy.copy(self._history) - def _export_state(self): + def _save_state(self): # 500 tracks a 3 minutes -> 24 hours history count_max = 500 count = 1 @@ -72,7 +72,7 @@ class HistoryController(object): break return HistoryState(history=history_list) - def _restore_state(self, state, coverage): + def _load_state(self, state, coverage): if state: if 'history' in coverage: self._history = [] diff --git a/mopidy/core/mixer.py b/mopidy/core/mixer.py index 20e1fb56..15fafad1 100644 --- a/mopidy/core/mixer.py +++ b/mopidy/core/mixer.py @@ -101,11 +101,11 @@ class MixerController(object): return False - def _export_state(self): + def _save_state(self): return MixerState(volume=self.get_volume(), mute=self.get_mute()) - def _restore_state(self, state, coverage): + def _load_state(self, state, coverage): if state: if 'mixer' in coverage: if state.volume: diff --git a/mopidy/core/playback.py b/mopidy/core/playback.py index ed6acc4b..0dd73714 100644 --- a/mopidy/core/playback.py +++ b/mopidy/core/playback.py @@ -599,13 +599,13 @@ class PlaybackController(object): logger.debug('Triggering seeked event') listener.CoreListener.send('seeked', time_position=time_position) - def _export_state(self): + def _save_state(self): return models.PlaybackState( tlid=self.get_current_tlid(), time_position=self.get_time_position(), state=self.get_state()) - def _restore_state(self, state, coverage): + def _load_state(self, state, coverage): if state: new_state = None if 'play-always' in coverage: diff --git a/mopidy/core/tracklist.py b/mopidy/core/tracklist.py index 61183438..2700bef5 100644 --- a/mopidy/core/tracklist.py +++ b/mopidy/core/tracklist.py @@ -648,7 +648,7 @@ class TracklistController(object): logger.debug('Triggering options changed event') listener.CoreListener.send('options_changed') - def _export_state(self): + def _save_state(self): return TracklistState( tl_tracks=self._tl_tracks, next_tlid=self._next_tlid, @@ -657,7 +657,7 @@ class TracklistController(object): repeat=self.get_repeat(), single=self.get_single()) - def _restore_state(self, state, coverage): + def _load_state(self, state, coverage): if state: if 'mode' in coverage: self.set_consume(state.consume) diff --git a/tests/core/test_actor.py b/tests/core/test_actor.py index a83ae93e..a22ed642 100644 --- a/tests/core/test_actor.py +++ b/tests/core/test_actor.py @@ -69,11 +69,11 @@ class CoreActorExportRestoreTest(unittest.TestCase): pykka.ActorRegistry.stop_all() shutil.rmtree(self.temp_dir) - def test_export_state(self): + def test_save_state(self): self.core.teardown().get() # TODO: implement meaningful test - def test_restore_state(self): + def test_load_state(self): self.core.setup().get() # TODO: implement meaningful test diff --git a/tests/core/test_history.py b/tests/core/test_history.py index 65babde8..84f8b1b1 100644 --- a/tests/core/test_history.py +++ b/tests/core/test_history.py @@ -68,7 +68,7 @@ class CoreHistoryExportRestoreTest(unittest.TestCase): self.history._add_track(self.tracks[2]) self.history._add_track(self.tracks[1]) - value = self.history._export_state() + value = self.history._save_state() self.assertEqual(len(value.history), 2) # last in, first out @@ -81,7 +81,7 @@ class CoreHistoryExportRestoreTest(unittest.TestCase): HistoryTrack(timestamp=45, track=self.refs[2]), HistoryTrack(timestamp=56, track=self.refs[1])]) coverage = ['history'] - self.history._restore_state(state, coverage) + self.history._load_state(state, coverage) hist = self.history.get_history() self.assertEqual(len(hist), 3) @@ -100,7 +100,7 @@ class CoreHistoryExportRestoreTest(unittest.TestCase): def test_import_invalid_type(self): with self.assertRaises(TypeError): - self.history._restore_state(11, None) + self.history._load_state(11, None) def test_import_none(self): - self.history._restore_state(None, None) + self.history._load_state(None, None) diff --git a/tests/core/test_mixer.py b/tests/core/test_mixer.py index 17ecdfb5..be4b314c 100644 --- a/tests/core/test_mixer.py +++ b/tests/core/test_mixer.py @@ -169,7 +169,7 @@ class CoreMixerExportRestoreTest(unittest.TestCase): target = MixerState(volume=volume, mute=mute) self.core.mixer.set_volume(volume) self.core.mixer.set_mute(mute) - value = self.core.mixer._export_state() + value = self.core.mixer._save_state() self.assertEqual(target, value) def test_export_unmute(self): @@ -178,7 +178,7 @@ class CoreMixerExportRestoreTest(unittest.TestCase): target = MixerState(volume=volume, mute=mute) self.core.mixer.set_volume(volume) self.core.mixer.set_mute(mute) - value = self.core.mixer._export_state() + value = self.core.mixer._save_state() self.assertEqual(target, value) def test_import(self): @@ -186,7 +186,7 @@ class CoreMixerExportRestoreTest(unittest.TestCase): volume = 45 target = MixerState(volume=volume) coverage = ['mixer'] - self.core.mixer._restore_state(target, coverage) + self.core.mixer._load_state(target, coverage) self.assertEqual(volume, self.core.mixer.get_volume()) def test_import_not_covered(self): @@ -194,7 +194,7 @@ class CoreMixerExportRestoreTest(unittest.TestCase): self.core.mixer.set_mute(True) target = MixerState(volume=56, mute=False) coverage = ['other'] - self.core.mixer._restore_state(target, coverage) + self.core.mixer._load_state(target, coverage) self.assertEqual(21, self.core.mixer.get_volume()) self.assertEqual(True, self.core.mixer.get_mute()) @@ -203,7 +203,7 @@ class CoreMixerExportRestoreTest(unittest.TestCase): self.assertEqual(False, self.core.mixer.get_mute()) target = MixerState(mute=True) coverage = ['mixer'] - self.core.mixer._restore_state(target, coverage) + self.core.mixer._load_state(target, coverage) self.assertEqual(True, self.core.mixer.get_mute()) def test_import_mute_off(self): @@ -211,12 +211,12 @@ class CoreMixerExportRestoreTest(unittest.TestCase): self.assertEqual(True, self.core.mixer.get_mute()) target = MixerState(mute=False) coverage = ['mixer'] - self.core.mixer._restore_state(target, coverage) + self.core.mixer._load_state(target, coverage) self.assertEqual(False, self.core.mixer.get_mute()) def test_import_invalid_type(self): with self.assertRaises(TypeError): - self.core.mixer._restore_state(11, None) + self.core.mixer._load_state(11, None) def test_import_none(self): - self.core.mixer._restore_state(None, None) + self.core.mixer._load_state(None, None) diff --git a/tests/core/test_playback.py b/tests/core/test_playback.py index 909e999c..3f4c8fdc 100644 --- a/tests/core/test_playback.py +++ b/tests/core/test_playback.py @@ -1142,7 +1142,7 @@ class TesetCorePlaybackExportRestore(BaseTest): state = PlaybackState( time_position=0, state='playing', tlid=tl_tracks[1].tlid) - value = self.core.playback._export_state() + value = self.core.playback._save_state() self.assertEqual(state, value) @@ -1156,7 +1156,7 @@ class TesetCorePlaybackExportRestore(BaseTest): state = PlaybackState( time_position=0, state='playing', tlid=tl_tracks[2].tlid) coverage = ['play-always'] - self.core.playback._restore_state(state, coverage) + self.core.playback._load_state(state, coverage) self.replay_events() self.assertEqual('playing', self.core.playback.get_state()) @@ -1173,7 +1173,7 @@ class TesetCorePlaybackExportRestore(BaseTest): state = PlaybackState( time_position=0, state='playing', tlid=tl_tracks[2].tlid) coverage = ['other'] - self.core.playback._restore_state(state, coverage) + self.core.playback._load_state(state, coverage) self.replay_events() self.assertEqual('stopped', self.core.playback.get_state()) @@ -1182,10 +1182,10 @@ class TesetCorePlaybackExportRestore(BaseTest): def test_import_invalid_type(self): with self.assertRaises(TypeError): - self.core.playback._restore_state(11, None) + self.core.playback._load_state(11, None) def test_import_none(self): - self.core.playback._restore_state(None, None) + self.core.playback._load_state(None, None) class TestBug1352Regression(BaseTest): diff --git a/tests/core/test_tracklist.py b/tests/core/test_tracklist.py index 5e9170b2..4cd13d1e 100644 --- a/tests/core/test_tracklist.py +++ b/tests/core/test_tracklist.py @@ -223,7 +223,7 @@ class TracklistExportRestoreTest(unittest.TestCase): random=False, next_tlid=next_tlid, tl_tracks=tl_tracks) - value = self.core.tracklist._export_state() + value = self.core.tracklist._save_state() self.assertEqual(target, value) def test_import(self): @@ -235,7 +235,7 @@ class TracklistExportRestoreTest(unittest.TestCase): next_tlid=12, tl_tracks=self.tl_tracks) coverage = ['mode', 'tracklist'] - self.core.tracklist._restore_state(target, coverage) + self.core.tracklist._load_state(target, coverage) self.assertEqual(False, self.core.tracklist.get_consume()) self.assertEqual(True, self.core.tracklist.get_repeat()) self.assertEqual(True, self.core.tracklist.get_single()) @@ -259,7 +259,7 @@ class TracklistExportRestoreTest(unittest.TestCase): next_tlid=12, tl_tracks=self.tl_tracks) coverage = ['mode'] - self.core.tracklist._restore_state(target, coverage) + self.core.tracklist._load_state(target, coverage) self.assertEqual(False, self.core.tracklist.get_consume()) self.assertEqual(True, self.core.tracklist.get_repeat()) self.assertEqual(True, self.core.tracklist.get_single()) @@ -278,7 +278,7 @@ class TracklistExportRestoreTest(unittest.TestCase): next_tlid=12, tl_tracks=self.tl_tracks) coverage = ['tracklist'] - self.core.tracklist._restore_state(target, coverage) + self.core.tracklist._load_state(target, coverage) self.assertEqual(False, self.core.tracklist.get_consume()) self.assertEqual(False, self.core.tracklist.get_repeat()) self.assertEqual(False, self.core.tracklist.get_single()) @@ -290,7 +290,7 @@ class TracklistExportRestoreTest(unittest.TestCase): def test_import_invalid_type(self): with self.assertRaises(TypeError): - self.core.tracklist._restore_state(11, None) + self.core.tracklist._load_state(11, None) def test_import_none(self): - self.core.tracklist._restore_state(None, None) + self.core.tracklist._load_state(None, None)