Fix Exception When Getting Thumbnails #3246
Conversation
This comment has been minimized.
This comment has been minimized.
|
🥷 Code experts: no user but you matched threshold 10 Jack251970 has most 👩💻 activity in the files. See details
Activity based on git-commit:
Knowledge based on git-blame: To learn more about /:\ gitStream - Visit our Docs |
|
Be a legend 🏆 by adding a before and after screenshot of the changes you made, especially if they are around UI/UX. |
📝 WalkthroughWalkthroughThe changes streamline the error handling logic in the Changes
Sequence Diagram(s)sequenceDiagram
participant Caller as Caller
participant Provider as WindowsThumbnailProvider
participant Fallback as FallbackHandler (IconOnly)
Caller->>Provider: Invoke GetHBitmap()
Provider->>Provider: Attempt image extraction
alt COMException occurs
Provider->>Provider: Catch COMException
Provider->>Fallback: Use ThumbnailOptions.IconOnly for image retrieval
else FileNotFoundException occurs
Provider->>Provider: Handle missing file scenario
end
Provider-->>Caller: Return image handle (or error)
Suggested reviewers
Poem
📜 Recent review detailsConfiguration used: CodeRabbit UI 📒 Files selected for processing (1)
🚧 Files skipped from review as they are similar to previous changes (1)
⏰ Context from checks skipped due to timeout of 90000ms (2)
Thank you for using CodeRabbit. We offer it for free to the OSS community and would appreciate your support in helping us grow. If you find it useful, would you consider giving us a shout-out on your favorite social media? 🪧 TipsChatThere are 3 ways to chat with CodeRabbit:
Note: Be mindful of the bot's finite context window. It's strongly recommended to break down tasks such as reading entire modules into smaller chunks. For a focused discussion, use review comments to chat about specific files and their changes, instead of using the PR comments. CodeRabbit Commands (Invoked using PR comments)
Other keywords and placeholders
CodeRabbit Configuration File (
|
![coderabbitai[bot]](https://avatars.githubusercontent.com/in/347564?s=60&v=4){kind=small}
There was a problem hiding this comment.
Actionable comments posted: 0
🧹 Nitpick comments (1)
Flow.Launcher.Infrastructure/Image/ThumbnailReader.cs (1)
80-89: Consider reducing code duplication and adding logging.Both catch blocks use the same fallback logic. Consider refactoring to reduce duplication and add logging for better diagnostics.
private static unsafe HBITMAP GetHBitmap(string fileName, int width, int height, ThumbnailOptions options) { // ... existing code ... try { try { imageFactory.GetImage(size, (SIIGBF)options, &hBitmap); } catch (COMException ex) { - // Fallback to IconOnly for COM exceptions - imageFactory.GetImage(size, (SIIGBF)ThumbnailOptions.IconOnly, &hBitmap); + System.Diagnostics.Debug.WriteLine($"COM exception while getting thumbnail for {fileName}: {ex.Message}"); + FallbackToIconOnly(imageFactory, size, &hBitmap); } catch (FileNotFoundException ex) { - // Fallback to IconOnly if files cannot be found - imageFactory.GetImage(size, (SIIGBF)ThumbnailOptions.IconOnly, &hBitmap); + System.Diagnostics.Debug.WriteLine($"File not found while getting thumbnail for {fileName}: {ex.Message}"); + FallbackToIconOnly(imageFactory, size, &hBitmap); } } // ... existing code ... } +private static unsafe void FallbackToIconOnly(IShellItemImageFactory imageFactory, SIZE size, HBITMAP* hBitmap) +{ + imageFactory.GetImage(size, (SIIGBF)ThumbnailOptions.IconOnly, hBitmap); +}
📜 Review details
Configuration used: CodeRabbit UI
Review profile: CHILL
Plan: Pro
📒 Files selected for processing (1)
Flow.Launcher.Infrastructure/Image/ThumbnailReader.cs(1 hunks)
⏰ Context from checks skipped due to timeout of 90000ms (2)
- GitHub Check: gitStream.cm
- GitHub Check: gitStream.cm
🔇 Additional comments (1)
Flow.Launcher.Infrastructure/Image/ThumbnailReader.cs (1)
80-84: LGTM! Simplified error handling improves robustness.The change to catch all COMExceptions and fall back to IconOnly is a good approach that will handle various COM-related failures, including issues with files in the recycle bin.
| imageFactory.GetImage(size, (SIIGBF)options, &hBitmap); | ||
| } | ||
| catch (COMException ex) when (ex.HResult == S_ExtractionFailed && options == ThumbnailOptions.ThumbnailOnly) | ||
| catch (COMException) |
There was a problem hiding this comment.
I somehow feel like you can merge this two branch with some pattern matching? like catch (Exception ex) when (ex is COMException or FileNotFoundException)
There was a problem hiding this comment.
I somehow feel like you can merge this two branch with some pattern matching? like
catch (Exception ex) when (ex is COMException or FileNotFoundException)
I can also catch some ink files with COMException when getting thumbnail for them, so I also change COMException here. (I forget how to reproduce it...)
There was a problem hiding this comment.
I somehow feel like you can merge this two branch with some pattern matching? like
catch (Exception ex) when (ex is COMException or FileNotFoundException)
Now I revert these codes.
@check-spelling-bot Report🔴 Please reviewSee the 📂 files view, the 📜action log, or 📝 job summary for details.
See ❌ Event descriptions for more information. If the flagged items are 🤯 false positivesIf items relate to a ...
|
3 participants
Fix issue in getting thumbnails function
For some files in the recycle bin, we may encounter issue like this:
This can cause:
Test