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

ControllerScriptInterfaceLegacy: Windows 1252 fix #14108

Merged
merged 4 commits into from
Feb 4, 2025

Conversation

daschuer
Copy link
Member

@daschuer daschuer commented Jan 2, 2025

Latin1 is not Windows Western Europe charset. The later contains ™ and some other characters. This PR introduces both, "windows-1252" and "ISO-8859-1"

In addition this has some refactoring regarding string handling and makes the test pass on Qt 6.2 (I have not updated my dev machine to maintain the 2.5 branch)

@JoergAtGithub
Copy link
Member

JoergAtGithub commented Jan 2, 2025

This is intentional, we grouped all charsets that are full subsets of other charsets to the superset. This is described in the documentation, which you didn't change in this PR btw.:

Latin1, // Windows_1252 which includes all characters of ISO_8859_1

@daschuer
Copy link
Member Author

daschuer commented Jan 3, 2025

we grouped all charsets that are full subsets of other charsets to the superset

Ah, I understand. Than the Enum name was only misleading. I stumbled over this because "ASCII" and ""windows-1252" is not available without ICU or QT < 6.4.

@daschuer
Copy link
Member Author

daschuer commented Jan 9, 2025

Done

Copy link
Member

@JoergAtGithub JoergAtGithub left a comment

Choose a reason for hiding this comment

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

If you change the enum, you need to change the typescript declaration as well: mixxx/res/controllers/engine-api.d.ts

@daschuer
Copy link
Member Author

Done

@JoergAtGithub JoergAtGithub dismissed their stale review January 11, 2025 15:16

Requested change done

@daschuer
Copy link
Member Author

@Swiftb0y Can we merge this now?

Copy link
Member

@Swiftb0y Swiftb0y left a comment

Choose a reason for hiding this comment

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

LGTM. Otherwise

Comment on lines 814 to 815
auto result = qjsvalue_cast<QByteArray>(evaluate(source));
qDebug() << result;
EXPECT_EQ(result.size(), convertedCharsetForString(enumValue))
Copy link
Member

Choose a reason for hiding this comment

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

debugging leftover?

@daschuer
Copy link
Member Author

daschuer commented Feb 4, 2025

Done and sqashed fixup. Reday for merge.

Copy link
Member

@Swiftb0y Swiftb0y left a comment

Choose a reason for hiding this comment

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

LGTM. Thank you.

@Swiftb0y Swiftb0y merged commit 0e6a417 into mixxxdj:main Feb 4, 2025
13 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants