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

Wine: Installer language #631

Merged
merged 3 commits into from
Jan 6, 2025

Conversation

GB609
Copy link
Collaborator

@GB609 GB609 commented Dec 22, 2024

Description

This PR is a follow up on #624. Here, I'm doing the rest of the clean up and code rework related to innoextract.
Innoextract will now only be used for language detection during installation and the respective method has been reworked to have a clearer return value and more robust error handling.
I've also completely remove the old extract_by_innoextract install method since it is not used anymore.
Moreover, the new method match_game_lang_to_installer writes the output of innoextract into a log file (game.install_dir/minigalaxy_setup_languages.log).
With that, installing windows games now produces 3 small log files we can use for error reports and analysis:

  • game.install._dir/minigalaxy_setup_languages.log - language list from installer (if supported)
  • game.install_dir/prefix/drive_c/install.log - Log file of innosetup itself
  • game.install_dir/prefix/drive_c/setup.inf - Setup data as per innosetup /SAVEINF

Coupled with everything that now also goes into minigalaxies default logging, there should be a lot of information to trace back errors on installations.

Checklist

  • CHANGELOG.md was updated (format: - Change made (thanks to github_username))

@GB609 GB609 changed the title Feature/wine lang install Wine: Installer language Dec 25, 2024
reworked and enhanced lang_install:
1. now uses 2 different strategies for language detection
2. renamed to match_game_lang_to_installer to better match actual
purpose
3. slightly change _exe_cmd again to make it consume everything of Popen
without readlines() calls after actual execution loop
@GB609 GB609 force-pushed the feature/wine_lang_install branch from 00759e4 to e4f2599 Compare December 29, 2024 16:10
Copy link
Owner

@sharkwouter sharkwouter left a comment

Choose a reason for hiding this comment

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

Thanks for this work, I think it is a very nice improvement. I had some minor comments, but generally I'm very happy with this change. Sorry for the late review, I didn't have time to do it during my vacation.

minigalaxy/installer.py Outdated Show resolved Hide resolved
minigalaxy/installer.py Show resolved Hide resolved
* sleep before poll in _exe_cmd
* change how mocks in tests for match_lang_to_installer are set up
Copy link
Owner

@sharkwouter sharkwouter left a comment

Choose a reason for hiding this comment

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

Looks good, thanks for the work on this one!

@sharkwouter sharkwouter merged commit fde5523 into sharkwouter:master Jan 6, 2025
2 checks passed
@sharkwouter sharkwouter added this to the 1.3.2 milestone Jan 6, 2025
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.

2 participants