From 6da0beb5558d02803d376f8113896ffa908300d0 Mon Sep 17 00:00:00 2001
From: cedricbonhomme <devnull@localhost>
Date: Wed, 25 Aug 2010 07:00:56 +0200
Subject: Configuration file improvement (no need to set the path in the
 configuration file).

---
 cfg/pyAggr3g470r.cfg-sample |  1 -
 pyAggr3g470r.py             | 26 +++++++++++++-------------
 utils.py                    |  2 +-
 3 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/cfg/pyAggr3g470r.cfg-sample b/cfg/pyAggr3g470r.cfg-sample
index 419967d8..efe68963 100755
--- a/cfg/pyAggr3g470r.cfg-sample
+++ b/cfg/pyAggr3g470r.cfg-sample
@@ -1,5 +1,4 @@
 [global]
-path = /home/cedric/prog/python/projects/pyaggr3g470r/
 sqlitebase = ./var/feed.db
 [mail]
 mail_from = pyAggr3g470r@mail.com
diff --git a/pyAggr3g470r.py b/pyAggr3g470r.py
index cee15f51..04c6383f 100755
--- a/pyAggr3g470r.py
+++ b/pyAggr3g470r.py
@@ -22,31 +22,31 @@ bindhost = "0.0.0.0"
 cherrypy.config.update({ 'server.socket_port': 12556, 'server.socket_host': bindhost})
 
 path = {'/css/style.css': {'tools.staticfile.on': True, \
-                'tools.staticfile.filename':utils.path+'css/style.css'}, \
+                'tools.staticfile.filename':utils.path+'/css/style.css'}, \
         '/css/img/feed-icon-28x28.png': {'tools.staticfile.on': True, \
-                'tools.staticfile.filename':utils.path+'css/img/feed-icon-28x28.png'}, \
+                'tools.staticfile.filename':utils.path+'/css/img/feed-icon-28x28.png'}, \
         '/css/img/tuxrss.png': {'tools.staticfile.on': True, \
-                'tools.staticfile.filename':utils.path+'css/img/tuxrss.png'}, \
+                'tools.staticfile.filename':utils.path+'/css/img/tuxrss.png'}, \
         '/css/img/delicious.png': {'tools.staticfile.on': True, \
-                'tools.staticfile.filename':utils.path+'css/img/delicious.png'}, \
+                'tools.staticfile.filename':utils.path+'/css/img/delicious.png'}, \
         '/css/img/digg.png': {'tools.staticfile.on': True, \
-                'tools.staticfile.filename':utils.path+'css/img/digg.png'}, \
+                'tools.staticfile.filename':utils.path+'/css/img/digg.png'}, \
         '/css/img/reddit.png': {'tools.staticfile.on': True, \
-                'tools.staticfile.filename':utils.path+'css/img/reddit.png'}, \
+                'tools.staticfile.filename':utils.path+'/css/img/reddit.png'}, \
         '/css/img/scoopeo.png': {'tools.staticfile.on': True, \
-                'tools.staticfile.filename':utils.path+'css/img/scoopeo.png'}, \
+                'tools.staticfile.filename':utils.path+'/css/img/scoopeo.png'}, \
         '/css/img/blogmarks.png': {'tools.staticfile.on': True, \
-                'tools.staticfile.filename':utils.path+'css/img/blogmarks.png'}, \
+                'tools.staticfile.filename':utils.path+'/css/img/blogmarks.png'}, \
         '/css/img/buzz.png': {'tools.staticfile.on': True, \
-                'tools.staticfile.filename':utils.path+'css/img/buzz.png'}, \
+                'tools.staticfile.filename':utils.path+'/css/img/buzz.png'}, \
         '/css/img/heart.png': {'tools.staticfile.on': True, \
-                'tools.staticfile.filename':utils.path+'css/img/heart.png'}, \
+                'tools.staticfile.filename':utils.path+'/css/img/heart.png'}, \
         '/css/img/heart_open.png': {'tools.staticfile.on': True, \
-                'tools.staticfile.filename':utils.path+'css/img/heart_open.png'}, \
+                'tools.staticfile.filename':utils.path+'/css/img/heart_open.png'}, \
         '/css/img/email.png': {'tools.staticfile.on': True, \
-                'tools.staticfile.filename':utils.path+'css/img/email.png'}, \
+                'tools.staticfile.filename':utils.path+'/css/img/email.png'}, \
         '/css/img/cross.png': {'tools.staticfile.on': True, \
-                'tools.staticfile.filename':utils.path+'css/img/cross.png'}, \
+                'tools.staticfile.filename':utils.path+'/css/img/cross.png'}, \
         '/var/qrcode': {'tools.staticdir.on': True,
                 'tools.staticdir.dir': os.path.join(utils.path, './var/qrcode')}}
 
diff --git a/utils.py b/utils.py
index 7a9d7f81..9ddc9a6b 100755
--- a/utils.py
+++ b/utils.py
@@ -43,7 +43,7 @@ import os
 import ConfigParser
 config = ConfigParser.RawConfigParser()
 config.read("./cfg/pyAggr3g470r.cfg")
-path = config.get('global','path')
+path = os.path.abspath(".")
 sqlite_base = os.path.abspath(config.get('global', 'sqlitebase'))
 mail_from = config.get('mail','mail_from')
 mail_to = config.get('mail','mail_to')
-- 
cgit