From 20583b04c0c1a826aaddbf0342f4369a206dae2d Mon Sep 17 00:00:00 2001
From: Martin Green <martin.speleo@gmail.com>
Date: Sat, 25 Jun 2022 23:17:19 +0100
Subject: Allowed user to select/upload images when editing.  When uploaded
 thumbnails and description pages are automatically created.  Git commiting
 can now handle multiple files at once.

---
 lib/version_control.py | 43 +++++++++++++++++++++++++------------------
 1 file changed, 25 insertions(+), 18 deletions(-)

(limited to 'lib/version_control.py')

diff --git a/lib/version_control.py b/lib/version_control.py
index 6343914..01bd8ba 100644
--- a/lib/version_control.py
+++ b/lib/version_control.py
@@ -1,28 +1,35 @@
 import troggle.settings as settings
 import subprocess
 
-def write_and_commit(filepath, content, message):
+def write_and_commit(files, message):
     """Writes the content to the filepath and adds and commits the file to git.  If this fails, a WriteAndCommitError is raised."""
-    cwd = filepath.parent
-    filename = filepath.name
     git = settings.GIT
-    # GIT see also core/models/cave.py writetrogglefile()
-    # GIT see also core/views/uploads.py dwgupload()
-    
     try:
-        with open(filepath, "w", encoding="utf8") as f:
-            print(f'WRITING{cwd}---{filename} ')
-            # as the wsgi process www-data, we have group write-access but are not owner, so cannot chmod.
-            # os.chmod(filepath, 0o664) # set file permissions to rw-rw-r--
-            f.write(content)
-    except PermissionError:
-        raise WriteAndCommitError(f'CANNOT  save this file.\nPERMISSIONS incorrectly set on server for this file {filename}. Ask a nerd to fix this.')
+        for filepath, content, encoding in files:
+            cwd = filepath.parent
+            filename = filepath.name
+            # GIT see also core/models/cave.py writetrogglefile()
+            # GIT see also core/views/uploads.py dwgupload()
+    
+            if encoding:
+                mode = "w"
+                kwargs = {"encoding": encoding}
+            else:
+                mode = "wb"
+                kwargs = {}
+            try:
+                with open(filepath, mode, **kwargs) as f:
+                    print(f'WRITING{cwd}---{filename} ')
+                    # as the wsgi process www-data, we have group write-access but are not owner, so cannot chmod.
+                    # os.chmod(filepath, 0o664) # set file permissions to rw-rw-r--
+                    f.write(content)
+            except PermissionError:
+                raise WriteAndCommitError(f'CANNOT  save this file.\nPERMISSIONS incorrectly set on server for this file {filename}. Ask a nerd to fix this.')
 
-    try:
-        cp_add = subprocess.run([git, "add", filename], cwd=cwd, capture_output=True, text=True)
-        if cp_add.returncode != 0:
-            msgdata = 'Ask a nerd to fix this.\n\n' + cp_add.stderr + '\n\n' + cp_add.stdout  + '\n\nreturn code: ' + str(cp_add.returncode)
-            raise WriteAndCommitError(f'CANNOT git on server for this file {filename}. Edits saved but not added to git.\n\n' + msgdata)
+            cp_add = subprocess.run([git, "add", filename], cwd=cwd, capture_output=True, text=True)
+            if cp_add.returncode != 0:
+                msgdata = 'Ask a nerd to fix this.\n\n' + cp_add.stderr + '\n\n' + cp_add.stdout  + '\n\nreturn code: ' + str(cp_add.returncode)
+                raise WriteAndCommitError(f'CANNOT git on server for this file {filename}. Edits saved but not added to git.\n\n' + msgdata)
        
         cp_commit = subprocess.run([git, "commit", "-m", message], cwd=cwd, capture_output=True, text=True)
         # This produces return code = 1 if it commits OK, but when the repo still needs to be pushed to origin/expoweb
-- 
cgit v1.2.3