Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
VideoLAN
medialibrary
Commits
b48568c1
Commit
b48568c1
authored
Dec 29, 2015
by
Hugo Beauzée-Luyssen
Browse files
FsDiscoverer: Rename some variables for clarity
parent
3750a1ce
Changes
2
Hide whitespace changes
Inline
Side-by-side
src/discoverer/FsDiscoverer.cpp
View file @
b48568c1
...
...
@@ -108,12 +108,12 @@ void FsDiscoverer::checkDevices()
}
}
bool
FsDiscoverer
::
checkSubfolders
(
fs
::
IDirectory
&
f
older
,
Folder
&
parentFolder
,
const
std
::
vector
<
std
::
shared_ptr
<
Folder
>>
blacklist
)
const
bool
FsDiscoverer
::
checkSubfolders
(
fs
::
IDirectory
&
parentF
older
Fs
,
Folder
&
parentFolder
,
const
std
::
vector
<
std
::
shared_ptr
<
Folder
>>
blacklist
)
const
{
// Load the folders we already know of:
LOG_INFO
(
"Checking for modifications in "
,
f
older
.
path
()
);
LOG_INFO
(
"Checking for modifications in "
,
parentF
older
Fs
.
path
()
);
auto
subFoldersInDB
=
Folder
::
fetchAll
(
m_dbConn
,
parentFolder
.
id
()
);
for
(
const
auto
&
subFolderPath
:
f
older
.
dirs
()
)
for
(
const
auto
&
subFolderPath
:
parentF
older
Fs
.
dirs
()
)
{
auto
subFolder
=
m_fsFactory
->
createDirectory
(
subFolderPath
);
if
(
subFolder
==
nullptr
)
...
...
@@ -149,24 +149,24 @@ bool FsDiscoverer::checkSubfolders( fs::IDirectory& folder, Folder& parentFolder
LOG_INFO
(
"Folder "
,
f
->
path
(),
" not found in FS, deleting it"
);
m_ml
->
deleteFolder
(
f
.
get
()
);
}
LOG_INFO
(
"Done checking subfolders in "
,
f
older
.
path
()
);
LOG_INFO
(
"Done checking subfolders in "
,
parentF
older
Fs
.
path
()
);
return
true
;
}
void
FsDiscoverer
::
checkFiles
(
fs
::
IDirectory
&
f
older
,
Folder
&
parentFolder
)
const
void
FsDiscoverer
::
checkFiles
(
fs
::
IDirectory
&
parentF
older
Fs
,
Folder
&
parentFolder
)
const
{
LOG_INFO
(
"Checking file in "
,
f
older
.
path
()
);
LOG_INFO
(
"Checking file in "
,
parentF
older
Fs
.
path
()
);
static
const
std
::
string
req
=
"SELECT * FROM "
+
policy
::
MediaTable
::
Name
+
" WHERE folder_id = ?"
;
auto
files
=
Media
::
fetchAll
<
Media
>
(
m_dbConn
,
req
,
parentFolder
.
id
()
);
for
(
const
auto
&
filePath
:
f
older
.
files
()
)
for
(
const
auto
&
filePath
:
parentF
older
Fs
.
files
()
)
{
auto
it
=
std
::
find_if
(
begin
(
files
),
end
(
files
),
[
filePath
](
const
std
::
shared_ptr
<
IMedia
>&
f
)
{
return
f
->
mrl
()
==
filePath
;
});
if
(
it
==
end
(
files
)
)
{
m_ml
->
addFile
(
filePath
,
parentFolder
,
f
older
);
m_ml
->
addFile
(
filePath
,
parentFolder
,
parentF
older
Fs
);
continue
;
}
auto
file
=
m_fsFactory
->
createFile
(
filePath
);
...
...
@@ -178,7 +178,7 @@ void FsDiscoverer::checkFiles( fs::IDirectory& folder, Folder& parentFolder ) co
}
LOG_INFO
(
"Forcing file refresh "
,
filePath
);
m_ml
->
deleteFile
(
(
*
it
).
get
()
);
m_ml
->
addFile
(
filePath
,
parentFolder
,
f
older
);
m_ml
->
addFile
(
filePath
,
parentFolder
,
parentF
older
Fs
);
files
.
erase
(
it
);
}
for
(
auto
file
:
files
)
...
...
@@ -186,7 +186,7 @@ void FsDiscoverer::checkFiles( fs::IDirectory& folder, Folder& parentFolder ) co
LOG_INFO
(
"File "
,
file
->
mrl
(),
" not found on filesystem, deleting it"
);
m_ml
->
deleteFile
(
file
.
get
()
);
}
LOG_INFO
(
"Done checking files "
,
f
older
.
path
()
);
LOG_INFO
(
"Done checking files "
,
parentF
older
Fs
.
path
()
);
}
std
::
vector
<
std
::
shared_ptr
<
Folder
>
>
FsDiscoverer
::
blacklist
()
const
...
...
src/discoverer/FsDiscoverer.h
View file @
b48568c1
...
...
@@ -40,7 +40,7 @@ public:
private:
bool
checkSubfolders
(
fs
::
IDirectory
&
folder
,
Folder
&
parentFolder
,
const
std
::
vector
<
std
::
shared_ptr
<
Folder
>>
blacklist
)
const
;
void
checkFiles
(
fs
::
IDirectory
&
f
older
,
Folder
&
parentFolder
)
const
;
void
checkFiles
(
fs
::
IDirectory
&
parentF
older
Fs
,
Folder
&
parentFolder
)
const
;
std
::
vector
<
std
::
shared_ptr
<
Folder
>>
blacklist
()
const
;
bool
isBlacklisted
(
const
fs
::
IDirectory
&
directory
,
const
std
::
vector
<
std
::
shared_ptr
<
Folder
>>&
blacklist
)
const
;
bool
addFolder
(
fs
::
IDirectory
&
folder
,
Folder
*
parentFolder
,
const
std
::
vector
<
std
::
shared_ptr
<
Folder
>
>&
blacklist
)
const
;
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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