Attached Files |
0001-webtiles-Add-support-for-dir.patch [^] (3,020 bytes) 2014-10-16 01:21 [Show Content] [Hide Content]From 07f0ae6d502809f6de4b6e6afdc6028aaaba7d1f Mon Sep 17 00:00:00 2001
From: Alex Jurkiewicz <alex@jurkiewi.cz>
Date: Thu, 16 Oct 2014 10:10:48 +1100
Subject: [PATCH] webtiles: Add support for -dir
---
crawl-ref/source/webserver/config.py | 4 ++++
crawl-ref/source/webserver/process_handler.py | 6 ++++--
2 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/crawl-ref/source/webserver/config.py b/crawl-ref/source/webserver/config.py
index 0f149e2..0f6970d 100644
--- a/crawl-ref/source/webserver/config.py
+++ b/crawl-ref/source/webserver/config.py
@@ -53,6 +53,7 @@ games = OrderedDict([
ttyrec_path = "./rcs/ttyrecs/%n",
socket_path = "./rcs",
client_path = "./webserver/game_data/",
+ dir_path = "./",
morgue_url = None,
send_json_options = True)),
("sprint-web-trunk", dict(
@@ -65,6 +66,7 @@ games = OrderedDict([
ttyrec_path = "./rcs/ttyrecs/%n",
socket_path = "./rcs",
client_path = "./webserver/game_data/",
+ dir_path = "./",
morgue_url = None,
send_json_options = True,
options = ["-sprint"])),
@@ -78,6 +80,7 @@ games = OrderedDict([
ttyrec_path = "./rcs/ttyrecs/%n",
socket_path = "./rcs",
client_path = "./webserver/game_data/",
+ dir_path = "./",
morgue_url = None,
send_json_options = True,
options = ["-zotdef"])),
@@ -91,6 +94,7 @@ games = OrderedDict([
ttyrec_path = "./rcs/ttyrecs/%n",
socket_path = "./rcs",
client_path = "./webserver/game_data/",
+ dir_path = "./",
morgue_url = None,
send_json_options = True,
options = ["-tutorial"])),
diff --git a/crawl-ref/source/webserver/process_handler.py b/crawl-ref/source/webserver/process_handler.py
index c86ae0f..44c97b3 100644
--- a/crawl-ref/source/webserver/process_handler.py
+++ b/crawl-ref/source/webserver/process_handler.py
@@ -335,7 +335,8 @@ class CrawlProcessHandlerBase(object):
self.username + ".rc"),
"-macro", os.path.join(self.config_path("macro_path"),
self.username + ".macro"),
- "-morgue", self.config_path("morgue_path")]
+ "-morgue", self.config_path("morgue_path"),
+ "-dir", self.config_path("dir_path")]
if "options" in game:
call += game["options"]
@@ -719,7 +720,8 @@ class DGLLessCrawlProcessHandler(CrawlProcessHandler):
ttyrec_path = "./",
inprogress_path = "./",
socket_path = "./",
- client_path = "./webserver/game_data")
+ client_path = "./webserver/game_data",
+ dir_path = "./")
super(DGLLessCrawlProcessHandler, self).__init__(game_params,
"game",
logger, io_loop)
--
1.7.11.3
v2-0001-webtiles-Add-support-for-dir.patch [^] (2,312 bytes) 2014-10-16 02:24 [Show Content] [Hide Content]From 604f4779df826eabe9c4e4a8d9f773a8b9f0e2d3 Mon Sep 17 00:00:00 2001
From: Alex Jurkiewicz <alex@jurkiewi.cz>
Date: Thu, 16 Oct 2014 10:10:48 +1100
Subject: [PATCH] webtiles: Add support for -dir
---
crawl-ref/source/webserver/config.py | 4 ++++
crawl-ref/source/webserver/process_handler.py | 4 ++++
2 files changed, 8 insertions(+)
diff --git a/crawl-ref/source/webserver/config.py b/crawl-ref/source/webserver/config.py
index 0f149e2..bb05870 100644
--- a/crawl-ref/source/webserver/config.py
+++ b/crawl-ref/source/webserver/config.py
@@ -53,6 +53,7 @@ games = OrderedDict([
ttyrec_path = "./rcs/ttyrecs/%n",
socket_path = "./rcs",
client_path = "./webserver/game_data/",
+ # dir_path = "./", # optional
morgue_url = None,
send_json_options = True)),
("sprint-web-trunk", dict(
@@ -65,6 +66,7 @@ games = OrderedDict([
ttyrec_path = "./rcs/ttyrecs/%n",
socket_path = "./rcs",
client_path = "./webserver/game_data/",
+ # dir_path = "./", # optional
morgue_url = None,
send_json_options = True,
options = ["-sprint"])),
@@ -78,6 +80,7 @@ games = OrderedDict([
ttyrec_path = "./rcs/ttyrecs/%n",
socket_path = "./rcs",
client_path = "./webserver/game_data/",
+ # dir_path = "./", # optional
morgue_url = None,
send_json_options = True,
options = ["-zotdef"])),
@@ -91,6 +94,7 @@ games = OrderedDict([
ttyrec_path = "./rcs/ttyrecs/%n",
socket_path = "./rcs",
client_path = "./webserver/game_data/",
+ # dir_path = "./", # optional
morgue_url = None,
send_json_options = True,
options = ["-tutorial"])),
diff --git a/crawl-ref/source/webserver/process_handler.py b/crawl-ref/source/webserver/process_handler.py
index c86ae0f..83c976e 100644
--- a/crawl-ref/source/webserver/process_handler.py
+++ b/crawl-ref/source/webserver/process_handler.py
@@ -340,6 +340,10 @@ class CrawlProcessHandlerBase(object):
if "options" in game:
call += game["options"]
+ dir_path = self.config_path("dir_path")
+ if dir_path:
+ call += ['-dir', dir_path]
+
return call
def note_activity(self):
--
1.7.11.3
0001-webtiles-changes-Add-support-for-dir.patch [^] (1,983 bytes) 2014-10-17 03:53 [Show Content] [Hide Content]From 440a116180046c208ee782c42f0456b7783e49a3 Mon Sep 17 00:00:00 2001
From: Alex Jurkiewicz <alex@jurkiewi.cz>
Date: Fri, 17 Oct 2014 12:52:40 +1100
Subject: [PATCH] webtiles-changes: Add support for -dir
---
crawl-ref/source/webserver/config.toml | 4 ++++
crawl-ref/source/webserver/process_handler.py | 4 ++++
2 files changed, 8 insertions(+)
diff --git a/crawl-ref/source/webserver/config.toml b/crawl-ref/source/webserver/config.toml
index bcc99b7..e0012e2 100644
--- a/crawl-ref/source/webserver/config.toml
+++ b/crawl-ref/source/webserver/config.toml
@@ -94,6 +94,7 @@ morgue_path = "./rcs/%n"
client_path = "./webserver/game_data/"
macro_path = "./rcs/"
ttyrec_path = "./rcs/ttyrecs/%n"
+#dir_path = "./" # optional
send_json_options = true
# morgue_url = ""
@@ -112,6 +113,7 @@ morgue_path = "./rcs/%n"
client_path = "./webserver/game_data/"
macro_path = "./rcs/"
ttyrec_path = "./rcs/ttyrecs/%n"
+#dir_path = "./" # optional
send_json_options = true
[[games]]
@@ -129,6 +131,7 @@ morgue_path = "./rcs/%n"
client_path = "./webserver/game_data/"
macro_path = "./rcs/"
ttyrec_path = "./rcs/ttyrecs/%n"
+#dir_path = "./" # optional
send_json_options = true
[[games]]
@@ -146,6 +149,7 @@ morgue_path = "./rcs/%n"
client_path = "./webserver/game_data/"
macro_path = "./rcs/"
ttyrec_path = "./rcs/ttyrecs/%n"
+#dir_path = "./" # optional
send_json_options = true
[game_link_settings]
diff --git a/crawl-ref/source/webserver/process_handler.py b/crawl-ref/source/webserver/process_handler.py
index d165e41..b2d2f14 100644
--- a/crawl-ref/source/webserver/process_handler.py
+++ b/crawl-ref/source/webserver/process_handler.py
@@ -337,6 +337,10 @@ class CrawlProcessHandlerBase(object):
if "options" in game:
call += game["options"]
+ dir_path = self.config_path("dir_path")
+ if dir_path:
+ call += ['-dir', dir_path]
+
return call
def note_activity(self):
--
1.7.11.3
|