tarina

commit 4c045e6ce9c0b016057946013ebe2cfcaea5cfa4
parent 059c7893eccac3e24f20e3400400b9aadda3d071
Author: rob <rob@tarina.org>
Date:   Mon, 20 Mar 2023 17:51:58 +0000

done for now

Diffstat:
M
srv/tarinaserver.py
 | 
2
+-
M
srv/templates/index.html
 | 
33
+++++++++++++++++----------------

2 files changed, 18 insertions(+), 17 deletions(-)
diff --git a/srv/tarinaserver.py b/srv/tarinaserver.py
@@ -222,7 +222,7 @@ class index:
         if os.path.isfile(basedir+thumb) == False:
             print(basedir+thumb)
             thumb=''
-        return render.index(renderedfilms, unrenderedfilms, session.cameras, menu, selected,name,scene,shot,take,str,session.randhash,thumb,vumetermessage)
+        return render.index(renderedfilms, unrenderedfilms, session.cameras, menu, selected,name,scene,shot,take,str,session.randhash,thumb,vumetermessage,i.func)
 
 class films:
     def GET(self, film):
diff --git a/srv/templates/index.html b/srv/templates/index.html
@@ -1,4 +1,4 @@
-$def with (renderedfilms, unrenderedfilms, cameras, menu, selected,name,scene,shot,take,str,randhash,thumb,vumetermessage)
+$def with (renderedfilms, unrenderedfilms, cameras, menu, selected,name,scene,shot,take,str,randhash,thumb,vumetermessage,func)
 $var renderedfilms = renderedfilms
 $var unrenderedfilms = unrenderedfilms
 <script>
@@ -34,26 +34,27 @@ $else:
 
 $ take_link="static/Videos/" + name + "/scene" + str(scene).zfill(3) + "/shot" + str(shot).zfill(3) + "/take" + str(take).zfill(3) + ".mp4"
 $ scene_link="static/Videos/" + name + "/scene" + str(scene).zfill(3) + "/scene.mp4"
-$ film_link="static/Videos/" + name + "/scene/" +name+ ".mp4"
+$ film_link="static/Videos/" + name + "/" +name+ ".mp4"
 $if selected == 0:
     <a href='$film_link'><img width="99%" src="$picture?$randhash"/></a><br>
-$if selected == 1:
+$elif selected == 1:
     <a href='$scene_link'><img width="99%" src="$picture?$randhash"/></a><br>
-$else:
+$elif selected > 1:
     <a href='$take_link'><img width="99%" src="$picture?$randhash"/></a><br>
 <br>
-<h1>FILMS</h1>
+$if func=='show_all_films':
+    <h1>FILMS</h1>
 
-$for i in renderedfilms:
-    <p>--------------------------------------------------------------</p>
-    <h2>$i</h2>
-    <a href="static/Videos/$i/${i}.mp4"><img width="80%" src="static/Videos/$i/scene001/shot001/take001.jpeg?$randhash"/></a><br>
-    <p>Copy project to your destination:</p>
-    <pre>scp -r pi@tarina.local:~/Videos/$i ~/films/$i</pre>
-<h1>Films unrendered</h1>
+    $for i in renderedfilms:
+        <p>--------------------------------------------------------------</p>
+        <h2>$i</h2>
+        <a href="static/Videos/$i/${i}.mp4"><img width="80%" src="static/Videos/$i/scene001/shot001/take001.jpeg?$randhash"/></a><br>
+        <p>Copy project to your destination:</p>
+        <pre>scp -r pi@tarina.local:~/Videos/$i ~/films/$i</pre>
+    <h1>Films unrendered</h1>
 
-$for i in unrenderedfilms:
-    <h2>$i </h2>
-    <p>Copy project to your destination:</p>
-    <pre>scp -r pi@tarina.local:~/Videos/$i ~/films/$i</pre>
+    $for i in unrenderedfilms:
+        <h2>$i </h2>
+        <p>Copy project to your destination:</p>
+        <pre>scp -r pi@tarina.local:~/Videos/$i ~/films/$i</pre>