Added proper filter so that fetchNewVideos does not yield muxed videos.

Inrixia · Aug 18, 2023 · 7fe9d91 · 7fe9d91
1 parent 25095b0
commit 7fe9d91
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 6 deletions.
diff --git a/src/Downloader.ts b/src/Downloader.ts
@@ -1,5 +1,5 @@
 import { MultiProgressBars, UpdateOptions } from "multi-progress-bars";
-import { VideoState, Video } from "./lib/Video.js";
+import { Video } from "./lib/Video.js";
 
 import { settings, args } from "./lib/helpers.js";
 import { MyPlexAccount } from "@ctrl/plex";
@@ -100,7 +100,7 @@ const processVideo = async (fTitle: string, video: Video, retries = 0) => {
 		if (settings.extras.downloadArtwork) await video.downloadArtwork();
 
 		switch (await video.getState()) {
-			case VideoState.Missing: {
+			case Video.State.Missing: {
 				mpb?.addTask(fTitle, {
 					type: "percentage",
 					message: "Waiting on delivery cdn...",
@@ -145,7 +145,7 @@ const processVideo = async (fTitle: string, video: Video, retries = 0) => {
 				delete summaryStats[fTitle];
 			}
 			// eslint-disable-next-line no-fallthrough
-			case VideoState.Partial: {
+			case Video.State.Partial: {
 				log(fTitle, {
 					percentage: 0.99,
 					message: "Muxing ffmpeg metadata...",
@@ -165,7 +165,7 @@ const processVideo = async (fTitle: string, video: Video, retries = 0) => {
 				}
 			}
 			// eslint-disable-next-line no-fallthrough
-			case VideoState.Muxed: {
+			case Video.State.Muxed: {
 				completedVideos++;
 				updateSummaryBar();
 				mpb?.done(fTitle);

diff --git a/src/lib/Subscription.ts b/src/lib/Subscription.ts
@@ -151,7 +151,9 @@ export default class Subscription {
 		if (settings.floatplane.videosToSearch === 0) return;
 		let videosSearched = 0;
 		for await (const blogPost of fApi.creator.blogPostsIterable(this.creatorId, { hasVideo: true })) {
-			for await (const video of this.matchChannel(blogPost)) yield video;
+			for await (const video of this.matchChannel(blogPost)) {
+				if ((await video.getState()) !== Video.State.Muxed) yield video;
+			}
 
 			// Stop searching if we have looked through videosToSearch
 			if (videosSearched++ >= settings.floatplane.videosToSearch) break;

diff --git a/src/lib/Video.ts b/src/lib/Video.ts
@@ -31,7 +31,7 @@ const fileExists = async (path: string): Promise<boolean> => {
 	}
 };
 
-export enum VideoState {
+enum VideoState {
 	Missing,
 	Partial,
 	Muxed,
@@ -57,6 +57,8 @@ export class Video {
 	public title: BlogPost["title"];
 	public channelTitle: string;
 
+	public static State = VideoState;
+
 	private static OriginSelector = 0;
 	private originSelector = Video.OriginSelector;