gonzopi

commit ef0c291a5b0a3376eb0fcf8ac61689274f590614
parent ebdd43a1f50063e3e1aa478bb971406c8a5613ed
Author: rbckman <rob@tarina.org>
Date:   Tue, 15 Oct 2024 21:28:46 +0100

added size to non rendered videos

Diffstat:
M
VERSION
 | 
2
+-
M
gonzopi.py
 | 
3
++-
M
srv/gonzopiserver.py
 | 
16
++++++++--------

3 files changed, 11 insertions(+), 10 deletions(-)
diff --git a/VERSION b/VERSION
@@ -1,2 +1,2 @@
-1.65
+1.71
 Jackson
diff --git a/gonzopi.py b/gonzopi.py
@@ -1920,7 +1920,8 @@ def main():
                         videosize=countsize(foldername + filename + '.mp4')
                         vumetermessage('videosize: '+str(round(videosize/1000,2))+' Mb')
                     except:
-                        vumetermessage('not rendered')
+                        videosize=countsize(foldername + filename + '.h264')
+                        vumetermessage('not rendered, videosize: '+str(round(videosize/1000,2))+' Mb')
                 overlay = displayimage(camera, imagename, overlay, 3)
                 oldscene = scene
                 oldshot = shot
diff --git a/srv/gonzopiserver.py b/srv/gonzopiserver.py
@@ -450,22 +450,22 @@ class api:
                         #    menudone=menudone+'<br>'
                         #if p == 30:
                         #    menudone=menudone+'<br>'
-                    if p == 3:
+                    if p == 4:
                         try:
                             film=i.split(':')[1].rstrip('\n')
                         except:
                             film=None
-                    if p == 4 and film != None:
+                    if p == 5 and film != None:
                         try:
                             scene=int(i.split(':')[1].split('/')[0])
                         except:
                             scene=1
-                    if p == 5 and film != None:
+                    if p == 6 and film != None:
                         try:
                             shot=int(i.split(':')[1].split('/')[0])
                         except:
                             shot=1
-                    if p == 6 and film != None:
+                    if p == 7 and film != None:
                         try:
                             take=int(i.split(':')[1].split('/')[0])
                         except:
@@ -478,14 +478,14 @@ class api:
             thumb = ''
             video = ''
             if film != None:
-                if selected == 3:
+                if selected == 4:
                     video = '/'+filmfolder + film +'/'+ film+'.mp4'
-                elif selected == 4:
-                    video = '/'+filmfolder + film + '/scene' + str(scene).zfill(3) + '/scene.mp4'
                 elif selected == 5:
-                    video = '/'+filmfolder + film + '/scene' + str(scene).zfill(3) + '/shot' + str(shot).zfill(3) + '/take' + str(take).zfill(3) + '.mp4'
+                    video = '/'+filmfolder + film + '/scene' + str(scene).zfill(3) + '/scene.mp4'
                 elif selected == 6:
                     video = '/'+filmfolder + film + '/scene' + str(scene).zfill(3) + '/shot' + str(shot).zfill(3) + '/take' + str(take).zfill(3) + '.mp4'
+                elif selected == 7:
+                    video = '/'+filmfolder + film + '/scene' + str(scene).zfill(3) + '/shot' + str(shot).zfill(3) + '/take' + str(take).zfill(3) + '.mp4'
                 else:
                     video = '/'+filmfolder + film + '/scene' + str(scene).zfill(3) + '/shot' + str(shot).zfill(3) + '/take' + str(take).zfill(3) + '.mp4'
                 thumb = '/'+filmfolder + film + "/scene" + str(scene).zfill(3) + "/shot" + str(shot).zfill(3) + "/take" + str(take).zfill(3) + ".jpeg"