tarina

commit b6f75bb6055bbb2860be28d3dad1fb7642305993
parent d3fdb2796e87b178efcde31f1ad06dc2a67b306b
Author: rob <rob@tarina.org>
Date:   Sun, 19 Mar 2023 22:25:30 +0000

version update most

Diffstat:
M
VERSION
 | 
2
+-
M
tarina.py
 | 
23
+++++++++++++++--------

2 files changed, 16 insertions(+), 9 deletions(-)
diff --git a/VERSION b/VERSION
@@ -1,2 +1,2 @@
-1.22
+1.23
 katanacam
diff --git a/tarina.py b/tarina.py
@@ -784,10 +784,10 @@ def main():
         #UP
         elif pressed == 'up':
             if menu[selected] == 'FILM:':
-                if filmname == 'onthefloor':
-                    filmname = getfilms(filmfolder)[1][0]
-                    filename_back = 'onthefloor'
-                    loadfilmsettings = True
+                filmname = 'onthefloor'
+                filmname_back = filmname
+                filmname = loadfilm(filmname, filmfolder)
+                loadfilmsettings = True
             if menu[selected] == 'BRIGHT:':
                 camera.brightness = min(camera.brightness + 1, 99)
             elif menu[selected] == 'CONT:':
@@ -911,10 +911,13 @@ def main():
         #DOWN
         elif pressed == 'down':
             if menu[selected] == 'FILM:':
-                filmname = 'onthefloor'
-                filmname_back = filmname
-                filmname = loadfilm(filmname, filmfolder)
-                loadfilmsettings = True
+                if filmname == 'onthefloor':
+                    filmname = getfilms(filmfolder)[1][0]
+                    filename_back = 'onthefloor'
+                    loadfilmsettings = True
+                else:
+                    filmname = 'onthefloor'
+                    loadfilmsettings = True
             elif menu[selected] == 'BRIGHT:':
                 camera.brightness = max(camera.brightness - 1, 0)
             elif menu[selected] == 'CONT:':
@@ -1950,6 +1953,10 @@ def remove(filmfolder, filmname, scene, shot, take, sceneshotortake):
                         scene = countscenes(filmfolder, filmname)
                         shot=1
                         take=1
+                    elif sceneshotortake == 'film':
+                        foldername = filmfolder + filmname
+                        os.system('rm -r ' + foldername)
+                        os.makedirs(filmfolder+'onthefloor')
                     return
                 else:
                     if sceneshotortake == 'take':