-
Notifications
You must be signed in to change notification settings - Fork 195
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #1581 from ebkr/develop
Develop (3.1.55)
- Loading branch information
Showing
17 changed files
with
246 additions
and
200 deletions.
There are no files selected for viewing
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
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,7 +1,7 @@ | ||
| import VersionNumber from '../model/VersionNumber'; | ||
|
|
||
| export default class ManagerInformation { | ||
| public static VERSION: VersionNumber = new VersionNumber('3.1.54'); | ||
| public static VERSION: VersionNumber = new VersionNumber('3.1.55'); | ||
| public static IS_PORTABLE: boolean = false; | ||
| public static APP_NAME: string = "r2modman"; | ||
| } |
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,33 @@ | ||
| <script lang='ts'> | ||
| import Vue from 'vue'; | ||
| import Component from 'vue-class-component'; | ||
| import ThunderstoreMod from "../../model/ThunderstoreMod"; | ||
| import Game from "../../model/game/Game"; | ||
| import Profile from "../../model/Profile"; | ||
| @Component | ||
| export default class DownloadMixin extends Vue { | ||
| get activeGame(): Game { | ||
| return this.$store.state.activeGame; | ||
| } | ||
| closeModal() { | ||
| this.$store.commit("closeDownloadModModal"); | ||
| } | ||
| get isOpen(): boolean { | ||
| return this.$store.state.modals.isDownloadModModalOpen; | ||
| } | ||
| get thunderstoreMod(): ThunderstoreMod | null { | ||
| return this.$store.state.modals.downloadModModalMod; | ||
| } | ||
| get profile(): Profile { | ||
| return this.$store.getters['profile/activeProfile']; | ||
| } | ||
| } | ||
| </script> |
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,144 @@ | ||
| <template> | ||
| <ModalCard :is-active="isOpen" :can-close="true" v-if="thunderstoreMod !== null" @close-modal="closeModal()"> | ||
| <template v-slot:header> | ||
| <h2 class='modal-title' v-if="thunderstoreMod !== null"> | ||
| Select a version of {{thunderstoreMod.getName()}} to download | ||
| </h2> | ||
| </template> | ||
| <template v-slot:body> | ||
| <p>It's recommended to select the latest version of all mods.</p> | ||
| <p>Using outdated versions may cause problems.</p> | ||
| <br/> | ||
| <div class="columns is-vcentered"> | ||
| <template v-if="currentVersion !== null"> | ||
| <div class="column is-narrow"> | ||
| <select class="select" disabled="true"> | ||
| <option selected> | ||
| {{currentVersion}} | ||
| </option> | ||
| </select> | ||
| </div> | ||
| <div class="column is-narrow"> | ||
| <span class="margin-right margin-right--half-width"><span class="margin-right margin-right--half-width"/> <i class='fas fa-long-arrow-alt-right'></i></span> | ||
| </div> | ||
| </template> | ||
| <div class="column is-narrow"> | ||
| <select class='select' v-model="selectedVersion"> | ||
| <option v-for='(value, index) in versionNumbers' :key='index' :value='value'> | ||
| {{value}} | ||
| </option> | ||
| </select> | ||
| </div> | ||
| <div class="column is-narrow"> | ||
| <span class="tag is-dark" v-if='selectedVersion === null'> | ||
| You need to select a version | ||
| </span> | ||
| <span class="tag is-success" v-else-if='recommendedVersion === selectedVersion'> | ||
| {{selectedVersion}} is the recommended version | ||
| </span> | ||
| <span class="tag is-success" v-else-if='versionNumbers[0] === selectedVersion'> | ||
| {{selectedVersion}} is the latest version | ||
| </span> | ||
| <span class="tag is-danger" v-else-if='versionNumbers[0] !== selectedVersion'> | ||
| {{selectedVersion}} is an outdated version | ||
| </span> | ||
| </div> | ||
| </div> | ||
| </template> | ||
| <template v-slot:footer> | ||
| <button class="button is-info" @click="downloadMod">Download with dependencies</button> | ||
| </template> | ||
| </ModalCard> | ||
| </template> | ||
|
|
||
| <script lang="ts"> | ||
| import { mixins } from "vue-class-component"; | ||
| import { Component, Watch } from "vue-property-decorator"; | ||
| import ModalCard from "../ModalCard.vue"; | ||
| import DownloadMixin from "../../components/mixins/DownloadMixin.vue"; | ||
| import R2Error from "../../model/errors/R2Error"; | ||
| import ManifestV2 from "../../model/ManifestV2"; | ||
| import ThunderstoreMod from "../../model/ThunderstoreMod"; | ||
| import ThunderstoreVersion from "../../model/ThunderstoreVersion"; | ||
| import { MOD_LOADER_VARIANTS } from "../../r2mm/installing/profile_installers/ModLoaderVariantRecord"; | ||
| import * as PackageDb from "../../r2mm/manager/PackageDexieStore"; | ||
| import ProfileModList from "../../r2mm/mods/ProfileModList"; | ||
| @Component({ | ||
| components: { | ||
| ModalCard | ||
| }, | ||
| }) | ||
| export default class DownloadModVersionSelectModal extends mixins(DownloadMixin) { | ||
| versionNumbers: string[] = []; | ||
| recommendedVersion: string | null = null; | ||
| selectedVersion: string | null = null; | ||
| currentVersion: string | null = null; | ||
| @Watch("$store.state.modals.downloadModModalMod") | ||
| async updateModVersionState() { | ||
| this.currentVersion = null; | ||
| if (this.thunderstoreMod !== null) { | ||
| this.selectedVersion = this.thunderstoreMod.getLatestVersion(); | ||
| this.recommendedVersion = null; | ||
| this.versionNumbers = await PackageDb.getPackageVersionNumbers( | ||
| this.activeGame.internalFolderName, | ||
| this.thunderstoreMod.getFullName() | ||
| ); | ||
| const foundRecommendedVersion = MOD_LOADER_VARIANTS[this.activeGame.internalFolderName] | ||
| .find(value => value.packageName === this.thunderstoreMod!.getFullName()); | ||
| if (foundRecommendedVersion && foundRecommendedVersion.recommendedVersion) { | ||
| this.recommendedVersion = foundRecommendedVersion.recommendedVersion.toString(); | ||
| // Auto-select recommended version if it's found. | ||
| const recommendedVersion = this.versionNumbers.find( | ||
| (ver) => ver === foundRecommendedVersion.recommendedVersion!.toString() | ||
| ); | ||
| if (recommendedVersion) { | ||
| this.selectedVersion = recommendedVersion; | ||
| } | ||
| } | ||
| const modListResult = await ProfileModList.getModList(this.profile.asImmutableProfile()); | ||
| if (!(modListResult instanceof R2Error)) { | ||
| const manifestMod = modListResult.find((local: ManifestV2) => local.getName() === this.thunderstoreMod!.getFullName()); | ||
| if (manifestMod !== undefined) { | ||
| this.currentVersion = manifestMod.getVersionNumber().toString(); | ||
| } | ||
| } | ||
| } | ||
| } | ||
| async downloadMod() { | ||
| const mod = this.thunderstoreMod; | ||
| const versionString = this.selectedVersion; | ||
| if (mod === null || versionString === null) { | ||
| // Shouldn't happen, but shouldn't throw an error. | ||
| console.log(`Download initiated with null mod [${mod}] or version [${versionString}]`); | ||
| return; | ||
| } | ||
| let version: ThunderstoreVersion; | ||
| try { | ||
| version = await PackageDb.getVersionAsThunderstoreVersion( | ||
| this.activeGame.internalFolderName, | ||
| mod.getFullName(), | ||
| versionString | ||
| ); | ||
| } catch { | ||
| console.log(`Failed to get version [${versionString}] for mod [${mod.getFullName()}]`); | ||
| return; | ||
| } | ||
| this.$emit("download-mod", mod, version); // Delegate to DownloadModModal. | ||
| } | ||
| } | ||
| </script> |
Oops, something went wrong.