projects
/
dcpomatic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
7d33e1b
)
More debugging.
author
Carl Hetherington
<cth@carlh.net>
Sat, 17 Jun 2023 20:30:16 +0000
(22:30 +0200)
committer
Carl Hetherington
<cth@carlh.net>
Sat, 17 Jun 2023 21:58:11 +0000
(23:58 +0200)
src/lib/find_missing.cc
patch
|
blob
|
history
diff --git
a/src/lib/find_missing.cc
b/src/lib/find_missing.cc
index edf649f5b303e99faea4dfb1c7d54a8ceaff047a..9414561448bd084fcd08fbc9e9d533c1c86db845 100644
(file)
--- a/
src/lib/find_missing.cc
+++ b/
src/lib/find_missing.cc
@@
-45,11
+45,15
@@
search (Replacements& replacement_paths, boost::filesystem::path directory, int
for (auto& replacement: replacement_paths) {
for (auto& path: replacement.second) {
if (!boost::filesystem::exists(path) && path.filename() == candidate.path().filename()) {
for (auto& replacement: replacement_paths) {
for (auto& path: replacement.second) {
if (!boost::filesystem::exists(path) && path.filename() == candidate.path().filename()) {
+ LOG_GENERAL("Accept %1", candidate.path());
path = candidate.path();
path = candidate.path();
+ } else {
+ LOG_GENERAL("Reject %1", candidate.path());
}
}
}
} else if (boost::filesystem::is_directory(candidate.path()) && depth <= 2) {
}
}
}
} else if (boost::filesystem::is_directory(candidate.path()) && depth <= 2) {
+ LOG_GENERAL("Recurse into %1", candidate);
search (replacement_paths, candidate, depth + 1);
} else {
LOG_GENERAL("Candidate was ignored; depth=%1", candidate.path().string());
search (replacement_paths, candidate, depth + 1);
} else {
LOG_GENERAL("Candidate was ignored; depth=%1", candidate.path().string());
@@
-85,7
+89,13
@@
dcpomatic::find_missing (vector<shared_ptr<Content>> content_to_fix, boost::file
for (auto content: content_to_fix) {
auto const& repl = replacement_paths[content];
bool const replacements_exist = std::find_if(repl.begin(), repl.end(), [](path p) { return !exists(p); }) == repl.end();
for (auto content: content_to_fix) {
auto const& repl = replacement_paths[content];
bool const replacements_exist = std::find_if(repl.begin(), repl.end(), [](path p) { return !exists(p); }) == repl.end();
+ LOG_GENERAL("replacements_exist? %1", replacements_exist);
+ LOG_GENERAL("digest match? %1", simple_digest(replacement_paths[content]) == content->digest());
if (replacements_exist && simple_digest(replacement_paths[content]) == content->digest()) {
if (replacements_exist && simple_digest(replacement_paths[content]) == content->digest()) {
+ LOG_GENERAL_NC("Setting content paths:");
+ for (auto const& i: repl) {
+ LOG_GENERAL(" %1", i);
+ }
content->set_paths (repl);
}
}
content->set_paths (repl);
}
}