From 970557d7201e52a314e1f938776a0bea9788f51b Mon Sep 17 00:00:00 2001 From: Stefano Pigozzi Date: Sun, 11 Oct 2020 15:30:31 +0200 Subject: [PATCH] =?UTF-8?q?=F0=9F=A7=B9=20Apply=20PyCharm's=20PEP8=20autof?= =?UTF-8?q?ormatter?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- aulavirtuale-dl.py | 41 +++++++++++++++++++---------------------- 1 file changed, 19 insertions(+), 22 deletions(-) diff --git a/aulavirtuale-dl.py b/aulavirtuale-dl.py index aabf60a..ae1d5d4 100644 --- a/aulavirtuale-dl.py +++ b/aulavirtuale-dl.py @@ -2,19 +2,18 @@ import os from bs4 import BeautifulSoup import urllib - -#Base link to the lessons page +# Base link to the lessons page edunovaLink = "https://davy04.edunova.it/presentation/" -#Relative path to the slides video +# Relative path to the slides video videoSuffix = "/deskshare/deskshare.webm" -#Relative path to the presentation audio +# Relative path to the presentation audio audioSuffix = "/video/webcams.mp4" -#slides = "https://davy04.edunova.it/presentation/17d59e4eb742c498e605406fd441c1a2d7eb4bf0-1601024050226/shapes.svg" +# slides = "https://davy04.edunova.it/presentation/17d59e4eb742c498e605406fd441c1a2d7eb4bf0-1601024050226/shapes.svg" os.makedirs("VideoLezioni", exist_ok=True) os.chdir("VideoLezioni") -#Dictionary containing the id of the saved lessons +# Dictionary containing the id of the saved lessons meetingsID = { '021020': '17d59e4eb742c498e605406fd441c1a2d7eb4bf0-1601628738707', '290920': '17d59e4eb742c498e605406fd441c1a2d7eb4bf0-1601380547311', @@ -23,14 +22,12 @@ meetingsID = { '091020': '17d59e4eb742c498e605406fd441c1a2d7eb4bf0-1602232967548', } - - for (date, meetId) in meetingsID.items(): - if(os.path.exists(f"Gestione{date}joinedWithSlide.mp4")): + if os.path.exists(f"Gestione{date}joinedWithSlide.mp4"): print("Il video e' gia' stato scaricato") continue - #Assemblo il comando ffmpeg con i riferimenti web a video e audio della presentazione con id {meetId} + # Assemblo il comando ffmpeg con i riferimenti web a video e audio della presentazione con id {meetId} downloadAndJoin = f"ffmpeg -i {edunovaLink}{meetId}{videoSuffix} -i {edunovaLink}{meetId}{audioSuffix} -map 0:v -map 1:a -c:v copy -shortest Gestione{date}joined.mp4" os.system(downloadAndJoin) svgSlide = urllib.request.urlopen(f"{edunovaLink}{meetId}/shapes.svg").read() @@ -38,16 +35,16 @@ for (date, meetId) in meetingsID.items(): soup = BeautifulSoup(svgSlide, 'html.parser') usefulImg = [] for img in soup.find_all('image'): - + start = img.get('in') end = img.get('out') imgLink = img.get('xlink:href') - if(not imgLink.endswith("deskshare.png")): + if not imgLink.endswith("deskshare.png"): usefulImg.append([float(start), float(end), imgLink]) imgSorted = sorted(usefulImg) print(imgSorted) - if(len(imgSorted)==0): + if len(imgSorted) == 0: os.rename(f"Gestione{date}joined.mp4", f"Gestione{date}joinedWithSlide.mp4") continue @@ -59,25 +56,25 @@ for (date, meetId) in meetingsID.items(): imgLinkList += f"-i \"{slideBase}{l[2]}\" " for i in range(len(imgSorted)): - imgScaleList += f"[{i+1}:v] scale=1280:720 [ol{i}]; " + imgScaleList += f"[{i + 1}:v] scale=1280:720 [ol{i}]; " imgOverlayList = f"[0:v] [ol0] overlay=0:0:enable='between(t,{int(imgSorted[0][0])},{int(imgSorted[0][1])})' [olo0]; " - for i in range(1, len(imgSorted)-1): - imgOverlayList += f"[olo{i-1}] [ol{i}] overlay=0:0:enable='between(t,{int(imgSorted[i][0])},{int(imgSorted[i][1])})' [olo{i}]; " + for i in range(1, len(imgSorted) - 1): + imgOverlayList += f"[olo{i - 1}] [ol{i}] overlay=0:0:enable='between(t,{int(imgSorted[i][0])},{int(imgSorted[i][1])})' [olo{i}]; " - imgOverlayList += f"[olo{len(imgSorted)-1-1}] [ol{len(imgSorted)-1}] overlay=0:0:enable='between(t,{int(imgSorted[len(imgSorted)-1][0])},{int(imgSorted[len(imgSorted)-1][1])})'" - - #Informazioni di debug sulle immagini e sui momenti nei quali inserirle nel video + imgOverlayList += f"[olo{len(imgSorted) - 1 - 1}] [ol{len(imgSorted) - 1}] overlay=0:0:enable='between(t,{int(imgSorted[len(imgSorted) - 1][0])},{int(imgSorted[len(imgSorted) - 1][1])})'" + + # Informazioni di debug sulle immagini e sui momenti nei quali inserirle nel video print(imgLinkList) print(imgScaleList) print(imgOverlayList) - #Comando di esempio di utilizzo di ffmpeg per incollare diverse immagini in diversi momenti su un video - #ffmpeg -i Untitled.mp4 -i slide-1.png -i slide-2.png -filter_complex "[1:v] scale=640:480 [ol]; [2:v] scale=640:480 [ol2]; [0:v] [ol] overlay=0:0:enable='between(t,0,20)' [ol1]; [ol1] [ol2] overlay=0:0:enable='between(t, 30,40)'" -codec:a copy example_marked.mp4 + # Comando di esempio di utilizzo di ffmpeg per incollare diverse immagini in diversi momenti su un video + # ffmpeg -i Untitled.mp4 -i slide-1.png -i slide-2.png -filter_complex "[1:v] scale=640:480 [ol]; [2:v] scale=640:480 [ol2]; [0:v] [ol] overlay=0:0:enable='between(t,0,20)' [ol1]; [ol1] [ol2] overlay=0:0:enable='between(t, 30,40)'" -codec:a copy example_marked.mp4 ffmpegCommand = f'ffmpeg -i Gestione{date}joined.mp4 {imgLinkList} -filter_complex "{imgScaleList}{imgOverlayList}" -codec:a copy Gestione{date}joinedWithSlide.mp4' os.system(ffmpegCommand) - #Rimuovo il file intermedio senza slide + # Rimuovo il file intermedio senza slide os.remove(f"Gestione{date}joined.mp4")