Skip to content

Commit a823d2a

Browse files
JonathanFeenstraJonathanFeenstra
authored
Ignore conflicts between hidden files (ModOrganizer2#2148)
* Ignore conflicts between hidden files * Optimize checks for .mohidden extension
1 parent b531bbf commit a823d2a

File tree

4 files changed

+114
-81
lines changed

4 files changed

+114
-81
lines changed

‎src/filetreemodel.cpp‎

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99

1010
using namespace MOBase;
1111
using namespace MOShared;
12+
namespace fs = std::filesystem;
1213

1314
// in mainwindow.cpp
1415
QString UnmanagedModName();
@@ -969,8 +970,11 @@ void FileTreeModel::updateFileItem(FileTreeItem& item, const MOShared::FileEntry
969970

970971
bool FileTreeModel::shouldShowFile(const FileEntry& file) const
971972
{
972-
if (showConflictsOnly() && (file.getAlternatives().size() == 0)) {
973-
// only conflicts should be shown, but this file is not conflicted
973+
if (showConflictsOnly() &&
974+
((file.getAlternatives().size() == 0) ||
975+
QString::fromStdWString(file.getName())
976+
.endsWith(ModInfo::s_HiddenExt, Qt::CaseInsensitive))) {
977+
// only conflicts should be shown, but this file is hidden or not conflicted
974978
return false;
975979
}
976980

@@ -979,8 +983,8 @@ bool FileTreeModel::shouldShowFile(const FileEntry& file) const
979983
return false;
980984
}
981985

982-
if (!showHiddenFiles() &&
983-
file.getName().ends_with(ModInfo::s_HiddenExt.toStdWString())) {
986+
if (!showHiddenFiles() && QString::fromStdWString(file.getName())
987+
.endsWith(ModInfo::s_HiddenExt, Qt::CaseInsensitive)) {
984988
// hidden files shouldn't be shown, but this file is hidden
985989
return false;
986990
}
@@ -991,8 +995,9 @@ bool FileTreeModel::shouldShowFile(const FileEntry& file) const
991995
bool FileTreeModel::shouldShowFolder(const DirectoryEntry& dir,
992996
const FileTreeItem* item) const
993997
{
994-
if (!showHiddenFiles() &&
995-
dir.getName().ends_with(ModInfo::s_HiddenExt.toStdWString())) {
998+
if ((!showHiddenFiles() || showConflictsOnly()) &&
999+
QString::fromStdWString(dir.getName())
1000+
.endsWith(ModInfo::s_HiddenExt, Qt::CaseInsensitive)) {
9961001
return false;
9971002
}
9981003

‎src/modinfodialogconflicts.cpp‎

Lines changed: 74 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111

1212
using namespace MOShared;
1313
using namespace MOBase;
14+
namespace fs = std::filesystem;
1415

1516
// if there are more than 50 selected items in the conflict tree, don't bother
1617
// checking whether menu items apply to them, just show all of them
@@ -110,7 +111,7 @@ bool ConflictsTab::canHandleUnmanaged() const
110111
return true;
111112
}
112113

113-
void ConflictsTab::changeItemsVisibility(QTreeView* tree, bool visible)
114+
void ConflictsTab::hideItems(QTreeView* tree)
114115
{
115116
bool changed = false;
116117
bool stop = false;
@@ -119,19 +120,16 @@ void ConflictsTab::changeItemsVisibility(QTreeView* tree, bool visible)
119120

120121
// logging
121122
{
122-
const QString action = (visible ? "unhiding" : "hiding");
123-
124123
QString files;
125124
if (n > max_small_selection)
126125
files = "a lot of";
127126
else
128127
files = QString("%1").arg(n);
129128

130-
log::debug("{} {} conflict files", action, files);
129+
log::debug("hiding {} conflict files", files);
131130
}
132131

133-
QFlags<FileRenamer::RenameFlags> flags =
134-
(visible ? FileRenamer::UNHIDE : FileRenamer::HIDE);
132+
QFlags<FileRenamer::RenameFlags> flags = FileRenamer::HIDE;
135133

136134
if (n > 1) {
137135
flags |= FileRenamer::MULTIPLE;
@@ -158,25 +156,13 @@ void ConflictsTab::changeItemsVisibility(QTreeView* tree, bool visible)
158156
return false;
159157
}
160158

161-
auto result = FileRenamer::RESULT_CANCEL;
162-
163-
if (visible) {
164-
if (!item->canUnhide()) {
165-
log::debug("cannot unhide {}, skipping", item->relativeName());
166-
return true;
167-
}
168-
169-
result = unhideFile(renamer, item->fileName());
170-
171-
} else {
172-
if (!item->canHide()) {
173-
log::debug("cannot hide {}, skipping", item->relativeName());
174-
return true;
175-
}
176-
177-
result = hideFile(renamer, item->fileName());
159+
if (!item->canHide()) {
160+
log::debug("cannot hide {}, skipping", item->relativeName());
161+
return true;
178162
}
179163

164+
auto result = hideFile(renamer, item->fileName());
165+
180166
switch (result) {
181167
case FileRenamer::RESULT_OK: {
182168
// will trigger a refresh at the end
@@ -199,7 +185,7 @@ void ConflictsTab::changeItemsVisibility(QTreeView* tree, bool visible)
199185
return true;
200186
});
201187

202-
log::debug("{} conflict files done", (visible ? "unhiding" : "hiding"));
188+
log::debug("hiding conflict files done");
203189

204190
if (changed) {
205191
log::debug("triggering refresh");
@@ -351,21 +337,12 @@ void ConflictsTab::showContextMenu(const QPoint& pos, QTreeView* tree)
351337
// hide
352338
if (actions.hide) {
353339
connect(actions.hide, &QAction::triggered, [&] {
354-
changeItemsVisibility(tree, false);
340+
hideItems(tree);
355341
});
356342

357343
menu.addAction(actions.hide);
358344
}
359345

360-
// unhide
361-
if (actions.unhide) {
362-
connect(actions.unhide, &QAction::triggered, [&] {
363-
changeItemsVisibility(tree, true);
364-
});
365-
366-
menu.addAction(actions.unhide);
367-
}
368-
369346
if (!menu.isEmpty()) {
370347
if (actions.open || actions.preview || actions.runHooked) {
371348
// bold the first option
@@ -386,7 +363,6 @@ ConflictsTab::Actions ConflictsTab::createMenuActions(QTreeView* tree)
386363
}
387364

388365
bool enableHide = true;
389-
bool enableUnhide = true;
390366
bool enableRun = true;
391367
bool enableOpen = true;
392368
bool enablePreview = true;
@@ -421,7 +397,6 @@ ConflictsTab::Actions ConflictsTab::createMenuActions(QTreeView* tree)
421397
}
422398

423399
enableHide = item->canHide();
424-
enableUnhide = item->canUnhide();
425400
enableRun = item->canRun();
426401
enableOpen = item->canOpen();
427402
enablePreview = item->canPreview(plugin());
@@ -443,19 +418,14 @@ ConflictsTab::Actions ConflictsTab::createMenuActions(QTreeView* tree)
443418
if (n <= max_small_selection) {
444419
// if the number of selected items is low, checking them to accurately
445420
// show the menu items is worth it
446-
enableHide = false;
447-
enableUnhide = false;
421+
enableHide = false;
448422

449423
forEachInSelection(tree, [&](const ConflictItem* item) {
450424
if (item->canHide()) {
451425
enableHide = true;
452426
}
453427

454-
if (item->canUnhide()) {
455-
enableUnhide = true;
456-
}
457-
458-
if (enableHide && enableUnhide && enableGoto) {
428+
if (enableHide && enableGoto) {
459429
// found all, no need to check more
460430
return false;
461431
}
@@ -487,11 +457,6 @@ ConflictsTab::Actions ConflictsTab::createMenuActions(QTreeView* tree)
487457
actions.hide = new QAction(tr("&Hide"), parentWidget());
488458
actions.hide->setEnabled(enableHide);
489459

490-
// note that it is possible for hidden files to appear if they override other
491-
// hidden files from another mod
492-
actions.unhide = new QAction(tr("&Unhide"), parentWidget());
493-
actions.unhide->setEnabled(enableUnhide);
494-
495460
if (enableGoto && n == 1) {
496461
const auto* item =
497462
model->getItem(static_cast<std::size_t>(modelSel.indexes()[0].row()));
@@ -633,8 +598,39 @@ bool GeneralConflictsTab::update()
633598

634599
if (m_tab->origin() != nullptr) {
635600
const auto rootPath = m_tab->mod().absolutePath();
601+
std::set<const DirectoryEntry*> checkedDirs;
636602

637603
for (const auto& file : m_tab->origin()->getFiles()) {
604+
if (QString::fromStdWString(file->getName())
605+
.endsWith(ModInfo::s_HiddenExt, Qt::CaseInsensitive)) {
606+
// skip hidden file conflicts
607+
continue;
608+
} else {
609+
const DirectoryEntry* parent = file->getParent();
610+
auto hidden = false;
611+
// iterate on all parent directory entries to check for .mohiddden
612+
while (parent != nullptr) {
613+
auto insertResult = checkedDirs.insert(parent);
614+
615+
if (insertResult.second == false) {
616+
// if already present break as we can assume to have checked the parents as
617+
// well
618+
break;
619+
} else {
620+
if (QString::fromStdWString(parent->getName())
621+
.endsWith(ModInfo::s_HiddenExt, Qt::CaseInsensitive)) {
622+
hidden = true;
623+
break;
624+
}
625+
parent = parent->getParent();
626+
}
627+
}
628+
if (hidden) {
629+
// skip hidden file conflicts
630+
continue;
631+
}
632+
}
633+
638634
// careful: these two strings are moved into createXItem() below
639635
QString relativeName =
640636
QDir::fromNativeSeparators(ToQString(file->getRelativePath()));
@@ -954,8 +950,38 @@ void AdvancedConflictsTab::update()
954950

955951
const auto& files = m_tab->origin()->getFiles();
956952
m_model->reserve(files.size());
953+
std::set<const DirectoryEntry*> checkedDirs;
957954

958955
for (const auto& file : files) {
956+
if (QString::fromStdWString(file->getName())
957+
.endsWith(ModInfo::s_HiddenExt, Qt::CaseInsensitive)) {
958+
// skip hidden file conflicts
959+
continue;
960+
} else {
961+
const DirectoryEntry* parent = file->getParent();
962+
auto hidden = false;
963+
// iterate on all parent directory entries to check for .mohiddden
964+
while (parent != nullptr) {
965+
auto insertResult = checkedDirs.insert(parent);
966+
967+
if (insertResult.second == false) {
968+
// if already present break as we can assume to have checked the parents as
969+
// well
970+
break;
971+
} else {
972+
if (QString::fromStdWString(parent->getName())
973+
.endsWith(ModInfo::s_HiddenExt, Qt::CaseInsensitive)) {
974+
hidden = true;
975+
break;
976+
}
977+
parent = parent->getParent();
978+
}
979+
}
980+
if (hidden) {
981+
// skip hidden file conflicts
982+
continue;
983+
}
984+
}
959985
// careful: these two strings are moved into createItem() below
960986
QString relativeName =
961987
QDir::fromNativeSeparators(ToQString(file->getRelativePath()));

‎src/modinfodialogconflicts.h‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -135,15 +135,14 @@ class ConflictsTab : public ModInfoDialogTab
135135

136136
void openItem(const ConflictItem* item, bool hooked);
137137
void previewItem(const ConflictItem* item);
138-
void changeItemsVisibility(QTreeView* tree, bool visible);
138+
void hideItems(QTreeView* tree);
139139

140140
void showContextMenu(const QPoint& pos, QTreeView* tree);
141141

142142
private:
143143
struct Actions
144144
{
145145
QAction* hide = nullptr;
146-
QAction* unhide = nullptr;
147146
QAction* open = nullptr;
148147
QAction* runHooked = nullptr;
149148
QAction* preview = nullptr;

‎src/modinfowithconflictinfo.cpp‎

Lines changed: 28 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,7 @@ ModInfoWithConflictInfo::Conflicts ModInfoWithConflictInfo::doConflictCheck() co
9898

9999
bool providesAnything = false;
100100
bool hasHiddenFiles = false;
101+
bool hasVisibleFiles = false;
101102

102103
std::vector<int> dataIDs;
103104
if (m_Core.directoryStructure()->originExists(L"data")) {
@@ -110,8 +111,7 @@ ModInfoWithConflictInfo::Conflicts ModInfoWithConflictInfo::doConflictCheck() co
110111
}
111112
}
112113

113-
std::wstring name = ToWString(this->name());
114-
const std::wstring hideExt = ToWString(ModInfo::s_HiddenExt);
114+
std::wstring name = ToWString(this->name());
115115

116116
if (m_Core.directoryStructure()->originExists(name)) {
117117
FilesOrigin& origin = m_Core.directoryStructure()->getOriginByName(name);
@@ -120,36 +120,39 @@ ModInfoWithConflictInfo::Conflicts ModInfoWithConflictInfo::doConflictCheck() co
120120

121121
// for all files in this origin
122122
for (FileEntryPtr file : files) {
123+
if (QString::fromStdWString(file->getName())
124+
.endsWith(ModInfo::s_HiddenExt, Qt::CaseInsensitive)) {
125+
hasHiddenFiles = true;
126+
// skip hidden file conflicts
127+
continue;
128+
} else {
129+
const DirectoryEntry* parent = file->getParent();
130+
auto hidden = false;
123131

124-
// skip hiidden file check if already found one
125-
if (!hasHiddenFiles) {
126-
const fs::path nameAsPath(file->getName());
127-
128-
if (nameAsPath.extension().wstring().compare(hideExt) == 0) {
129-
hasHiddenFiles = true;
130-
} else {
131-
const DirectoryEntry* parent = file->getParent();
132-
133-
// iterate on all parent direEntries to check for .mohiddden
134-
while (parent != nullptr) {
135-
auto insertResult = checkedDirs.insert(parent);
132+
// iterate on all parent directory entries to check for .mohiddden
133+
while (parent != nullptr) {
134+
auto insertResult = checkedDirs.insert(parent);
136135

137-
if (insertResult.second == false) {
138-
// if already present break as we can assume to have checked the parents
139-
// as well
136+
if (insertResult.second == false) {
137+
// if already present break as we can assume to have checked the parents as
138+
// well
139+
break;
140+
} else {
141+
if (QString::fromStdWString(parent->getName())
142+
.endsWith(ModInfo::s_HiddenExt, Qt::CaseInsensitive)) {
143+
hasHiddenFiles = hidden = true;
140144
break;
141-
} else {
142-
const fs::path dirPath(parent->getName());
143-
if (dirPath.extension().wstring().compare(hideExt) == 0) {
144-
hasHiddenFiles = true;
145-
break;
146-
}
147-
parent = parent->getParent();
148145
}
146+
parent = parent->getParent();
149147
}
150148
}
149+
if (hidden) {
150+
// skip hidden file conflicts
151+
continue;
152+
}
151153
}
152154

155+
hasVisibleFiles = true;
153156
auto alternatives = file->getAlternatives();
154157
if ((alternatives.size() == 0) ||
155158
std::find(dataIDs.begin(), dataIDs.end(), alternatives.back().originID()) !=
@@ -223,7 +226,7 @@ ModInfoWithConflictInfo::Conflicts ModInfoWithConflictInfo::doConflictCheck() co
223226
}
224227

225228
if (files.size() != 0) {
226-
if (!providesAnything)
229+
if (hasVisibleFiles && !providesAnything)
227230
conflicts.m_CurrentConflictState = CONFLICT_REDUNDANT;
228231
else if (!conflicts.m_OverwriteList.empty() &&
229232
!conflicts.m_OverwrittenList.empty())

0 commit comments

Comments
 (0)