SongUpdate: add UpdateFileInArchive(ArchiveFile&)

2 files changed, 47 insertions, 0 deletions

diff --git a/src/SongUpdate.cxx b/src/SongUpdate.cxx
index a18209048..71e5ba3b1 100644
--- a/src/SongUpdate.cxx
+++ b/src/SongUpdate.cxx
@@ -106,6 +106,47 @@ Song::UpdateFile(Storage &storage)
 
 #ifdef ENABLE_ARCHIVE
 
+Song *
+Song::LoadFromArchive(ArchiveFile &archive, const char *name_utf8,
+		      Directory &parent)
+{
+	assert(!uri_has_scheme(name_utf8));
+	assert(strchr(name_utf8, '\n') == nullptr);
+
+	Song *song = NewFile(name_utf8, parent);
+
+	if (!song->UpdateFileInArchive(archive)) {
+		song->Free();
+		return nullptr;
+	}
+
+	return song;
+}
+
+bool
+Song::UpdateFileInArchive(ArchiveFile &archive)
+{
+	assert(parent != nullptr);
+	assert(parent->device == DEVICE_INARCHIVE);
+
+	std::string path_utf8(uri);
+
+	for (const Directory *directory = parent;
+	     directory->parent != nullptr &&
+		     directory->parent->device == DEVICE_INARCHIVE;
+	     directory = directory->parent) {
+		path_utf8.insert(path_utf8.begin(), '/');
+		path_utf8.insert(0, directory->GetName());
+	}
+
+	TagBuilder tag_builder;
+	if (!tag_archive_scan(archive, path_utf8.c_str(), tag_builder))
+		return false;
+
+	tag_builder.Commit(tag);
+	return true;
+}
+
 bool
 Song::UpdateFileInArchive(const Storage &storage)
 {
diff --git a/src/db/plugins/simple/Song.hxx b/src/db/plugins/simple/Song.hxx
index c83bbace0..349aafb5c 100644
--- a/src/db/plugins/simple/Song.hxx
+++ b/src/db/plugins/simple/Song.hxx
@@ -36,6 +36,7 @@ struct LightSong;
 struct Directory;
 class DetachedSong;
 class Storage;
+class ArchiveFile;
 
 /**
  * A song file inside the configured music directory.  Internal
@@ -112,6 +113,11 @@ struct Song {
 	bool UpdateFile(Storage &storage);
 
 #ifdef ENABLE_ARCHIVE
+	static Song *LoadFromArchive(ArchiveFile &archive,
+				     const char *name_utf8,
+				     Directory &parent);
+	bool UpdateFileInArchive(ArchiveFile &archive);
+
 	bool UpdateFileInArchive(const Storage &storage);
 #endif