@@ -2057,47 +2057,3 @@ std::vector<Mapping> OrganizerCore::fileMapping(const QString& profileName,
20572057
20582058 return result;
20592059}
2060-
2061- std::vector<Mapping> OrganizerCore::fileMapping (const QString& dataPath,
2062- const QString& relPath,
2063- const DirectoryEntry* base,
2064- const DirectoryEntry* directoryEntry,
2065- int createDestination)
2066- {
2067- std::vector<Mapping> result;
2068-
2069- for (FileEntryPtr current : directoryEntry->getFiles ()) {
2070- bool isArchive = false ;
2071- int origin = current->getOrigin (isArchive);
2072- if (isArchive || (origin == 0 )) {
2073- continue ;
2074- }
2075-
2076- QString originPath = QString::fromStdWString (base->getOriginByID (origin).getPath ());
2077- QString fileName = QString::fromStdWString (current->getName ());
2078- // QString fileName = ToQString(current->getName());
2079- QString source = originPath + relPath + fileName;
2080- QString target = dataPath + relPath + fileName;
2081- if (source != target) {
2082- result.push_back ({source, target, false , false });
2083- }
2084- }
2085-
2086- // recurse into subdirectories
2087- for (const auto & d : directoryEntry->getSubDirectories ()) {
2088- int origin = d->anyOrigin ();
2089-
2090- QString originPath = QString::fromStdWString (base->getOriginByID (origin).getPath ());
2091- QString dirName = QString::fromStdWString (d->getName ());
2092- QString source = originPath + relPath + dirName;
2093- QString target = dataPath + relPath + dirName;
2094-
2095- bool writeDestination = (base == directoryEntry) && (origin == createDestination);
2096-
2097- result.push_back ({source, target, true , writeDestination});
2098- std::vector<Mapping> subRes =
2099- fileMapping (dataPath, relPath + dirName + " \\ " , base, d, createDestination);
2100- result.insert (result.end (), subRes.begin (), subRes.end ());
2101- }
2102- return result;
2103- }
0 commit comments