summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitignore2
-rw-r--r--photoblaster/config.py23
2 files changed, 20 insertions, 5 deletions
diff --git a/.gitignore b/.gitignore
index ac0c47c..8a942e7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,4 +5,4 @@
*.pyc
*.un~
./logs/*
-*.ropeproject
+*.ropeproject*
diff --git a/photoblaster/config.py b/photoblaster/config.py
index b4ad22e..409583d 100644
--- a/photoblaster/config.py
+++ b/photoblaster/config.py
@@ -10,12 +10,27 @@ MAX_SIZE = 1024 * 1024 * 1.2 * 1.5
BIN_CONVERT = "/usr/bin/convert"
BIN_COMPOSITE = "/usr/bin/composite"
BIN_IDENTIFY = "/usr/bin/identify"
-THREEDROTATE = "./bin/3Drotate"
-GRID = "./bin/grid"
-BEVELBORDER = "./bin/bevelborder"
+
+_RELATIVE_DIR = os.path.dirname(__file__)
+
+
+# FIXME see how django does it
+def _bin_dir(filename):
+ return os.path.abspath(
+ os.path.join(
+ _RELATIVE_DIR,
+ "..",
+ "bin",
+ filename
+ )
+ )
+
+THREEDROTATE = _bin_dir("3Drotate")
+GRID = _bin_dir("grid")
+BEVELBORDER = _bin_dir("bevelborder")
# common parameters
-DEFAULT_FINALFORMAT = "png";
+DEFAULT_FINALFORMAT = "png"
DEFAULT_HEIGHT = 400
DEFAULT_WIDTH = 600