aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--src/PlaylistFile.cxx39
-rw-r--r--src/PlaylistSave.cxx25
-rw-r--r--src/PlaylistSave.hxx10
3 files changed, 36 insertions, 38 deletions
diff --git a/src/PlaylistFile.cxx b/src/PlaylistFile.cxx
index 05395da89..9d2b56eae 100644
--- a/src/PlaylistFile.cxx
+++ b/src/PlaylistFile.cxx
@@ -20,12 +20,15 @@
#include "config.h"
#include "PlaylistFile.hxx"
#include "PlaylistSave.hxx"
+#include "PlaylistError.hxx"
#include "db/PlaylistInfo.hxx"
#include "db/PlaylistVector.hxx"
#include "DetachedSong.hxx"
#include "SongLoader.hxx"
#include "Mapper.hxx"
#include "fs/io/TextFile.hxx"
+#include "fs/io/FileOutputStream.hxx"
+#include "fs/io/BufferedOutputStream.hxx"
#include "config/ConfigGlobal.hxx"
#include "config/ConfigOption.hxx"
#include "config/ConfigDefaults.hxx"
@@ -229,17 +232,18 @@ SavePlaylistFile(const PlaylistFileContents &contents, const char *utf8path,
if (path_fs.IsNull())
return false;
- FILE *file = FOpen(path_fs, FOpenMode::WriteText);
- if (file == nullptr) {
- playlist_errno(error);
+ FileOutputStream fos(path_fs, error);
+ if (!fos.IsDefined()) {
+ TranslatePlaylistError(error);
return false;
}
+ BufferedOutputStream bos(fos);
+
for (const auto &uri_utf8 : contents)
- playlist_print_uri(file, uri_utf8.c_str());
+ playlist_print_uri(bos, uri_utf8.c_str());
- fclose(file);
- return true;
+ return bos.Flush(error) && fos.Commit(error);
}
PlaylistFileContents
@@ -399,29 +403,24 @@ spl_append_song(const char *utf8path, const DetachedSong &song, Error &error)
if (path_fs.IsNull())
return false;
- FILE *file = FOpen(path_fs, FOpenMode::AppendText);
- if (file == nullptr) {
- playlist_errno(error);
- return false;
- }
-
- struct stat st;
- if (fstat(fileno(file), &st) < 0) {
- playlist_errno(error);
- fclose(file);
+ AppendFileOutputStream fos(path_fs, error);
+ if (!fos.IsDefined()) {
+ TranslatePlaylistError(error);
return false;
}
- if (st.st_size / off_t(MPD_PATH_MAX + 1) >= (off_t)playlist_max_length) {
- fclose(file);
+ if (fos.Tell() / (MPD_PATH_MAX + 1) >= playlist_max_length) {
error.Set(playlist_domain, int(PlaylistResult::TOO_LARGE),
"Stored playlist is too large");
return false;
}
- playlist_print_song(file, song);
+ BufferedOutputStream bos(fos);
- fclose(file);
+ playlist_print_song(bos, song);
+
+ if (!bos.Flush(error) || !fos.Commit(error))
+ return false;
idle_add(IDLE_STORED_PLAYLIST);
return true;
diff --git a/src/PlaylistSave.cxx b/src/PlaylistSave.cxx
index 61b4913b2..a2f48ba54 100644
--- a/src/PlaylistSave.cxx
+++ b/src/PlaylistSave.cxx
@@ -30,6 +30,8 @@
#include "fs/Traits.hxx"
#include "fs/FileSystem.hxx"
#include "fs/NarrowPath.hxx"
+#include "fs/io/FileOutputStream.hxx"
+#include "fs/io/BufferedOutputStream.hxx"
#include "util/Alloc.hxx"
#include "util/UriUtil.hxx"
#include "util/Error.hxx"
@@ -38,7 +40,7 @@
#include <string.h>
void
-playlist_print_song(FILE *file, const DetachedSong &song)
+playlist_print_song(BufferedOutputStream &os, const DetachedSong &song)
{
const char *uri_utf8 = playlist_saveAbsolutePaths
? song.GetRealURI()
@@ -46,11 +48,11 @@ playlist_print_song(FILE *file, const DetachedSong &song)
const auto uri_fs = AllocatedPath::FromUTF8(uri_utf8);
if (!uri_fs.IsNull())
- fprintf(file, "%s\n", NarrowPath(uri_fs).c_str());
+ os.Format("%s\n", NarrowPath(uri_fs).c_str());
}
void
-playlist_print_uri(FILE *file, const char *uri)
+playlist_print_uri(BufferedOutputStream &os, const char *uri)
{
auto path =
#ifdef ENABLE_DATABASE
@@ -62,7 +64,7 @@ playlist_print_uri(FILE *file, const char *uri)
AllocatedPath::FromUTF8(uri);
if (!path.IsNull())
- fprintf(file, "%s\n", NarrowPath(path).c_str());
+ os.Format("%s\n", NarrowPath(path).c_str());
}
bool
@@ -78,18 +80,19 @@ spl_save_queue(const char *name_utf8, const Queue &queue, Error &error)
return false;
}
- FILE *file = FOpen(path_fs, FOpenMode::WriteText);
-
- if (file == nullptr) {
- error.FormatErrno("Failed to open %s",
- path_fs.ToUTF8().c_str());
+ FileOutputStream fos(path_fs, error);
+ if (!fos.IsDefined()) {
+ TranslatePlaylistError(error);
return false;
}
+ BufferedOutputStream bos(fos);
+
for (unsigned i = 0; i < queue.GetLength(); i++)
- playlist_print_song(file, queue.Get(i));
+ playlist_print_song(bos, queue.Get(i));
- fclose(file);
+ if (!bos.Flush(error) || !fos.Commit(error))
+ return false;
idle_add(IDLE_STORED_PLAYLIST);
return true;
diff --git a/src/PlaylistSave.hxx b/src/PlaylistSave.hxx
index 35b88efc6..536c5c8d1 100644
--- a/src/PlaylistSave.hxx
+++ b/src/PlaylistSave.hxx
@@ -20,21 +20,17 @@
#ifndef MPD_PLAYLIST_SAVE_H
#define MPD_PLAYLIST_SAVE_H
-#include "PlaylistError.hxx"
-
-#include <stdio.h>
-
struct Queue;
struct playlist;
-struct PlayerControl;
+class BufferedOutputStream;
class DetachedSong;
class Error;
void
-playlist_print_song(FILE *file, const DetachedSong &song);
+playlist_print_song(BufferedOutputStream &os, const DetachedSong &song);
void
-playlist_print_uri(FILE *fp, const char *uri);
+playlist_print_uri(BufferedOutputStream &os, const char *uri);
/**
* Saves a queue object into a stored playlist file.