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

ZO fix disc scanner in controller mode #2633

Merged
merged 1 commit into from
Jan 26, 2025
Merged

ZO fix disc scanner in controller mode #2633

merged 1 commit into from
Jan 26, 2025

Conversation

frzyc
Copy link
Owner

@frzyc frzyc commented Jan 26, 2025

Describe your changes

image

Issue or discord link

Testing/validation

Checklist before requesting a review (leave this PR as draft if any part of this list is not done.)

  • I have commented my code in hard-to understand areas.
  • I have made corresponding changes to README or wiki.
  • For front-end changes, I have updated the corresponding English translations.
  • I have run yarn run mini-ci locally to validate format and lint.
  • If I have added a new library or app, I have updated the deployment scripts to ignore changes as needed

Summary by CodeRabbit

  • Bug Fixes
    • Improved text detection and processing logic for scanning images
    • Simplified error handling for detecting main stats, substats, and set effects

Copy link
Contributor

coderabbitai bot commented Jan 26, 2025

Walkthrough

The pull request modifies the processEntry function in the disc scanner library, focusing on improving the handling of text detection for main stats, substats, and set effects. The changes introduce more flexible logic for assigning the setEffectTextIndex, allowing it to be reassigned and simplifying the conditions for processing detected texts. This modification aims to address scenarios where the set effect text might be partially detected or cut off.

Changes

File Change Summary
libs/zzz/disc-scanner/src/lib/processImg.ts - Changed setEffectTextIndex from const to let for reassignment
- Modified logic to set setEffectTextIndex to the last index of whiteTexts if not found
- Simplified conditional checks for detecting and processing texts

Assessment against linked issues

Objective Addressed Explanation
Handle set effect text when cut off [#2631]

Possibly related PRs

Suggested labels

ZO

Suggested reviewers

  • nguyentvan7

Poem

🐰 In the realm of scanners bright,
Where texts were once a tricky plight,
A rabbit's code, with wisdom keen,
Fixes cuts where text was unseen!
Set effects now dance with grace,
No more detection's tangled lace! 🔍

✨ Finishing Touches
  • 📝 Generate Docstrings (Beta)

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.

Copy link
Contributor

github-actions bot commented Jan 26, 2025

[zzz-frontend] [Sun Jan 26 19:18:45 UTC 2025] - Deployed b99b55d to https://genshin-optimizer-prs.github.io/pr/2633/zzz-frontend (Takes 3-5 minutes after this completes to be available)

[Sun Jan 26 19:27:54 UTC 2025] - Deleted deployment

Copy link
Contributor

@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 (2)
libs/zzz/disc-scanner/src/lib/processImg.ts (2)

Line range hint 90-94: Update error message to match the conditions.

The error message mentions "set effect" but the condition only checks for main stat and substats.

  if (mainStatTextIndex === -1 || substatTextIndex === -1) {
    retProcessed.texts.push(
-     'Could not detect main stat, substats or set effect.'
+     'Could not detect main stat or substats.'
    )
    return retProcessed
  }

Line range hint 109-114: Update second error message to match the conditions.

The error message mentions "set effect" but the condition only checks for main stat and substats lengths.

  if (
    setLvlTexts.length === 0 ||
    mainStatTexts.length === 0 ||
    substatTexts.length === 0
  ) {
    retProcessed.texts.push(
-     'Could not detect main stat, substats or set effect.'
+     'Could not detect level, main stat, or substats.'
    )
    return retProcessed
  }
📜 Review details

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

📥 Commits

Reviewing files that changed from the base of the PR and between 3769baf and e6c6579.

📒 Files selected for processing (1)
  • libs/zzz/disc-scanner/src/lib/processImg.ts (3 hunks)
⏰ Context from checks skipped due to timeout of 90000ms (1)
  • GitHub Check: lint
🔇 Additional comments (2)
libs/zzz/disc-scanner/src/lib/processImg.ts (2)

Line range hint 85-120: LGTM! The changes improve robustness of set effect detection.

The modifications make the disc scanner more resilient by:

  1. Making set effect detection optional
  2. Adding a fallback mechanism for missing set effect text
  3. Continuing processing even when set effect text is not found

This aligns well with fixing the scanner in controller mode where text detection might be partial or cut off.


85-89: Add null check for whiteTexts array.

The fallback logic assumes whiteTexts is non-empty. This could lead to issues if OCR fails to detect any text.

Add a defensive check:

  let setEffectTextIndex = whiteTexts.findIndex((t) =>
    t.toLowerCase().includes('set effect')
  )
- if (setEffectTextIndex === -1) setEffectTextIndex = whiteTexts.length - 1
+ if (setEffectTextIndex === -1 && whiteTexts.length > 0) setEffectTextIndex = whiteTexts.length - 1
+ else if (setEffectTextIndex === -1) setEffectTextIndex = 0

@frzyc frzyc merged commit 7cda611 into master Jan 26, 2025
7 checks passed
@frzyc frzyc deleted the 2631 branch January 26, 2025 19:27
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.

ZO Disc scanner doesn't work when the "Set Effect" text is cut off
1 participant