tarina

commit 3ab6ad7a77c4d7dc6f12506d2a88ba2d606b0259
parent 46ca950448d1d3addee9d8d9715b3e16f8fa2195
Author: rob <rob@tarina.org>
Date:   Sun, 19 Jan 2020 22:11:16 +0200

youtube uploader now works correctly

Diffstat:
M
mods/youtube-upload.sh
 | 
21
+++++++++++++++++----
M
tarina.py
 | 
7
+++----

2 files changed, 20 insertions(+), 8 deletions(-)
diff --git a/mods/youtube-upload.sh b/mods/youtube-upload.sh
@@ -4,10 +4,23 @@
 # $2 filename
 PATH=`pwd`
 
-echo 'Youtube Title: '
-read title
-echo 'Description: '
-read description
+printf "\033c"
+
+/bin/cat <<'EOF'     
+
+                                _                          _                 _ 
+                      _        | |                        | |               | |
+    _   _  ___  _   _| |_ _   _| | _   ____    _   _ ____ | | ___   ____  _ | |
+   | | | |/ _ \| | | |  _) | | | || \ / _  )  | | | |  _ \| |/ _ \ / _  |/ || |
+   | |_| | |_| | |_| | |_| |_| | |_) | (/ /   | |_| | | | | | |_| ( ( | ( (_| |
+    \__  |\___/ \____|\___)____|____/ \____)   \____| ||_/|_|\___/ \_||_|\____|
+    (____/                                           |_|                        
+    
+
+EOF
+read -p "   Youtube film title: " title
+read -p "   Youtube film description: " description
+
 
 while true; do
     read -p 'Do you want your video public (y)es (n)o?:' yn
diff --git a/tarina.py b/tarina.py
@@ -1712,7 +1712,8 @@ def waitforanykey():
             return
 
 def getbutton(lastbutton, buttonpressed, buttontime, holdbutton):
-    val = term.inkey(timeout=0)
+    with term.cbreak():
+        val = term.inkey(timeout=0)
     if val.is_sequence:
         event = val.name
         print(event)
@@ -2034,7 +2035,6 @@ def main():
                             try:
                                 run_command(cmd)
                             except Exception as e: logger.warning(e)
-                            time.sleep(10)
                             startinterface()
                             camera = startcamera(lens)
                             loadfilmsettings = True
@@ -2591,8 +2591,7 @@ def main():
 if __name__ == '__main__':
     import sys
     try:
-        with term.cbreak():
-            main()
+        main()
     except:
         os.system('pkill arecord')
         os.system('pkill startinterface')