Bug fixes #406
Merged
Bug fixes #406
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Geometrically
requested changes
Aug 3, 2023
theseus/src/state/projects.rs
Outdated
Comment on lines
163
to
166
| impl Dependency { | ||
| // As Modrinth doesn't always provide the project ID, we have to infer it from the version ID | ||
| pub async fn populate(&mut self) -> crate::Result<()> { | ||
| let mut dep = self; |
There was a problem hiding this comment.
this IMO is a pretty bad way of solving this specific issue. I think you can remove the fix for this GH issue and I can fix this one
Comment on lines
107
to
146
| #[tauri::command] | ||
| pub async fn profile_get_installed_duplicate_nonversional_dependencies( | ||
| path: ProfilePathId, | ||
| mut dependencies: Vec<Dependency>, | ||
| ) -> Result<Vec<Dependency>> { | ||
| use futures::prelude::*; | ||
|
|
||
| // Not all dependencies have a project id, so we need to check if the project id is None and populate it | ||
| // using try_for_each_concurrent, and running .populate() on each dependency | ||
| let stream = futures::stream::iter(dependencies.iter_mut()) | ||
| .map(Ok::<_, theseus::Error>); | ||
|
|
||
| stream | ||
| .try_for_each_concurrent(None, |dependency| async move { | ||
| dependency.populate().await?; | ||
| Ok(()) | ||
| }) | ||
| .await?; | ||
|
|
||
| // Iterate over all projects in the profile, and check if any of the dependencies are installed with a different version | ||
| let mut duplicates = Vec::new(); | ||
| let profile = profile_get(path, None).await?; | ||
| if let Some(profile) = profile { | ||
| profile.projects.into_iter().for_each(|(_, project)| { | ||
| if let ProjectMetadata::Modrinth { | ||
| project, version, .. | ||
| } = &project.metadata | ||
| { | ||
| dependencies.iter().for_each(|dependency| { | ||
| if dependency.version_id != Some(version.id.clone()) | ||
| && dependency.project_id == Some(project.id.clone()) | ||
| { | ||
| duplicates.push(dependency.clone()); | ||
| } | ||
| }) | ||
| } | ||
| }); | ||
| } | ||
| Ok(duplicates) | ||
| } |
There was a problem hiding this comment.
See above. Don't like this fix (quite a lot of code smell imo). I'll fix this in my auth PR so I think this can be removed from this PR
theseus_gui/src/helpers/profile.js
Outdated
Comment on lines
62
to
67
| export async function check_duplicate_nonversional_dependencies(path, dependencies) { | ||
| return await invoke('plugin:profile|profile_get_installed_duplicate_nonversional_dependencies', { | ||
| path, | ||
| dependencies, | ||
| }) | ||
| } |
theseus_gui/src/helpers/utils.js
Outdated
Comment on lines
44
to
46
| // if duplicates has a version that matches, skip | ||
| if (duplicates.find((d) => d.version_id === dep.version_id)) continue | ||
|
|
theseus_gui/src/helpers/utils.js
Outdated
Comment on lines
39
to
42
| const duplicates = await check_duplicate_nonversional_dependencies( | ||
| profile.path, | ||
| version.dependencies | ||
| ) |
| onlyOpenSource.value = false | ||
| selectedVersions.value = [] | ||
| selectedEnvironments.value = [] | ||
| await onSearchChange(1) | ||
| await onSearchChangeToTop(1) |
There was a problem hiding this comment.
why were these and others changed to to top? these operations should not affect the scroll pos
| for (const file of event.payload) { | ||
| await add_project_from_path(props.instance.path, file, 'mod').catch(handleError) | ||
| } | ||
| initProjects(await get(props.instance.path).catch(handleError)) | ||
| } |
There was a problem hiding this comment.
mixpanel needs to be added in this else statement as well, or at least moved out of this
Geometrically
approved these changes
Aug 3, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #230
Fixes #234
Fixes #290
Fixes #313
Fixes #382
Fixes #388
Fixes #396
Fixes #399
Fixes #400
Fixes #407
Fixes permissions in Info.plist for voice chat on Mac
Fixes deadlock preventing app closing via safeprocesses
Potential fix for title bar issues