Organize: Update collection directory ID and song path immediately

Fixes #781

src/core/filesystemmusicstorage.cpp

@@ -21,6 +21,8 @@
 
 #include "config.h"
 
+#include <optional>
+
 #include <QDir>
 #include <QFile>
 #include <QFileInfo>
@@ -35,7 +37,7 @@
 
 #include "filesystemmusicstorage.h"
 
-FilesystemMusicStorage::FilesystemMusicStorage(const QString &root) : root_(root) {}
+FilesystemMusicStorage::FilesystemMusicStorage(const QString &root, const std::optional<int> collection_directory_id) : root_(root), collection_directory_id_(collection_directory_id) {}
 
 bool FilesystemMusicStorage::CopyToStorage(const CopyJob &job) {
 

src/core/filesystemmusicstorage.h

@@ -24,21 +24,25 @@
 
 #include "config.h"
 
+#include <optional>
+
 #include <QString>
 
 #include "musicstorage.h"
 
 class FilesystemMusicStorage : public virtual MusicStorage {
  public:
-  explicit FilesystemMusicStorage(const QString &root);
+  explicit FilesystemMusicStorage(const QString &root, const std::optional<int> collection_directory_id = std::optional<int>());
 
   QString LocalPath() const override { return root_; }
+  std::optional<int> collection_directory_id() const { return collection_directory_id_; }
 
   bool CopyToStorage(const CopyJob &job) override;
   bool DeleteFromStorage(const DeleteJob &job) override;
 
  private:
   QString root_;
+  std::optional<int> collection_directory_id_;
 
   Q_DISABLE_COPY(FilesystemMusicStorage)
 };

src/core/musicstorage.h

@@ -28,6 +28,7 @@
 
 #include <functional>
 #include <memory>
+#include <optional>
 
 #include <QMetaType>
 #include <QString>
@@ -78,6 +79,7 @@ class MusicStorage {
   };
 
   virtual QString LocalPath() const { return QString(); }
+  virtual std::optional<int> collection_directory_id() const { return std::optional<int>(); }
 
   virtual TranscodeMode GetTranscodeMode() const { return Transcode_Never; }
   virtual Song::FileType GetTranscodeFormat() const { return Song::FileType_Unknown; }