Move filesystem interfaces to the public headers directory

Makefile.am

@@ -41,6 +41,13 @@ libmedialibrary_la_HEADERS = \
 	include/medialibrary/Parser.h \
 	$(NULL)
 
+libmedialibraryfsdir = $(includedir)/filesystem
+libmedialibraryfs_HEADERS = \
+	include/medialibrary/filesystem/IDevice.h \
+	include/medialibrary/filesystem/IDirectory.h \
+	include/medialibrary/filesystem/IFile.h \
+	$(NULL)
+
 libmedialibrary_la_SOURCES = \
 	src/Album.cpp \
 	src/AlbumTrack.cpp \
@@ -96,9 +103,6 @@ libmedialibrary_la_SOURCES = \
 noinst_HEADERS = \
 	include/discoverer/IDiscoverer.h \
 	include/factory/IFileSystem.h \
-	include/filesystem/IDevice.h \
-	include/filesystem/IDirectory.h \
-	include/filesystem/IFile.h \
 	include/Fixup.h \
 	include/Types.h \
 	src/Album.h \
@@ -150,6 +154,7 @@ noinst_HEADERS = \
 	src/metadata_services/vlc/imagecompressors/IImageCompressor.h \
 	src/Movie.h \
 	src/parser/IParserService.h \
+	src/parser/IItem.h \
 	src/parser/Parser.h \
 	src/parser/ParserWorker.h \
 	src/parser/Task.h \

include/discoverer/IDiscoverer.h

@@ -25,8 +25,8 @@
 
 #include <string>
 #include "Types.h"
-#include "filesystem/IDirectory.h"
-#include "filesystem/IFile.h"
+#include "medialibrary/filesystem/IDirectory.h"
+#include "medialibrary/filesystem/IFile.h"
 #include "medialibrary/IMediaLibrary.h"
 
 namespace medialibrary

src/File.h

@@ -23,9 +23,9 @@
 #pragma once
 
 #include "medialibrary/IFile.h"
+#include "medialibrary/filesystem/IFile.h"
 #include "database/DatabaseHelpers.h"
 #include "database/SqliteConnection.h"
-#include "filesystem/IFile.h"
 #include "utils/Cache.h"
 #include "parser/Parser.h"
 

src/Folder.cpp

@@ -30,8 +30,8 @@
 #include "Media.h"
 
 #include "database/SqliteTools.h"
-#include "filesystem/IDirectory.h"
-#include "filesystem/IDevice.h"
+#include "medialibrary/filesystem/IDirectory.h"
+#include "medialibrary/filesystem/IDevice.h"
 #include "utils/Filename.h"
 
 #include <unordered_map>

src/Media.cpp

@@ -45,9 +45,9 @@
 #include "database/SqliteTools.h"
 #include "database/SqliteQuery.h"
 #include "VideoTrack.h"
-#include "filesystem/IFile.h"
-#include "filesystem/IDirectory.h"
-#include "filesystem/IDevice.h"
+#include "medialibrary/filesystem/IFile.h"
+#include "medialibrary/filesystem/IDirectory.h"
+#include "medialibrary/filesystem/IDevice.h"
 #include "utils/Filename.h"
 
 namespace medialibrary

src/MediaLibrary.cpp

@@ -72,7 +72,7 @@
 #include "factory/DeviceListerFactory.h"
 #include "factory/FileSystemFactory.h"
 #include "factory/NetworkFileSystemFactory.h"
-#include "filesystem/IDevice.h"
+#include "medialibrary/filesystem/IDevice.h"
 
 namespace medialibrary
 {

src/discoverer/FsDiscoverer.cpp

@@ -31,7 +31,7 @@
 #include <utility>
 
 #include "factory/FileSystemFactory.h"
-#include "filesystem/IDevice.h"
+#include "medialibrary/filesystem/IDevice.h"
 #include "Media.h"
 #include "File.h"
 #include "Device.h"

src/discoverer/probe/PathProbe.cpp

@@ -27,8 +27,8 @@
 #include "discoverer/probe/PathProbe.h"
 
 #include "utils/Filename.h"
-#include "filesystem/IDirectory.h"
-#include "filesystem/IFile.h"
+#include "medialibrary/filesystem/IDirectory.h"
+#include "medialibrary/filesystem/IFile.h"
 
 namespace medialibrary
 {

src/factory/FileSystemFactory.cpp

@@ -25,8 +25,8 @@
 #endif
 
 #include "factory/FileSystemFactory.h"
-#include "filesystem/IDirectory.h"
-#include "filesystem/IFile.h"
+#include "medialibrary/filesystem/IDirectory.h"
+#include "medialibrary/filesystem/IFile.h"
 #include "logging/Logger.h"
 #include "utils/Filename.h"
 

src/filesystem/common/CommonDevice.h

@@ -22,7 +22,7 @@
 
 #pragma once
 
-#include "filesystem/IDevice.h"
+#include "medialibrary/filesystem/IDevice.h"
 
 namespace medialibrary
 {

src/filesystem/common/CommonDirectory.h

@@ -22,7 +22,7 @@
 
 #pragma once
 
-#include "filesystem/IDirectory.h"
+#include "medialibrary/filesystem/IDirectory.h"
 #include "utils/Cache.h"
 
 namespace medialibrary

src/filesystem/common/CommonFile.h

@@ -22,7 +22,7 @@
 
 #pragma once
 
-#include "filesystem/IFile.h"
+#include "medialibrary/filesystem/IFile.h"
 
 namespace medialibrary
 {

src/metadata_services/MetadataParser.cpp

@@ -29,8 +29,8 @@
 #include "AlbumTrack.h"
 #include "Artist.h"
 #include "File.h"
-#include "filesystem/IDevice.h"
-#include "filesystem/IDirectory.h"
+#include "medialibrary/filesystem/IDevice.h"
+#include "medialibrary/filesystem/IDirectory.h"
 #include "Folder.h"
 #include "Genre.h"
 #include "Media.h"

src/parser/IItem.h

@@ -26,8 +26,8 @@
 #include <vector>
 #include <memory>
 
-#include "filesystem/IFile.h"
-#include "filesystem/IDirectory.h"
+#include "medialibrary/filesystem/IFile.h"
+#include "medialibrary/filesystem/IDirectory.h"
 #include "medialibrary/Types.h"
 
 namespace medialibrary

src/parser/Task.cpp

@@ -27,8 +27,8 @@
 
 #include "Task.h"
 
-#include "filesystem/IFile.h"
-#include "filesystem/IDirectory.h"
+#include "medialibrary/filesystem/IFile.h"
+#include "medialibrary/filesystem/IDirectory.h"
 #include "File.h"
 #include "Folder.h"
 #include "Playlist.h"

test/common/MediaLibraryTester.h

@@ -24,7 +24,7 @@
 
 #include "MediaLibrary.h"
 #include "Folder.h"
-#include "filesystem/IDirectory.h"
+#include "medialibrary/filesystem/IDirectory.h"
 
 using namespace medialibrary;
 

test/mocks/FileSystem.h

@@ -30,9 +30,9 @@
 #include <cstring>
 #include <system_error>
 
-#include "filesystem/IDirectory.h"
-#include "filesystem/IFile.h"
-#include "filesystem/IDevice.h"
+#include "medialibrary/filesystem/IDirectory.h"
+#include "medialibrary/filesystem/IFile.h"
+#include "medialibrary/filesystem/IDevice.h"
 #include "factory/IFileSystem.h"
 #include "utils/Filename.h"
 

test/mocks/filesystem/MockDevice.h

@@ -25,7 +25,7 @@
 #include <string>
 #include <memory>
 
-#include "filesystem/IDevice.h"
+#include "medialibrary/filesystem/IDevice.h"
 
 using namespace medialibrary;
 

test/mocks/filesystem/MockDirectory.h

@@ -25,7 +25,7 @@
 #include <string>
 #include <unordered_map>
 
-#include "filesystem/IDirectory.h"
+#include "medialibrary/filesystem/IDirectory.h"
 
 using namespace medialibrary;
 

test/mocks/filesystem/MockFile.h

@@ -24,7 +24,7 @@
 
 #include <string>
 
-#include "filesystem/IFile.h"
+#include "medialibrary/filesystem/IFile.h"
 
 using namespace medialibrary;
 

test/unittest/Tests.h

@@ -26,7 +26,7 @@
 #include "mocks/NoopCallback.h"
 #include "mocks/MockDeviceLister.h"
 #include "common/MediaLibraryTester.h"
-#include "filesystem/IDirectory.h"
+#include "medialibrary/filesystem/IDirectory.h"
 
 class Tests : public testing::Test
 {