Skip to content

Commit

Permalink
version bump, changelog. hotfixes
Browse files Browse the repository at this point in the history
  • Loading branch information
insomnious committed Aug 14, 2024
1 parent 924ac7f commit 32c6bb7
Show file tree
Hide file tree
Showing 8 changed files with 25 additions and 10 deletions.
7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,12 @@ All notable changes to this project will be documented in this file.

The format is based on [Common Changelog](https://common-changelog.org/) and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## [1.12.2] - 2024-08-14

- Fixed inability to update mods that are tagged as compatibleDownloads. ([#16231](https://github.com/Nexus-Mods/Vortex/issues/16231))
- Fixed downloads/installation stalling when Vortex is in background.
- **plugin-management**: Removed non-relevant loot messages from inlined view

## [1.12.1] - 2024-08-12

- Fixed extension installation not executing from downloads page. ([#16197](https://github.com/Nexus-Mods/Vortex/issues/16197))
Expand Down Expand Up @@ -466,6 +472,7 @@ _Yanked due to critical issue found with file overrides_
- When providing feedback, users are treated as logged out if using OAuth
- Changelog dashlet was incorrectly displaying markdown

[1.12.2]: https://github.com/Nexus-Mods/Vortex/releases/tag/v1.12.2
[1.12.1]: https://github.com/Nexus-Mods/Vortex/releases/tag/v1.12.1
[1.12.0]: https://github.com/Nexus-Mods/Vortex/releases/tag/v1.12.0
[1.12.0-beta.5]: https://github.com/Nexus-Mods/Vortex/releases/tag/v1.12.0-beta.5
Expand Down
2 changes: 1 addition & 1 deletion app/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "vortex",
"version": "1.12.1",
"version": "1.12.2",
"productName": "Vortex",
"description": "Vortex",
"author": "Black Tree Gaming Ltd.",
Expand Down
2 changes: 1 addition & 1 deletion extensions/gamebryo-plugin-management
4 changes: 4 additions & 0 deletions src/extensions/gamemode_management/types/IGameStored.ts
Original file line number Diff line number Diff line change
Expand Up @@ -25,3 +25,7 @@ export interface IGameStored {
contributed?: string;
final?: boolean;
}

export interface IGameStoredExt extends IGameStored {
downloadGameId?: string;
}
10 changes: 6 additions & 4 deletions src/extensions/nexus_integration/eventHandlers.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
/* eslint-disable */
import { setDownloadModInfo } from '../../actions';
import { IExtensionApi, StateChangeCallback } from '../../types/IExtensionContext';
import { IDownload, IModTable, IState } from '../../types/IState';
import { ArgumentInvalid, DataInvalid, ProcessCanceled, UserCanceled } from '../../util/CustomErrors';
import { DataInvalid, ProcessCanceled, UserCanceled } from '../../util/CustomErrors';
import Debouncer from '../../util/Debouncer';
import * as fs from '../../util/fs';
import { log } from '../../util/log';
Expand All @@ -15,7 +16,7 @@ import { toPromise, truthy } from '../../util/util';
import { resolveCategoryName } from '../category_management';
import { AlreadyDownloaded, DownloadIsHTML } from '../download_management/DownloadManager';
import { SITE_ID } from '../gamemode_management/constants';
import {IGameStored} from '../gamemode_management/types/IGameStored';
import { IGameStoredExt } from '../gamemode_management/types/IGameStored';
import { setUpdatingMods } from '../mod_management/actions/session';
import { IModListItem } from '../news_dashlet/types';

Expand Down Expand Up @@ -223,7 +224,7 @@ function getFileId(download: IDownload): number {
}

function downloadFile(api: IExtensionApi, nexus: Nexus,
game: IGameStored, modId: number, fileId: number,
game: IGameStoredExt, modId: number, fileId: number,
fileName?: string,
allowInstall?: boolean): Promise<string> {
const state: IState = api.getState();
Expand Down Expand Up @@ -279,7 +280,8 @@ export function onModUpdate(api: IExtensionApi, nexus: Nexus) {
return;
}

downloadFile(api, nexus, game, modId, fileId, undefined, false)
const downloadGameId = (game !== undefined) && (game.id !== gameId) ? gameId : game.id;
downloadFile(api, nexus, { ...game, downloadGameId }, modId, fileId, undefined, false)
.catch(AlreadyDownloaded, err => {
const state = api.getState();
const downloads = state.persistent.downloads.files;
Expand Down
3 changes: 2 additions & 1 deletion src/extensions/nexus_integration/util/checkModsVersion.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
/* eslint-disable */
import { IExtensionApi } from '../../../types/IExtensionContext';
import { log } from '../../../util/log';
import { getSafe } from '../../../util/storeHelper';
Expand Down Expand Up @@ -104,7 +105,7 @@ export function checkModVersion(store: Redux.Store<any>, nexus: NexusT,
const gameId = getSafe(mod.attributes, ['downloadGame'], undefined) || gameMode;
const game = gameById(store.getState(), gameId);
const fallBackGameId = gameId === 'site'
? 'site' : undefined;
? 'site' : gameId;

return Promise.resolve(nexus.getModFiles(nexusModId, nexusGameId(game, fallBackGameId)))
.then(result => updateFileAttributes(store.dispatch, gameMode, mod, result))
Expand Down
6 changes: 3 additions & 3 deletions src/extensions/nexus_integration/util/convertGameId.ts
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import { inspect } from 'util';
import { IGame } from '../../../types/IGame';
import { IGameStored } from '../../../types/IState';
import { log } from '../../../util/log';
import { truthy } from '../../../util/util';
import { SITE_ID } from '../../gamemode_management/constants';
import { IGameStored, IGameStoredExt } from '../../gamemode_management/types/IGameStored';

/**
* get the nexus page id for a game
Expand Down Expand Up @@ -88,7 +88,7 @@ export function convertNXMIdReverse(knownGames: IGameStored[], input: string): s
/**
* get the nxm link id for a game
*/
export function toNXMId(game: IGameStored, gameId: string): string {
export function toNXMId(game: IGameStoredExt, gameId: string): string {
// this is a bit of a workaround since "site" isn't and shouldn't be an
// entry in the list of games (here or on the site)
if (game === null) {
Expand All @@ -100,7 +100,7 @@ export function toNXMId(game: IGameStored, gameId: string): string {
} else if (game.details.nexusPageId !== undefined) {
return game.details.nexusPageId;
}
gameId = game.id;
gameId = game.downloadGameId || game.id;
}
const gameIdL = gameId.toLowerCase();
if (gameIdL === 'skyrimse') {
Expand Down
1 change: 1 addition & 0 deletions src/main.ts
Original file line number Diff line number Diff line change
Expand Up @@ -177,6 +177,7 @@ async function main(): Promise<void> {
}

app.commandLine.appendSwitch('disable-features', 'WidgetLayering');
app.commandLine.appendSwitch('disable-features', 'UseEcoQoSForBackgroundProcess');

// --run has to be evaluated *before* we request the single instance lock!
if (mainArgs.run !== undefined) {
Expand Down

0 comments on commit 32c6bb7

Please sign in to comment.