Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Open sidebar
VideoLAN
medialibrary
Commits
3c619354
Commit
3c619354
authored
Jun 04, 2018
by
Hugo Beauzée-Luyssen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Move filesystem interfaces to the public headers directory
parent
917f3e03
Changes
24
Hide whitespace changes
Inline
Side-by-side
Showing
24 changed files
with
39 additions
and
34 deletions
+39
-34
Makefile.am
Makefile.am
+8
-3
include/discoverer/IDiscoverer.h
include/discoverer/IDiscoverer.h
+2
-2
include/medialibrary/filesystem/IDevice.h
include/medialibrary/filesystem/IDevice.h
+0
-0
include/medialibrary/filesystem/IDirectory.h
include/medialibrary/filesystem/IDirectory.h
+0
-0
include/medialibrary/filesystem/IFile.h
include/medialibrary/filesystem/IFile.h
+0
-0
src/File.h
src/File.h
+1
-1
src/Folder.cpp
src/Folder.cpp
+2
-2
src/Media.cpp
src/Media.cpp
+3
-3
src/MediaLibrary.cpp
src/MediaLibrary.cpp
+1
-1
src/discoverer/FsDiscoverer.cpp
src/discoverer/FsDiscoverer.cpp
+1
-1
src/discoverer/probe/PathProbe.cpp
src/discoverer/probe/PathProbe.cpp
+2
-2
src/factory/FileSystemFactory.cpp
src/factory/FileSystemFactory.cpp
+2
-2
src/filesystem/common/CommonDevice.h
src/filesystem/common/CommonDevice.h
+1
-1
src/filesystem/common/CommonDirectory.h
src/filesystem/common/CommonDirectory.h
+1
-1
src/filesystem/common/CommonFile.h
src/filesystem/common/CommonFile.h
+1
-1
src/metadata_services/MetadataParser.cpp
src/metadata_services/MetadataParser.cpp
+2
-2
src/parser/IItem.h
src/parser/IItem.h
+2
-2
src/parser/Task.cpp
src/parser/Task.cpp
+2
-2
test/common/MediaLibraryTester.h
test/common/MediaLibraryTester.h
+1
-1
test/mocks/FileSystem.h
test/mocks/FileSystem.h
+3
-3
test/mocks/filesystem/MockDevice.h
test/mocks/filesystem/MockDevice.h
+1
-1
test/mocks/filesystem/MockDirectory.h
test/mocks/filesystem/MockDirectory.h
+1
-1
test/mocks/filesystem/MockFile.h
test/mocks/filesystem/MockFile.h
+1
-1
test/unittest/Tests.h
test/unittest/Tests.h
+1
-1
No files found.
Makefile.am
View file @
3c619354
...
...
@@ -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
View file @
3c619354
...
...
@@ -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
...
...
include/filesystem/IDevice.h
→
include/
medialibrary/
filesystem/IDevice.h
View file @
3c619354
File moved
include/filesystem/IDirectory.h
→
include/
medialibrary/
filesystem/IDirectory.h
View file @
3c619354
File moved
include/filesystem/IFile.h
→
include/
medialibrary/
filesystem/IFile.h
View file @
3c619354
File moved
src/File.h
View file @
3c619354
...
...
@@ -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
View file @
3c619354
...
...
@@ -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
View file @
3c619354
...
...
@@ -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
View file @
3c619354
...
...
@@ -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
View file @
3c619354
...
...
@@ -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
View file @
3c619354
...
...
@@ -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
View file @
3c619354
...
...
@@ -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
View file @
3c619354
...
...
@@ -22,7 +22,7 @@
#pragma once
#include "filesystem/IDevice.h"
#include "
medialibrary/
filesystem/IDevice.h"
namespace
medialibrary
{
...
...
src/filesystem/common/CommonDirectory.h
View file @
3c619354
...
...
@@ -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
View file @
3c619354
...
...
@@ -22,7 +22,7 @@
#pragma once
#include "filesystem/IFile.h"
#include "
medialibrary/
filesystem/IFile.h"
namespace
medialibrary
{
...
...
src/metadata_services/MetadataParser.cpp
View file @
3c619354
...
...
@@ -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
View file @
3c619354
...
...
@@ -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
View file @
3c619354
...
...
@@ -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
View file @
3c619354
...
...
@@ -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
View file @
3c619354
...
...
@@ -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
View file @
3c619354
...
...
@@ -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
View file @
3c619354
...
...
@@ -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
View file @
3c619354
...
...
@@ -24,7 +24,7 @@
#include <string>
#include "filesystem/IFile.h"
#include "
medialibrary/
filesystem/IFile.h"
using
namespace
medialibrary
;
...
...
test/unittest/Tests.h
View file @
3c619354
...
...
@@ -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
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment