expanduser() in hooke.playlist.load().

[hooke.git] / hooke / playlist.py

diff --git a/hooke/playlist.py b/hooke/playlist.py
index 1543b9f63e617884e033ccfba5cc758148e28dce..a120aba710ec8fc69487cc5bf942c6bc0490e13b 100644 (file)
--- a/hooke/playlist.py
+++ b/hooke/playlist.py
@@ -463,8 +463,10 @@ class FilePlaylist (Playlist):
         self._relative_curve_paths = self.relative_curve_paths
         self.update_curve_paths()
         self._relative_curve_paths = rcp
-
+        digest = self._digest
+        self._digest = None  # don't save the digest (recursive file).
         yaml_string = yaml.dump(self, allow_unicode=True)
+        self._digest = digest
         self.update_curve_paths()
         return ('# Hooke playlist version %s\n' % self.version) + yaml_string
 
@@ -570,7 +572,7 @@ def from_string(string):
 def load(path=None, drivers=None, identify=True, hooke=None):
     """Load a playlist from a file.
     """
-    path = playlist_path(path)
+    path = os.path.expanduser(playlist_path(path))
     with open(path, 'r') as f:
         text = f.read()
     playlist = from_string(text)