gonzopi

commit 717983fb71ea42e49233e7b0a61ee9a4e2ed7ba1
parent ad0d919d1899641a275be929ef69cc230cbc70d7
Author: rob <rob@tarina.org>
Date:   Thu, 18 Jan 2024 09:27:45 +0000

change the default directory to /home/pi/gonzopifilms

Diffstat:
M
README.md
 | 
2
--
M
gonzopi.py
 | 
19
++++++++++---------
M
srv/gonzopiserver.py
 | 
14
+++++++-------

3 files changed, 17 insertions(+), 18 deletions(-)
diff --git a/README.md b/README.md
@@ -1,7 +1,6 @@
 Gonzo Pi
 =============
 
-<<<<<<< HEAD
 Go Gonzo with the Ultimate Filmmaking Device!
 How to build and use it here [https://github.com/rbckman/gonzopi_build](https://github.com/rbckman/gonzopi_build)
 =======
@@ -14,7 +13,6 @@ No, need to build custom case, or buttons, this will work with a Raspberry Pi an
 If you want to build it, there's a complete guide here [https://github.com/rbckman/gonzopi_build/blob/master/gonzopi-manual.md#building-repairing-and-modding](https://github.com/rbckman/gonzopi_build/blob/master/gonzopi-manual.md#building-repairing-and-modding)
 
 If you want to order a prebuilt device contact go(at)gonzopi.org (only preorders now)
->>>>>>> 32c849051bc25683e63d0f3dc05db5d2835d809e
 
 Software
 --------
diff --git a/gonzopi.py b/gonzopi.py
@@ -2386,15 +2386,16 @@ def getconfig(camera):
                     config.write(f)
             time.sleep(0.02)
 
-    if filmfolder != '':
-        return version, camera_revision, filmfolder+'/'
-    else:
-        filmfolder = namesomething('Your film folder: ', home+'/Videos')
-        config['USER'] = {}
-        config['USER']['filmfolder'] = filmfolder
-        with open(configfile, 'w') as f:
-            config.write(f)
-        return camera_model, camera_revision, filmfolder+'/'
+    return version, camera_revision, home+'/gonzopifilms/'
+    #if filmfolder != '':
+    #    return version, camera_revision, filmfolder+'/'
+    #else:
+    #    filmfolder = namesomething('Your film folder: ', home+'/Videos')
+    #    config['USER'] = {}
+    #    config['USER']['filmfolder'] = filmfolder
+    #    with open(configfile, 'w') as f:
+    #        config.write(f)
+    #    return camera_model, camera_revision, filmfolder+'/'
 
 #-------------Calc folder size with du-----------
 
diff --git a/srv/gonzopiserver.py b/srv/gonzopiserver.py
@@ -41,12 +41,12 @@ def usbfilmfolder():
             break
 
 home = os.path.expanduser('~')
-configfile = home + '/.gonzopi/config.ini'
-configdir = os.path.dirname(configfile)
-config = configparser.ConfigParser()
-if config.read(configfile):
-    filmfolder = config['USER']['filmfolder']+'/'
-
+#configfile = home + '/.gonzopi/config.ini'
+#configdir = os.path.dirname(configfile)
+#config = configparser.ConfigParser()
+#if config.read(configfile):
+#    filmfolder = config['USER']['filmfolder']+'/'
+filmfolder = '/home/pi/gonzopifilms/'
 
 os.system("unlink static/*")
 #CHECK IF FILMING TO USB STORAGE
@@ -58,7 +58,7 @@ if filmfolderusb:
     filmfolder='static/gonzopifilms/'
 else:
     os.system("ln -s -t static/ " + filmfolder)
-    filmfolder='static/Videos/'
+    filmfolder='static/gonzopifilms/'
     #fix filmfolder root to Videos/gonzopifilms
 
 basedir = os.path.dirname(os.path.realpath(__file__))