From 8cd62693f27d600f6e9ffe6cb0bd95a375683a6f Mon Sep 17 00:00:00 2001
From: marko <marko@cana>
Date: Tue, 22 Feb 2022 15:15:04 +0100
Subject: [PATCH] clipper skips existing files

---
 DieJudoGürtelprüfung/Kyu5.json | 90 +++++++++++++++++++++++++++-------
 DieJudoGürtelprüfung/clipper   |  7 ++-
 2 files changed, 77 insertions(+), 20 deletions(-)

diff --git a/DieJudoGürtelprüfung/Kyu5.json b/DieJudoGürtelprüfung/Kyu5.json
index e3824bb..aee807f 100644
--- a/DieJudoGürtelprüfung/Kyu5.json
+++ b/DieJudoGürtelprüfung/Kyu5.json
@@ -1,74 +1,128 @@
 [
     {
         "source": "http://mmurl.de/judo52",
-        "target": "videos/5terKyu/Ukemi/MaeMawari.webm", "poster": {"timeIndex": "17.880"}
+        "target": "videos/5terKyu/Ukemi/MaeMawari.webm",
+        "poster": {
+            "timeIndex": "17.880"
+        }
     },
     {
         "source": "http://mmurl.de/judo53",
-        "target": "videos/5terKyu/NageWaza/MoroteSeoiNage.webm", "poster": {"timeIndex": "23.400"}
+        "target": "videos/5terKyu/NageWaza/MoroteSeoiNage.webm",
+        "poster": {
+            "timeIndex": "23.400"
+        }
     },
     {
         "source": "http://mmurl.de/judo54",
-        "target": "videos/5terKyu/NageWaza/SasaeTsuriKomiAshiHizaGuruma.webm", "poster": {"timeIndex": "24.760"}
+        "target": "videos/5terKyu/NageWaza/SasaeTsuriKomiAshiHizaGuruma.webm",
+        "poster": {
+            "timeIndex": "24.760"
+        }
     },
     {
         "source": "http://mmurl.de/judo55",
-        "target": "videos/5terKyu/NageWaza/OkuriAshiBarei.webm", "poster": {"timeIndex": "16.720"}
+        "target": "videos/5terKyu/NageWaza/OkuriAshiBarei.webm",
+        "poster": {
+            "timeIndex": "16.720"
+        }
     },
     {
         "source": "http://mmurl.de/judo56",
-        "target": "videos/5terKyu/NageWaza/OSotoGari.webm", "poster": {"timeIndex": "23.640"}
+        "target": "videos/5terKyu/NageWaza/OSotoGari.webm",
+        "poster": {
+            "timeIndex": "23.640"
+        }
     },
     {
         "source": "http://mmurl.de/judo57",
-        "target": "videos/5terKyu/NageWaza/HaraiGoshi.webm", "poster": {"timeIndex": "16.440"}
+        "target": "videos/5terKyu/NageWaza/HaraiGoshi.webm",
+        "poster": {
+            "timeIndex": "16.440"
+        }
     },
     {
         "source": "http://mmurl.de/judo58",
-        "target": "videos/5terKyu/KansetsuWaza/JujiGatame.webm", "poster": {"timeIndex": "27.040"}
+        "target": "videos/5terKyu/KansetsuWaza/JujiGatame.webm",
+        "poster": {
+            "timeIndex": "27.040"
+        }
     },
     {
         "source": "http://mmurl.de/judo59",
-        "target": "videos/5terKyu/KansetsuWaza/UdeGarami.webm", "poster": {"timeIndex": "15.040"}
+        "target": "videos/5terKyu/KansetsuWaza/UdeGarami.webm",
+        "poster": {
+            "timeIndex": "15.040"
+        }
     },
     {
         "source": "http://mmurl.de/judo60",
-        "target": "videos/5terKyu/TachiWaza/KonterEindreh.webm", "poster": {"timeIndex": "17.560"}
+        "target": "videos/5terKyu/TachiWaza/KonterEindreh.webm",
+        "poster": {
+            "timeIndex": "17.560"
+        }
     },
     {
         "source": "http://mmurl.de/judo61",
-        "target": "videos/5terKyu/TachiWaza/KonterFuss.webm", "poster": {"timeIndex": "13.120"}
+        "target": "videos/5terKyu/TachiWaza/KonterFuss.webm",
+        "poster": {
+            "timeIndex": "13.120"
+        }
     },
     {
         "source": "http://mmurl.de/judo62",
-        "target": "videos/5terKyu/TachiWaza/KombiEindreh.webm", "poster": {"timeIndex": "19.880"}
+        "target": "videos/5terKyu/TachiWaza/KombiEindreh.webm",
+        "poster": {
+            "timeIndex": "19.880"
+        }
     },
     {
         "source": "http://mmurl.de/judo63",
-        "target": "videos/5terKyu/TachiWaza/KombiFuss.webm", "poster": {"timeIndex": "28.200"}
+        "target": "videos/5terKyu/TachiWaza/KombiFuss.webm",
+        "poster": {
+            "timeIndex": "28.200"
+        }
     },
     {
         "source": "http://mmurl.de/judo64",
-        "target": "videos/5terKyu/NeWaza/UkesBefreiungZuJujiGatame.webm", "poster": {"timeIndex": "24.600"}
+        "target": "videos/5terKyu/NeWaza/UkesBefreiungZuJujiGatame.webm",
+        "poster": {
+            "timeIndex": "24.600"
+        }
     },
     {
         "source": "http://mmurl.de/judo65",
-        "target": "videos/5terKyu/NeWaza/UkesBefreiungZuUdeGarami.webm", "poster": {"timeIndex": "16.400"}
+        "target": "videos/5terKyu/NeWaza/UkesBefreiungZuUdeGarami.webm",
+        "poster": {
+            "timeIndex": "16.400"
+        }
     },
     {
         "source": "http://mmurl.de/judo66",
-        "target": "videos/5terKyu/NeWaza/BefreiungDurchBeinklammer.webm", "poster": {"timeIndex": "26.960"}
+        "target": "videos/5terKyu/NeWaza/BefreiungDurchBeinklammer.webm",
+        "poster": {
+            "timeIndex": "26.960"
+        }
     },
     {
         "source": "http://mmurl.de/judo67",
-        "target": "videos/5terKyu/NeWaza/BefreiungAusBeinklammer.webm", "poster": {"timeIndex": "22.600"}
+        "target": "videos/5terKyu/NeWaza/BefreiungAusBeinklammer.webm",
+        "poster": {
+            "timeIndex": "22.600"
+        }
     },
     {
         "source": "http://mmurl.de/judo68",
-        "target": "videos/5terKyu/NeWaza/JujiGgBank.webm", "poster": {"timeIndex": "36.520"}
+        "target": "videos/5terKyu/NeWaza/JujiGgBank.webm",
+        "poster": {
+            "timeIndex": "36.520"
+        }
     },
     {
         "source": "http://mmurl.de/judo69",
-        "target": "videos/5terKyu/Randori/Randori.webm", "poster": {"timeIndex": "54.160"}
+        "target": "videos/5terKyu/Randori/Randori.webm",
+        "poster": {
+            "timeIndex": "54.160"
+        }
     }
 ]
\ No newline at end of file
diff --git a/DieJudoGürtelprüfung/clipper b/DieJudoGürtelprüfung/clipper
index 62d3e2d..10b0340 100755
--- a/DieJudoGürtelprüfung/clipper
+++ b/DieJudoGürtelprüfung/clipper
@@ -63,6 +63,9 @@ def getDimensions(config, clip, bitrateProfiles):
 	return w, h
 
 def twoPassEncode(inputFilename, clip):
+	if os.path.isfile(clip['target']):
+		print(f"{clip['target']} already existing! Skipping!")
+		return
 	# cutting
 	kwArgs = {}
 	if 'from' in clip:
@@ -88,7 +91,7 @@ def twoPassEncode(inputFilename, clip):
 		vcodec=config['vcodec'], 
 		**{
 			# "an":None,
-			"y": None, 
+			# "y": None, 
 			"pass": "1", 
 			"b:v":     bitrateProfile[config['bitrateProfile']['bitrate']],
 			"minrate": bitrateProfile[config['bitrateProfile']['minrate']],
@@ -127,7 +130,7 @@ def twoPassEncode(inputFilename, clip):
 		clip['target'], 
 		vcodec=config['vcodec'], 
 		**{
-			"y": None, 
+			# "y": None, 
 			"pass": "2", 
 			"b:v":     bitrateProfile[config['bitrateProfile']['bitrate']],
 			"minrate": bitrateProfile[config['bitrateProfile']['minrate']],