Commit 3c619354 authored by Hugo Beauzée-Luyssen's avatar Hugo Beauzée-Luyssen

Move filesystem interfaces to the public headers directory

parent 917f3e03
...@@ -41,6 +41,13 @@ libmedialibrary_la_HEADERS = \ ...@@ -41,6 +41,13 @@ libmedialibrary_la_HEADERS = \
include/medialibrary/Parser.h \ include/medialibrary/Parser.h \
$(NULL) $(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 = \ libmedialibrary_la_SOURCES = \
src/Album.cpp \ src/Album.cpp \
src/AlbumTrack.cpp \ src/AlbumTrack.cpp \
...@@ -96,9 +103,6 @@ libmedialibrary_la_SOURCES = \ ...@@ -96,9 +103,6 @@ libmedialibrary_la_SOURCES = \
noinst_HEADERS = \ noinst_HEADERS = \
include/discoverer/IDiscoverer.h \ include/discoverer/IDiscoverer.h \
include/factory/IFileSystem.h \ include/factory/IFileSystem.h \
include/filesystem/IDevice.h \
include/filesystem/IDirectory.h \
include/filesystem/IFile.h \
include/Fixup.h \ include/Fixup.h \
include/Types.h \ include/Types.h \
src/Album.h \ src/Album.h \
...@@ -150,6 +154,7 @@ noinst_HEADERS = \ ...@@ -150,6 +154,7 @@ noinst_HEADERS = \
src/metadata_services/vlc/imagecompressors/IImageCompressor.h \ src/metadata_services/vlc/imagecompressors/IImageCompressor.h \
src/Movie.h \ src/Movie.h \
src/parser/IParserService.h \ src/parser/IParserService.h \
src/parser/IItem.h \
src/parser/Parser.h \ src/parser/Parser.h \
src/parser/ParserWorker.h \ src/parser/ParserWorker.h \
src/parser/Task.h \ src/parser/Task.h \
......
...@@ -25,8 +25,8 @@ ...@@ -25,8 +25,8 @@
#include <string> #include <string>
#include "Types.h" #include "Types.h"
#include "filesystem/IDirectory.h" #include "medialibrary/filesystem/IDirectory.h"
#include "filesystem/IFile.h" #include "medialibrary/filesystem/IFile.h"
#include "medialibrary/IMediaLibrary.h" #include "medialibrary/IMediaLibrary.h"
namespace medialibrary namespace medialibrary
......
...@@ -23,9 +23,9 @@ ...@@ -23,9 +23,9 @@
#pragma once #pragma once
#include "medialibrary/IFile.h" #include "medialibrary/IFile.h"
#include "medialibrary/filesystem/IFile.h"
#include "database/DatabaseHelpers.h" #include "database/DatabaseHelpers.h"
#include "database/SqliteConnection.h" #include "database/SqliteConnection.h"
#include "filesystem/IFile.h"
#include "utils/Cache.h" #include "utils/Cache.h"
#include "parser/Parser.h" #include "parser/Parser.h"
......
...@@ -30,8 +30,8 @@ ...@@ -30,8 +30,8 @@
#include "Media.h" #include "Media.h"
#include "database/SqliteTools.h" #include "database/SqliteTools.h"
#include "filesystem/IDirectory.h" #include "medialibrary/filesystem/IDirectory.h"
#include "filesystem/IDevice.h" #include "medialibrary/filesystem/IDevice.h"
#include "utils/Filename.h" #include "utils/Filename.h"
#include <unordered_map> #include <unordered_map>
......
...@@ -45,9 +45,9 @@ ...@@ -45,9 +45,9 @@
#include "database/SqliteTools.h" #include "database/SqliteTools.h"
#include "database/SqliteQuery.h" #include "database/SqliteQuery.h"
#include "VideoTrack.h" #include "VideoTrack.h"
#include "filesystem/IFile.h" #include "medialibrary/filesystem/IFile.h"
#include "filesystem/IDirectory.h" #include "medialibrary/filesystem/IDirectory.h"
#include "filesystem/IDevice.h" #include "medialibrary/filesystem/IDevice.h"
#include "utils/Filename.h" #include "utils/Filename.h"
namespace medialibrary namespace medialibrary
......
...@@ -72,7 +72,7 @@ ...@@ -72,7 +72,7 @@
#include "factory/DeviceListerFactory.h" #include "factory/DeviceListerFactory.h"
#include "factory/FileSystemFactory.h" #include "factory/FileSystemFactory.h"
#include "factory/NetworkFileSystemFactory.h" #include "factory/NetworkFileSystemFactory.h"
#include "filesystem/IDevice.h" #include "medialibrary/filesystem/IDevice.h"
namespace medialibrary namespace medialibrary
{ {
......
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
#include <utility> #include <utility>
#include "factory/FileSystemFactory.h" #include "factory/FileSystemFactory.h"
#include "filesystem/IDevice.h" #include "medialibrary/filesystem/IDevice.h"
#include "Media.h" #include "Media.h"
#include "File.h" #include "File.h"
#include "Device.h" #include "Device.h"
......
...@@ -27,8 +27,8 @@ ...@@ -27,8 +27,8 @@
#include "discoverer/probe/PathProbe.h" #include "discoverer/probe/PathProbe.h"
#include "utils/Filename.h" #include "utils/Filename.h"
#include "filesystem/IDirectory.h" #include "medialibrary/filesystem/IDirectory.h"
#include "filesystem/IFile.h" #include "medialibrary/filesystem/IFile.h"
namespace medialibrary namespace medialibrary
{ {
......
...@@ -25,8 +25,8 @@ ...@@ -25,8 +25,8 @@
#endif #endif
#include "factory/FileSystemFactory.h" #include "factory/FileSystemFactory.h"
#include "filesystem/IDirectory.h" #include "medialibrary/filesystem/IDirectory.h"
#include "filesystem/IFile.h" #include "medialibrary/filesystem/IFile.h"
#include "logging/Logger.h" #include "logging/Logger.h"
#include "utils/Filename.h" #include "utils/Filename.h"
......
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
#pragma once #pragma once
#include "filesystem/IDevice.h" #include "medialibrary/filesystem/IDevice.h"
namespace medialibrary namespace medialibrary
{ {
......
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
#pragma once #pragma once
#include "filesystem/IDirectory.h" #include "medialibrary/filesystem/IDirectory.h"
#include "utils/Cache.h" #include "utils/Cache.h"
namespace medialibrary namespace medialibrary
......
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
#pragma once #pragma once
#include "filesystem/IFile.h" #include "medialibrary/filesystem/IFile.h"
namespace medialibrary namespace medialibrary
{ {
......
...@@ -29,8 +29,8 @@ ...@@ -29,8 +29,8 @@
#include "AlbumTrack.h" #include "AlbumTrack.h"
#include "Artist.h" #include "Artist.h"
#include "File.h" #include "File.h"
#include "filesystem/IDevice.h" #include "medialibrary/filesystem/IDevice.h"
#include "filesystem/IDirectory.h" #include "medialibrary/filesystem/IDirectory.h"
#include "Folder.h" #include "Folder.h"
#include "Genre.h" #include "Genre.h"
#include "Media.h" #include "Media.h"
......
...@@ -26,8 +26,8 @@ ...@@ -26,8 +26,8 @@
#include <vector> #include <vector>
#include <memory> #include <memory>
#include "filesystem/IFile.h" #include "medialibrary/filesystem/IFile.h"
#include "filesystem/IDirectory.h" #include "medialibrary/filesystem/IDirectory.h"
#include "medialibrary/Types.h" #include "medialibrary/Types.h"
namespace medialibrary namespace medialibrary
......
...@@ -27,8 +27,8 @@ ...@@ -27,8 +27,8 @@
#include "Task.h" #include "Task.h"
#include "filesystem/IFile.h" #include "medialibrary/filesystem/IFile.h"
#include "filesystem/IDirectory.h" #include "medialibrary/filesystem/IDirectory.h"
#include "File.h" #include "File.h"
#include "Folder.h" #include "Folder.h"
#include "Playlist.h" #include "Playlist.h"
......
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
#include "MediaLibrary.h" #include "MediaLibrary.h"
#include "Folder.h" #include "Folder.h"
#include "filesystem/IDirectory.h" #include "medialibrary/filesystem/IDirectory.h"
using namespace medialibrary; using namespace medialibrary;
......
...@@ -30,9 +30,9 @@ ...@@ -30,9 +30,9 @@
#include <cstring> #include <cstring>
#include <system_error> #include <system_error>
#include "filesystem/IDirectory.h" #include "medialibrary/filesystem/IDirectory.h"
#include "filesystem/IFile.h" #include "medialibrary/filesystem/IFile.h"
#include "filesystem/IDevice.h" #include "medialibrary/filesystem/IDevice.h"
#include "factory/IFileSystem.h" #include "factory/IFileSystem.h"
#include "utils/Filename.h" #include "utils/Filename.h"
......
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
#include <string> #include <string>
#include <memory> #include <memory>
#include "filesystem/IDevice.h" #include "medialibrary/filesystem/IDevice.h"
using namespace medialibrary; using namespace medialibrary;
......
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
#include <string> #include <string>
#include <unordered_map> #include <unordered_map>
#include "filesystem/IDirectory.h" #include "medialibrary/filesystem/IDirectory.h"
using namespace medialibrary; using namespace medialibrary;
......
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
#include <string> #include <string>
#include "filesystem/IFile.h" #include "medialibrary/filesystem/IFile.h"
using namespace medialibrary; using namespace medialibrary;
......
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
#include "mocks/NoopCallback.h" #include "mocks/NoopCallback.h"
#include "mocks/MockDeviceLister.h" #include "mocks/MockDeviceLister.h"
#include "common/MediaLibraryTester.h" #include "common/MediaLibraryTester.h"
#include "filesystem/IDirectory.h" #include "medialibrary/filesystem/IDirectory.h"
class Tests : public testing::Test class Tests : public testing::Test
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment