Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix non-default wallpaper handling #24

Merged
merged 6 commits into from
Jan 28, 2025
Merged

Fix non-default wallpaper handling #24

merged 6 commits into from
Jan 28, 2025

Conversation

NeonDaniel
Copy link
Member

@NeonDaniel NeonDaniel commented Jan 28, 2025

#22 introduced a breaking change where non-default wallpaper files were not loaded by this plugin. It also uncovered an existing issue where an unknown wallpaper being set would break rotation. This PR prevents overwriting existing wallpapers with defaults in the event of a name collision and also ensures non-default wallpapers are loaded by the plugin

Summary by CodeRabbit

  • New Features

    • Enhanced type safety for wallpaper management methods
    • Improved wallpaper collection handling logic
  • Bug Fixes

    • Added robust error handling for wallpaper change scenarios
    • Optimized wallpaper copying process with better file existence checks
  • Refactor

    • Updated method signatures to support more precise type hinting

Copy link

coderabbitai bot commented Jan 28, 2025

Walkthrough

The pull request introduces improvements to the wallpaper management plugin, focusing on type hinting, wallpaper collection handling, and error robustness. The changes enhance the WallpaperManager class by updating method signatures, refining the wallpaper copying process, and adding more comprehensive logging. The modifications aim to make the wallpaper management more reliable and type-safe, with specific improvements to how wallpapers are collected, indexed, and handled during changes.

Changes

File Change Summary
ovos_PHAL_plugin_wallpaper_manager/__init__.py - Added Optional type import
- Updated get_wallpaper_idx method return type to Optional[int]
- Improved populate_wallpapers method to streamline wallpaper copying and check for existing wallpapers
- Added warning log in handle_change_wallpaper for unexpected wallpaper states

Possibly related PRs

Suggested labels

feature

Poem

🐰 Wallpapers dancing, bits in flight,
Type hints sparkling, code so bright!
Copying files with rabbit's grace,
Logging warnings in every space,
A plugin's magic takes its might! 🖼️


📜 Recent review details

Configuration used: CodeRabbit UI
Review profile: CHILL
Plan: Pro

📥 Commits

Reviewing files that changed from the base of the PR and between 886b464 and ffb2712.

📒 Files selected for processing (1)
  • ovos_PHAL_plugin_wallpaper_manager/__init__.py (4 hunks)
🚧 Files skipped from review as they are similar to previous changes (1)
  • ovos_PHAL_plugin_wallpaper_manager/init.py

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?

❤️ Share
🪧 Tips

Chat

There are 3 ways to chat with CodeRabbit:

  • Review comments: Directly reply to a review comment made by CodeRabbit. Example:
    • I pushed a fix in commit <commit_id>, please review it.
    • Generate unit testing code for this file.
    • Open a follow-up GitHub issue for this discussion.
  • Files and specific lines of code (under the "Files changed" tab): Tag @coderabbitai in a new review comment at the desired location with your query. Examples:
    • @coderabbitai generate unit testing code for this file.
    • @coderabbitai modularize this function.
  • PR comments: Tag @coderabbitai in a new PR comment to ask questions about the PR branch. For the best results, please provide a very specific query, as very limited context is provided in this mode. Examples:
    • @coderabbitai gather interesting stats about this repository and render them as a table. Additionally, render a pie chart showing the language distribution in the codebase.
    • @coderabbitai read src/utils.ts and generate unit testing code.
    • @coderabbitai read the files in the src/scheduler package and generate a class diagram using mermaid and a README in the markdown format.
    • @coderabbitai help me debug CodeRabbit configuration file.

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)

  • @coderabbitai pause to pause the reviews on a PR.
  • @coderabbitai resume to resume the paused reviews.
  • @coderabbitai review to trigger an incremental review. This is useful when automatic reviews are disabled for the repository.
  • @coderabbitai full review to do a full review from scratch and review all the files again.
  • @coderabbitai summary to regenerate the summary of the PR.
  • @coderabbitai generate docstrings to generate docstrings for this PR. (Beta)
  • @coderabbitai resolve resolve all the CodeRabbit review comments.
  • @coderabbitai configuration to show the current CodeRabbit configuration for the repository.
  • @coderabbitai help to get help.

Other keywords and placeholders

  • Add @coderabbitai ignore anywhere in the PR description to prevent this PR from being reviewed.
  • Add @coderabbitai summary to generate the high-level summary at a specific location in the PR description.
  • Add @coderabbitai anywhere in the PR title to generate the title automatically.

CodeRabbit Configuration File (.coderabbit.yaml)

  • You can programmatically configure CodeRabbit by adding a .coderabbit.yaml file to the root of your repository.
  • Please see the configuration documentation for more information.
  • If your editor has YAML language server enabled, you can add the path at the top of this file to enable auto-completion and validation: # yaml-language-server: $schema=https://coderabbit.ai/integrations/schema.v2.json

Documentation and Community

  • Visit our Documentation for detailed information on how to use CodeRabbit.
  • Join our Discord Community to get help, request features, and share feedback.
  • Follow us on X/Twitter for updates and announcements.

@NeonDaniel NeonDaniel marked this pull request as ready for review January 28, 2025 01:28
@NeonDaniel NeonDaniel requested a review from JarbasAl January 28, 2025 01:28
Copy link

@coderabbitai coderabbitai bot left a comment

Choose a reason for hiding this comment

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

Actionable comments posted: 0

🧹 Nitpick comments (1)
ovos_PHAL_plugin_wallpaper_manager/__init__.py (1)

306-312: Consider improving unknown wallpaper handling.

When the current wallpaper isn't found in the collection, setting current_idx = final_idx means the next change will always start from the beginning. This might be confusing for users as it creates an unexpected jump in the rotation sequence.

Consider this alternative approach:

-                current_idx = final_idx
+                current_idx = -1  # Start from beginning on next change

This makes the behavior more intuitive as it follows the natural sequence of wallpapers.

📜 Review details

Configuration used: CodeRabbit UI
Review profile: CHILL
Plan: Pro

📥 Commits

Reviewing files that changed from the base of the PR and between 9ba79ac and 886b464.

📒 Files selected for processing (1)
  • ovos_PHAL_plugin_wallpaper_manager/__init__.py (4 hunks)
🔇 Additional comments (4)
ovos_PHAL_plugin_wallpaper_manager/__init__.py (4)

4-4: LGTM! Type hinting import addition.

The addition of Optional to the typing imports properly supports the type hints added to the get_wallpaper_idx method.


80-92: Great security improvements in wallpaper copying logic!

The changes effectively prevent overwriting existing wallpapers and add protection against path traversal attacks:

  1. Path validation before copying
  2. Existence check before copying
  3. Improved debug logging

This aligns perfectly with the PR objective of preventing default wallpapers from overwriting existing ones.


96-99: Improved wallpaper collection handling!

The collection now properly includes all valid wallpapers from the storage directory, ensuring that both default and non-default wallpapers are loaded correctly. This directly addresses the PR objective of fixing non-default wallpaper handling.


Line range hint 290-295: LGTM! Clear return type specification.

The addition of Optional[int] return type hint improves code clarity and IDE support.

@JarbasAl JarbasAl added the fix label Jan 28, 2025
@JarbasAl JarbasAl merged commit 58476b6 into dev Jan 28, 2025
5 checks passed
@JarbasAl JarbasAl deleted the FIX_RotateNonDefault branch January 28, 2025 12:54
NeonDaniel added a commit to NeonGeckoCom/NeonCore that referenced this pull request Jan 28, 2025
# Description
Update wallpaper plugin to resolve observed issue where default
wallpaper is missing from options

# Issues
- Implements
OpenVoiceOS/ovos-PHAL-plugin-wallpaper-manager#24
- Needs
OpenVoiceOS/ovos-PHAL-plugin-wallpaper-manager#26

# Other Notes
<!-- Note any breaking changes, WIP changes, requests for input, etc.
here -->
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants