mirror/WowUp
1
0
Fork 0
mirror of https://github.com/WowUp/WowUp.git synced 2026-04-21 22:40:15 -04:00
Code Issues Packages Projects Releases Wiki Activity

Remove CFV2

Browse Source
This commit is contained in:
jliddev
2022-05-16 12:16:23 -05:00
parent 5447ee2b31
commit 3907c94f48
5 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
wowup-electron/src/app/addon-providers/curse-addon-provider.ts
View File

@@ -87,7 +87,7 @@ export class CurseAddonProvider extends AddonProvider {
public readonly allowChannelChange = true;
public readonly allowEdit = true;
public readonly canBatchFetch = true;
public enabled = true;
public enabled = false;
public constructor(
private _cachingService: CachingService,

3
wowup-electron/src/app/app.component.ts
View File

@@ -17,6 +17,7 @@ import { TranslateService } from "@ngx-translate/core";
import {
ADDON_PROVIDER_CURSEFORGE,
ADDON_PROVIDER_CURSEFORGEV2,
ALLIANCE_LIGHT_THEME,
ALLIANCE_THEME,
CURRENT_THEME_KEY,
@@ -262,6 +263,8 @@ export class AppComponent implements OnInit, OnDestroy, AfterViewInit {
// If the user has any addons from old Curse that are not ignored prompt them to rescan
let cfAddons = await this._addonService.getProviderAddons(ADDON_PROVIDER_CURSEFORGE);
let cf2Addons = await this._addonService.getProviderAddons(ADDON_PROVIDER_CURSEFORGEV2);
cfAddons.push(...cf2Addons);
cfAddons = cfAddons.filter((addon) => addon.isIgnored === false);
if (!this.sessionService.didPromptCfMigration && cfAddons.length > 0) {
this.openCurseMigrationDialog();

6
wowup-electron/src/app/components/common/curse-migration-dialog/curse-migration-dialog.component.ts
View File

@@ -1,7 +1,7 @@
import { AfterViewChecked, Component, ElementRef, ViewChild } from "@angular/core";
import { MatDialogRef } from "@angular/material/dialog";
import { BehaviorSubject, map } from "rxjs";
import { ADDON_PROVIDER_CURSEFORGE } from "../../../../common/constants";
import { ADDON_PROVIDER_CURSEFORGE, ADDON_PROVIDER_CURSEFORGEV2 } from "../../../../common/constants";
import { AddonService } from "../../../services/addons/addon.service";
import { LinkService } from "../../../services/links/link.service";
import { WarcraftInstallationService } from "../../../services/warcraft/warcraft-installation.service";
@@ -51,7 +51,9 @@ export class CurseMigrationDialogComponent implements AfterViewChecked {
// If there are any old Curse addons, re-scan that installation
let addons = await this._addonService.getAddons(wowInstall);
addons = addons.filter(
(addon) => addon.isIgnored === false && addon.providerName === ADDON_PROVIDER_CURSEFORGE
(addon) =>
addon.isIgnored === false &&
(addon.providerName === ADDON_PROVIDER_CURSEFORGE || addon.providerName === ADDON_PROVIDER_CURSEFORGEV2)
);
if (addons.length > 0) {
await this._addonService.rescanInstallation(wowInstall);

4
wowup-electron/src/app/components/options/options-addon-section/options-addon-section.component.html
View File

@@ -29,7 +29,7 @@
<form #prefForm [formGroup]="preferenceForm">
<div class="divider"></div>
<div class="setting row align-items-center">
<!-- <div class="setting row align-items-center">
<div class="flex-grow-1">
<div>
{{ "PAGES.OPTIONS.ADDON.CURSE_FORGE_V2.API_KEY_TITLE" | translate }}
@@ -41,7 +41,7 @@
<input matInput formControlName="cfV2ApiKey" type="password" />
</mat-form-field>
</div>
<div class="divider"></div>
<div class="divider"></div> -->
<div class="setting row align-items-center">
<div class="flex-grow-1">
<div>

4
wowup-electron/src/app/services/addons/addon.provider.factory.ts
View File

@@ -60,8 +60,8 @@ export class AddonProviderFactory {
this.createWowUpCompanionAddonProvider(),
this.createWowUpAddonProvider(),
this.createWagoAddonProvider(),
this.createCurseAddonProvider(),
this.createCurseV2AddonProvider(),
// this.createCurseAddonProvider(),
// this.createCurseV2AddonProvider(),
this.createTukUiAddonProvider(),
this.createWowInterfaceAddonProvider(),
this.createGitHubAddonProvider(),