mapper: new song-to-filesystem mapper library

The mapper library maps directory and song objects to file system
paths.  With this central library, the code mixture in path.c should
be cleaned up, and we will be able to add neat features like aliasing.

1 files changed, 14 insertions, 8 deletions

diff --git a/src/playlist_save.c b/src/playlist_save.c
index 98979e2a2..55cd6bd87 100644
--- a/src/playlist_save.c
+++ b/src/playlist_save.c
@@ -19,21 +19,25 @@
 #include "playlist_save.h"
 #include "playlist.h"
 #include "song.h"
+#include "mapper.h"
 #include "path.h"
 #include "ls.h"
+#include "database.h"
 
 void
 playlist_print_song(FILE *file, const struct song *song)
 {
 	char tmp1[MPD_PATH_MAX], tmp2[MPD_PATH_MAX];
 
-	song_get_url(song, tmp1);
-	utf8_to_fs_charset(tmp2, tmp1);
-
-	if (playlist_saveAbsolutePaths && song_is_file(song))
-		fprintf(file, "%s\n", rmp2amp_r(tmp2, tmp2));
-	else
+	if (playlist_saveAbsolutePaths && song_is_file(song)) {
+		const char *path = map_song_fs(song, tmp1);
+		if (path != NULL)
+			fprintf(file, "%s\n", path);
+	} else {
+		song_get_url(song, tmp1);
+		utf8_to_fs_charset(tmp2, tmp1);
 		fprintf(file, "%s\n", tmp2);
+	}
 }
 
 void
@@ -42,8 +46,10 @@ playlist_print_uri(FILE *file, const char *uri)
 	char tmp[MPD_PATH_MAX];
 	const char *s;
 
-	s = utf8_to_fs_charset(tmp, uri);
 	if (playlist_saveAbsolutePaths && !isValidRemoteUtf8Url(s))
-		s = rmp2amp_r(tmp, s);
+		s = map_directory_child_fs(db_get_root(), uri, tmp);
+	else
+		s = utf8_to_fs_charset(tmp, uri);
+
 	fprintf(file, "%s\n", s);
 }