Move timestamps_to_keep() to cut.d

faissaloo · Oct 11, 2020 · c06c12f · c06c12f
1 parent 3990eea
commit c06c12f
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 26 deletions.
diff --git a/src/sponskrub/methods/cut.d b/src/sponskrub/methods/cut.d
@@ -26,6 +26,31 @@ import std.typecons;
 import sponsorblock;
 import ffwrap;
 
+ClipTime[] timestamps_to_keep(ClipTime[] sponsor_times, string video_length) {
+	ClipTime[] clip_times;
+	sponsor_times.sort!((a, b) => a.start.to!float < b.start.to!float);
+
+	//If the sponsorship is directly at the beginning don't add both content and the sponsor
+	if (sponsor_times[0].start != "0.000000") {
+		clip_times ~= ClipTime("0", sponsor_times[0].start, "content");
+	}
+
+
+	for (auto i = 0; i < sponsor_times.length; i++) {
+		auto clip_start = "";
+		auto clip_end = "";
+		clip_start = sponsor_times[i].end;
+		if (i+1 < sponsor_times.length) {
+			clip_end = sponsor_times[i+1].start;
+		} else {
+			clip_end = video_length;
+		}
+		clip_times ~= ClipTime(clip_start, clip_end, "content");
+	}
+
+	return clip_times;
+}
+
 string cut_and_cat_clips_filter(ClipTime[] timestamps, FileCategory category) {
   timestamps.sort!((a, b) => a.start.to!float < b.start.to!float);
 

diff --git a/src/sponskrub/sponskrub.d b/src/sponskrub/sponskrub.d
@@ -185,32 +185,6 @@ Options:
 	}
 }
 
-ClipTime[] timestamps_to_keep(ClipTime[] sponsor_times, string video_length) {
-	ClipTime[] clip_times;
-
-	sponsor_times.sort!((a, b) => a.start.to!float < b.start.to!float);
-
-	//If the sponsorship is directly at the beginning don't add both content and the sponsor
-	if (sponsor_times[0].start != "0.000000") {
-		clip_times ~= ClipTime("0", sponsor_times[0].start, "content");
-	}
-
-
-	for (auto i = 0; i < sponsor_times.length; i++) {
-		auto clip_start = "";
-		auto clip_end = "";
-		clip_start = sponsor_times[i].end;
-		if (i+1 < sponsor_times.length) {
-			clip_end = sponsor_times[i+1].start;
-		} else {
-			clip_end = video_length;
-		}
-		clip_times ~= ClipTime(clip_start, clip_end, "content");
-	}
-
-	return clip_times;
-}
-
 Categories[] categories_from_arguments(Args arguments) {
 	Categories[] categories = [];
 	if ("exclude-sponsors" !in arguments.flag_arguments) {