Skip to content

Conversation

@Cheong-Lau
Copy link
Contributor

Will probably need to be rebased after #1348 is merged.

@Cheong-Lau Cheong-Lau mentioned this pull request Nov 5, 2025
@jacobgkau
Copy link
Member

#1348 has been merged, so this now needs conflicts resolved.

@jacobgkau jacobgkau requested review from a team November 5, 2025 22:36
@Cheong-Lau Cheong-Lau force-pushed the dep-freedesktop-entry-parser branch 3 times, most recently from d5b3e5b to 61a8ff2 Compare November 5, 2025 22:48
jacobgkau
jacobgkau previously approved these changes Nov 6, 2025
Copy link
Member

@jacobgkau jacobgkau left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Regression testing passed:

Basic navigation

  • Middle-click opens directory in a new tab (not focused).
  • Open two scrollable tabs. Scroll one tab, then switch to the other tab; it should not have scrolled.
  • Hover over the top item in the folder, then scroll down until it's out of view (while still hovered). On scrolling back up (with the mouse in a different position), the item should not have the hover highlight.
    • Not a regression.
  • Right-click an item in the sidebar. No visual change should occur with the rest of the items.
    • Not a regression.
  • Remove an item from the sidebar, then re-pin it.

File operations

  • Right-click -> Create a new folder, then enter it.
  • Right-click in the empty folder -> Create a new file.
  • Files can be renamed.
  • Files can be opened with non-default apps & browsing store for new apps works.
  • Normal right-click shows Move to trash option.
  • Shift right-click, and right-click followed by Shift, both show Permanently delete option.
    • Shift + right-click broken (does nothing); right-click followed by shift works. Not a regression.

Advanced navigation & view settings

  • Image and video thumbnails display in local folders.
  • Gallery preview shows with Spacebar.
  • Details pane shows with Ctrl+Spacebar.
  • Zoom in/out and reset to default zoom work.
  • Ctrl+1 and Ctrl+2 switch between list and icon view.
  • Ctrl+H shows/hides hidden files.
  • Directories can be sorted at top or inline.
  • Settings -> Theme works.
  • Settings -> Type to Search affects behavior as designed.
  • Single-click to open setting takes effect.
  • Sorting options work.
  • Cutting, copying, and pasting files works.
  • F5 reloads current directory.
  • Left sidebar can be collapsed and expanded.

External filesystems

  • Add a network drive (e.g. SFTP) and navigate into it.
  • Plug in a USB drive; able to mount, browse, and eject.

Integrations

  • Desktop icons display as expected
  • Drag-and-drop into Firefox works

@jacobgkau jacobgkau dismissed their stale review November 6, 2025 20:17

Incorrect version for some tests

Copy link
Member

@jacobgkau jacobgkau left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actually, looks like there's a regression with thumbnailing. Almost failed to catch it while I was switching back and forth between this branch and master trying to track it down.

A test WebM video is thumbnailed correctly on master, and it displays fine in this branch after upgrading. But if I remove ~/.cache/thumbnails/, then this branch fails to thumbnail the video. A PNG image is still thumbnailed properly on this branch, so the problem is format-dependent.

@Cheong-Lau
Copy link
Contributor Author

Cheong-Lau commented Nov 7, 2025

@jacobgkau I don't think that this is a regression on this PR, it does actually exist on master as well. I did a bisect and the bad commit is 5f72982 (ugh of course I broke something).

The weird part is that this commit only really contains automatically applied clippy fixes, I did very little manual intervention except for displaying Paths. I'm going to have a tough time tracking down this bug...

EDIT: found the bug (I made a typo and missed an 'a'), opened a PR at #1359. Thanks for testing this! This is now merged, so I think this can be retested now

@jackpot51 jackpot51 requested a review from jacobgkau November 12, 2025 02:03
jackpot51
jackpot51 previously approved these changes Nov 12, 2025
Copy link
Member

@jacobgkau jacobgkau left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I rebased this today. I'm still seeing a WebM file not get a thumbnail on this branch, while it gets a thumbnail after reverting to the current master branch (e053db3).

@Cheong-Lau Cheong-Lau force-pushed the dep-freedesktop-entry-parser branch from 81548e5 to ff0aecc Compare November 26, 2025 04:05
@Cheong-Lau
Copy link
Contributor Author

I can confirm, I misunderstood the API and didn't realise I still needed to use split_terminator. I've tested the video thumbnail generates now

@jackpot51
Copy link
Member

This change would likely be obsolete after #1399, so we should evaluate that one first

@Cheong-Lau
Copy link
Contributor Author

This change would likely be obsolete after #1399

freedesktop-entry-parser is still used elsewhere and can't be replaced with cosmic-mime-apps, so this PR isn't entirely obsolete. The changes in mime_app.rs definitely are though, so that PR should definitely be merged first so that I can rebase on top of it.

That should also remove the possibility of this PR breaking the thumbnailing.

@jpttrssn
Copy link
Contributor

jpttrssn commented Dec 2, 2025

FWIW, I created a PR the other week to add parsing of Thumbnailer files and Mimeapps to pop-os/freedesktop-desktop-entry#56 with the thought of replacing freedesktop-entry-parser with freedesktop-desktop-entry to keep things in house and more importantly consistent. This was before I saw that there was also a cosmic-mime-apps as well.

Might be worth eventually consolidating the parsing of these types of files to use the same underlying library to keep things consistent and I would be interested in helping out.

@Cheong-Lau
Copy link
Contributor Author

I think that's a better idea, so @jackpot51 if you agree I'll close this PR. No real reason to merge this if it'll be replaced later anyways

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants