expo/troggle
2
0
Fork 1
mirror of https://expo.survex.com/repositories/troggle/.git synced 2025-12-15 10:37:07 +00:00
Code Issues 18 Projects 3 Activity

Make .3d files in same dir as .svx

Browse Source
This commit is contained in:
Philip Sargent
2022-03-06 01:29:45 +00:00
parent 7a58aac08e
commit 3ac617431f
7 changed files with 46 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
core/models/caves.py
View File

@@ -3,7 +3,8 @@ import os
import datetime
import re
import json
from subprocess import call
import subprocess
from collections import defaultdict
from pathlib import Path
@@ -56,8 +57,15 @@ def writetrogglefile(filepath, filecontent):
f.write(filecontent)
#os.chmod(filepath, 0o664) # set file permissions to rw-rw-r--
# should replace .call with .run and capture_output=True
call([git, "add", filename], cwd=cwd)
call([git, "commit", "-m", f'Troggle online: cave or entrance edit -{filename}'], cwd=cwd)
sp = subprocess.run([git, "add", filename], cwd=cwd, capture_output=True, check=True, text=True)
if sp.returncode != 0:
print(f'git ADD {cwd}:\n\n' + str(sp.stderr) + '\n\n' + str(sp.stdout) + '\n\nreturn code: ' + str(sp.returncode))
sp = subprocess.run([git, "commit", "-m", f'Troggle online: cave or entrance edit -{filename}'], cwd=cwd, capture_output=True, check=True, text=True)
if sp.returncode != 0:
print(f'git COMMIT {cwd}:\n\n' + str(sp.stderr) + '\n\n' + str(sp.stdout) + '\n\nreturn code: ' + str(sp.returncode))
# not catching and re-raising any exceptions yet, inc. the stderr etc.,. We should do that.
class Area(TroggleModel):