Improve "Recover Files" UI (related issues #4130, #5513) by dacap · Pull Request #5805 · aseprite/aseprite

dacap · 2026-05-11T14:13:59Z

This PR adds the "Active Session" in the "Recover Files" tab:

When we close a sprite:

When a version of the sprite is fully backed up in disk and we close the sprite we can see both versions (the one closed still in memory with undo info, and the backed up sprite in disk):

After the file in memory is freed only the backed up data is displayed:

* Show "Active Session" with closed docs (in memory) and backups (in disk) * Show all sessions in date order (crashed and correcly closed)

aseprite-bot

clang-tidy made some suggestions

aseprite-bot · 2026-05-11T14:24:31Z

  ASSERT(doc->context() == nullptr);

  ClosedDoc closedDoc = { doc, base::current_tick() };
+  ObjectId docId = doc->id();


warning: variable 'docId' of type 'ObjectId' (aka 'unsigned int') can be declared 'const' [misc-const-correctness]

Suggested change

ObjectId docId = doc->id();

ObjectId const docId = doc->id();

aseprite-bot · 2026-05-11T14:24:32Z

-  std::unique_lock<std::mutex> lock(m_mutex);
-  m_docs.insert(m_docs.begin(), std::move(closedDoc));
+  {
+    std::unique_lock<std::mutex> lock(m_mutex);


warning: variable 'lock' of type 'std::unique_lockstd::mutex' can be declared 'const' [misc-const-correctness]

Suggested change

std::unique_lock<std::mutex> lock(m_mutex);

std::unique_lock<std::mutex> const lock(m_mutex);

aseprite-bot · 2026-05-11T14:24:32Z

+{
+  Doc* doc = nullptr;
+  {
+    std::unique_lock<std::mutex> lock(m_mutex);


warning: variable 'lock' of type 'std::unique_lockstd::mutex' can be declared 'const' [misc-const-correctness]

Suggested change

std::unique_lock<std::mutex> lock(m_mutex);

std::unique_lock<std::mutex> const lock(m_mutex);

aseprite-bot · 2026-05-11T14:24:32Z

+{
+  std::vector<crash::DocumentInfo> infos;
+  {
+    std::unique_lock<std::mutex> lock(m_mutex);


warning: variable 'lock' of type 'std::unique_lockstd::mutex' can be declared 'const' [misc-const-correctness]

Suggested change

std::unique_lock<std::mutex> lock(m_mutex);

std::unique_lock<std::mutex> const lock(m_mutex);

aseprite-bot · 2026-05-11T14:24:32Z

  bool hasClosedDocs();
  void addClosedDoc(Doc* doc);
  Doc* reopenLastClosedDoc();
+  Doc* reopenClosedDocById(const doc::ObjectId docId);


warning: parameter 'docId' is const-qualified in the function declaration; const-qualification of parameters only has an effect in function definitions [readability-avoid-const-params-in-decls]

Suggested change

Doc* reopenClosedDocById(const doc::ObjectId docId);

Doc* reopenClosedDocById(doc::ObjectId docId);

aseprite-bot · 2026-05-11T14:24:33Z

+  {
+    DATAVIEW_TRACE("DATAVIEW: onNewClosedDoc", (int)docId);
+
+    int i = parent()->getChildIndex(this);


warning: variable 'i' of type 'int' can be declared 'const' [misc-const-correctness]

Suggested change

int i = parent()->getChildIndex(this);

int const i = parent()->getChildIndex(this);

aseprite-bot · 2026-05-11T14:24:33Z

+    updateNoClosedDocVisibility();
+  }
+
+  void onArchiveClosedDoc(doc::ObjectId docId, const bool backedup) override


warning: parameter 'backedup' is unused [misc-unused-parameters]

Suggested change

void onArchiveClosedDoc(doc::ObjectId docId, const bool backedup) override

void onArchiveClosedDoc(doc::ObjectId docId, const bool /*backedup*/) override

aseprite-bot · 2026-05-11T14:24:33Z

+
+    onReopenClosedDoc(docId);
+
+    int index = clearBackups(parent());


warning: variable 'index' of type 'int' can be declared 'const' [misc-const-correctness]

Suggested change

int index = clearBackups(parent());

int const index = clearBackups(parent());

aseprite-bot · 2026-05-11T14:24:33Z

+  int countItemsInThisSection()
+  {
+    int itemsInThisSection = 0;
+    int n = int(parent()->children().size());


warning: variable 'n' of type 'int' can be declared 'const' [misc-const-correctness]

Suggested change

int n = int(parent()->children().size());

int const n = int(parent()->children().size());

aseprite-bot · 2026-05-11T14:24:33Z

 }

-void DataRecoveryView::onOpen()
+WidgetsList DataRecoveryView::selectedItems()


warning: method 'selectedItems' can be made static [readability-convert-member-functions-to-static]

src/app/ui/data_recovery_view.h:58:

- ui::WidgetsList selectedItems(); + static ui::WidgetsList selectedItems();

Gasparoken · 2026-05-12T21:00:46Z

Perfect! It works great, I like it.

The only note is: "in memory" implies that the sprite is still in RAM, which is correct, but perhaps it would be better to report "undo history" or "w/undo history" or "can undo" to express the advantages of "in memory".

dacap · 2026-05-12T23:57:44Z

The only note is: "in memory" implies that the sprite is still in RAM, which is correct, but perhaps it would be better to report "undo history" or "w/undo history" or "can undo" to express the advantages of "in memory".

I thought something similar, but I'm as #3718 is planned, the idea is that after that all backups (even the one in disk) will contain the undo information.

dacap · 2026-05-12T23:59:10Z

One thing I don't like is when both versions appear: the one in memory (with undo) and the one in disk (without undo, at the moment). So probably just hiding the one in disk while we have the one in memory would be enough to avoid confusion to the user.

Improve "Recover Files" UI (related issues aseprite#4130, aseprite#5513)

1c91623

* Show "Active Session" with closed docs (in memory) and backups (in disk) * Show all sessions in date order (crashed and correcly closed)

aseprite-bot reviewed May 11, 2026

View reviewed changes

dacap assigned Gasparoken and unassigned Gasparoken May 11, 2026

Gasparoken assigned dacap and unassigned Gasparoken May 12, 2026

	ObjectId docId = doc->id();
	ObjectId const docId = doc->id();

	std::unique_lock<std::mutex> lock(m_mutex);
	std::unique_lock<std::mutex> const lock(m_mutex);

	Doc* reopenClosedDocById(const doc::ObjectId docId);
	Doc* reopenClosedDocById(doc::ObjectId docId);

	int i = parent()->getChildIndex(this);
	int const i = parent()->getChildIndex(this);

	void onArchiveClosedDoc(doc::ObjectId docId, const bool backedup) override
	void onArchiveClosedDoc(doc::ObjectId docId, const bool /backedup/) override


		onReopenClosedDoc(docId);

		int index = clearBackups(parent());

	int index = clearBackups(parent());
	int const index = clearBackups(parent());

	int n = int(parent()->children().size());
	int const n = int(parent()->children().size());

Uh oh!

Conversation

dacap commented May 11, 2026

When we close a sprite:

When a version of the sprite is fully backed up in disk and we close the sprite we can see both versions (the one closed still in memory with undo info, and the backed up sprite in disk):

After the file in memory is freed only the backed up data is displayed:

Uh oh!

aseprite-bot left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Gasparoken commented May 12, 2026

Uh oh!

dacap commented May 12, 2026

Uh oh!

dacap commented May 12, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants