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

Parse unmanaged file location when creating ModInfoForeign #2053

Merged
merged 9 commits into from
Jun 22, 2024

Conversation

Silarn
Copy link
Member

@Silarn Silarn commented Jun 16, 2024

  • Fixes issues with secondaryDataDirectories

- Fixes issues with secondaryDataDirectories
src/modinfoforeign.cpp Outdated Show resolved Hide resolved
QMap<QString, QDir> directories = {{"data", game->dataDirectory()}};
directories.insert(game->secondaryDataDirectories());
for (QDir directory : directories) {
if (referenceFile.startsWith(directory.absolutePath(), Qt::CaseInsensitive)) {
Copy link
Member

Choose a reason for hiding this comment

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

Maybe there is a better way in Qt to check if a file is under a directory?

Copy link
Member Author

Choose a reason for hiding this comment

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

A quick search didn't find anything but there may be a way.

Copy link
Member Author

Choose a reason for hiding this comment

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

Still haven't found a better solution for this. It seems to work.

src/modinfoforeign.cpp Outdated Show resolved Hide resolved
Silarn added 2 commits June 17, 2024 02:02
- Use organizercore to get game plugin
- Use QList
@Silarn Silarn force-pushed the creation_parsing branch from 3bd830f to 475cbe2 Compare June 17, 2024 07:08
@Silarn
Copy link
Member Author

Silarn commented Jun 17, 2024

I'm still trying to figure out what exactly prevents origins (mods) from having the root directory set as an 'alternate' so that they don't display conflicts. This isn't working for the 'secondaryDataDirectories' origins so the UI is displaying all of the unmanaged mods as conflicts with 'game_data'.

If anyone else can shed light on this, I'd be grateful. Maybe I'm too tired right now.

Silarn added 2 commits June 17, 2024 21:49
- CCC implementation prevents the need to determine core plugin LO by dependency chains
Holt59
Holt59 previously approved these changes Jun 18, 2024
@Holt59
Copy link
Member

Holt59 commented Jun 18, 2024

@Silarn Just to be sure, this is kind of independent from the Starfield PR? I.e., can be merged independently?

@Silarn
Copy link
Member Author

Silarn commented Jun 18, 2024

While the changes are somewhat related to stuff that was done for Starfield, this shouldn't be dependent on any of the Starfield plugin changes. It's really more of a bugfix that primarily affects Starfield.

@Silarn
Copy link
Member Author

Silarn commented Jun 18, 2024

I'd still like to determine where MO is ignoring the root 'data' origin when determining alternates so that the secondary data directory doesn't get highlighted as a conflict.

Silarn added 2 commits June 19, 2024 20:24
- I had expected the opposite, but apparently the light flag still wins if both are set. This shouldn't really happen but it's possible, even with the CK
- Show both icons, warn if both set
@Silarn Silarn force-pushed the creation_parsing branch from 3059d2e to c93152f Compare June 20, 2024 06:48
@Holt59 Holt59 merged commit a4f6298 into master Jun 22, 2024
3 checks passed
@Holt59 Holt59 deleted the creation_parsing branch June 22, 2024 06:31
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.

3 participants