You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
{{ message }}
Repository navigation
Commit 3fd8fc7
Browse filesBrowse the repository at this point in the historyBrowse files
Converter ignore lists: a player's list is never lost; recorded source matched as recorded
Second review, round 3:
- PutIgnoreListBack returns ListKept. When another program made ignore-files.txt
again meanwhile, the player's list is kept beside it as ignore-files.txt.kept-<n>;
when it can't leave the moved-aside folder, it stays there and no cleanup deletes
that folder's tree (StartCleanup, RemoveSharedData, SelfUninstall). A list that is
a link is moved as the link. The player's result says where it is.
- RecordedSourceReason compares the recorded path text (normalised) and the stored
SHA-256 with the entry; the recorded path is never opened again. An old record
without a SHA-256: the path text alone decides.
- --ignore-list is read once by the lists' bounded reader (ReadIgnoreListBytes);
the search parses those bytes.
- When every file found is ignored, the message names the first file with its list
and line and points to the log; an unreadable list's message says fix or delete it.
Tests on each cleanup path (unit tests with a seam and a private registry hive;
command-line suite with WRONGGPU_TEST_LIST_PUTBACK), retargeted source cases for
model and RR data, the 16 MB --ignore-list case.
Signed-off-by: phantoslayer21 <156617979+phantoslayer21@users.noreply.github.com>
// a bare --ignore / --ignore-list (no "=", or nothing after it): never takes the next argument as its value
515
516
if (a.has(L"ignore")) returnrefuse(L"--ignore needs its entry after an equals sign: --ignore=<full path> or --ignore=sha256=<hex>; nothing was converted");
516
517
if (a.has(L"ignore-list")) returnrefuse(L"--ignore-list needs its file: --ignore-list=<file>; nothing was converted");
517
518
for (auto& f : a.ignoreLists) {
519
+
// read once, with the lists' own bounded reader (the size is checked before anything is read); the search parses
520
+
// these bytes (LoadConvertIgnore), it does not read the file again
518
521
const wstring full = FullPath(f);
519
522
string bytes;
520
-
if (!IsFile(full) || !ReadAll(full, bytes)) returnrefuse(L"--ignore-list=" + f + L": the file can't be read (" + full + L"); nothing was converted");
523
+
wstring why;
524
+
if (!ReadIgnoreListBytes(full, bytes, why)) returnrefuse(L"--ignore-list=" + f + L": the file can't be read (" + full + L": " + why + L"); nothing was converted");
Copy file name to clipboardExpand all lines: clean/installer/src/app/ui_words.cpp
+7-3Lines changed: 7 additions & 3 deletions
Original file line number
Diff line number
Diff line change
@@ -764,9 +764,13 @@ void RemoveDataAsked() {
764
764
InformDetails(L"WrongGPU's data couldn't be removed.\n\nA file in it may be in use. Close what uses it, then try again. Nothing was removed.", kIconError, *why);
765
765
return;
766
766
}
767
-
// the ignore list stays (convert_ignore.h): said once in the toast
768
-
ShowToast(kept->empty() ? L"WrongGPU's data is removed. You can delete this portable copy once you close it."
769
-
: L"WrongGPU's data is removed; kept ignore-files.txt (your/integrators' ignore list). You can delete this portable copy once you close it.", 1);
767
+
// the ignore list stays (convert_ignore.h): said once in the toast; kept elsewhere than in place (another program's new
768
+
// list was there, or it could not be put back): where it is, in full
769
+
if (!kept->empty() && !StartsWithI(*kept, kKeptIgnoreListText))
770
+
Inform(L"WrongGPU's data is removed, but your ignore list was not put back as it was\n\n" + *kept, 1);
771
+
else
772
+
ShowToast(kept->empty() ? L"WrongGPU's data is removed. You can delete this portable copy once you close it."
773
+
: L"WrongGPU's data is removed; kept ignore-files.txt (your/integrators' ignore list). You can delete this portable copy once you close it.", 1);
770
774
StartHealth(false); // the model and RR data are gone: the status line and Settings follow
0 commit comments