Skip to content

Commit

Permalink
fixes #529
Browse files Browse the repository at this point in the history
  • Loading branch information
aza547 committed Sep 19, 2024
1 parent 7866329 commit 30e4e5f
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 1 deletion.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

### Fixed
- [Issue 518](https://github.com/aza547/wow-recorder/issues/518) - Fix some minor UI issues.
- [Issue 529](https://github.com/aza547/wow-recorder/issues/529) - Raid upload difficulty threshold is no longer ignored.
- Improve OBS signal handling to be more robust to timeouts.
- Update TWW season 1 M+ timers.

Expand Down
6 changes: 6 additions & 0 deletions src/main/VideoProcessQueue.ts
Original file line number Diff line number Diff line change
Expand Up @@ -168,6 +168,9 @@ export default class VideoProcessQueue {
this.videoQueue.write(item);
};

/**
* Queue a video for upload.
*/
public queueUpload = async (item: UploadQueueItem) => {
const alreadyQueued = this.inProgressUploads.includes(item.path);

Expand All @@ -180,6 +183,9 @@ export default class VideoProcessQueue {
this.uploadQueue.write(item);
};

/**
* Queue a video for download.
*/
public queueDownload = async (video: RendererVideo) => {
const { videoName } = video;
const alreadyQueued = this.inProgressDownloads.includes(video.videoName);
Expand Down
4 changes: 3 additions & 1 deletion src/utils/configUtils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,9 @@ const shouldUpload = (cfg: ConfigService, metadata: Metadata) => {

if (category === VideoCategory.Raids) {
const { difficulty } = metadata;

const orderedDifficulty = ['lfr', 'normal', 'heroic', 'mythic'];
const orderedDifficultyIDs = ['LFR', 'N', 'HC', 'M'];

const minDifficultyToUpload = cfg
.get<string>('cloudUploadRaidMinDifficulty')
Expand All @@ -78,8 +80,8 @@ const shouldUpload = (cfg: ConfigService, metadata: Metadata) => {
return true;
}

const actualIndex = orderedDifficulty.indexOf(difficulty);
const configuredIndex = orderedDifficulty.indexOf(minDifficultyToUpload);
const actualIndex = orderedDifficultyIDs.indexOf(difficulty);

if (actualIndex < 0) {
console.info('[configUtils] Unrecognised difficulty, not blocking');
Expand Down

0 comments on commit 30e4e5f

Please sign in to comment.