Marc
/
server
forked from github/server
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' into develop 

Conflicts:
	process/compress.sh
This commit is contained in:
Enno Rehling 2015-09-10 16:02:41 +02:00
parent 33aff91dc3 db94830040
commit b833d58792
2 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
process/compress.py
View File

@ -3,7 +3,7 @@
from sys import argv, exit from sys import argv, exit
from string import join from string import join
from os import access, R_OK from os import access, R_OK
from os import system from os import system, symlink
gamename='Eressea' gamename='Eressea'
@ -38,11 +38,8 @@ for line in infile.readlines():
if not options.has_key("reports"): if not options.has_key("reports"):
continue continue
reports = options["reports"].split(",") reports = options["reports"].split(",")
# reports = reports + [ "iso.cr" ]
prefix = "%(turn)s-%(faction)s." % options prefix = "%(turn)s-%(faction)s." % options
files=[]
times="../parteien"
if os.path.isfile(times):
files = files + [ times ]
if options["compression"]=="zip": if options["compression"]=="zip":
output = prefix+"zip" output = prefix+"zip"
files = [output] files = [output]
@ -54,8 +51,9 @@ for line in infile.readlines():
filename = "%s%s" % (prefix, extension) filename = "%s%s" % (prefix, extension)
if (access(filename, R_OK)): if (access(filename, R_OK)):
parameters = parameters + [ filename ] parameters = parameters + [ filename ]
system("zip %s -q -m -j -1 %s" % (output, join(parameters," "))) system("zip %s -q -m -j %s" % (output, join(parameters," ")))
else: else:
files = []
for extension in reports: for extension in reports:
if extension!='': if extension!='':
filename = "%s%s" % (prefix, extension) filename = "%s%s" % (prefix, extension)
@ -66,7 +64,12 @@ for line in infile.readlines():
#print output, "exists, skipping" #print output, "exists, skipping"
continue continue
system("bzip2 %s" % filename) system("bzip2 %s" % filename)
#print files if not access('../wochenbericht.txt'):
os.symlink('../parteien', '../wochenbericht.txt')
extras = [ '../wochenbericht.txt', '../express.txt' ]
for extra in extras:
if access(extra, R_OK):
files = files + [extra]
options["files"] = join(files, " ") options["files"] = join(files, " ")
batch = file("%s.sh" % options["faction"], "w") batch = file("%s.sh" % options["faction"], "w")
batch.write(template % options) batch.write(template % options)

6
process/compress.sh
View File

@ -15,10 +15,10 @@ then
fi fi
if [ ! -d $GAME/reports ]; then if [ ! -d $GAME/reports ]; then
echo "cannot find reprts directory in $GAME" echo "cannot find reports directory in $GAME"
exit exit -1
fi fi
cd $GAME/reports cd $GAME/reports
compress.py $TURN "$GAME_NAME" $HOME/bin/compress.py $TURN "$GAME_NAME"
cd - cd -