[nanny] Change references from C:\\WINDOWS to ALLUSERSPROFILE



commit b41dc5cffe1d953657fe39a7a9d6053e92e36437
Author: Roberto Majadas <roberto majadas openshine com>
Date:   Fri Oct 22 15:44:24 2010 +0200

    Change references from C:\\WINDOWS to ALLUSERSPROFILE

 daemon/src/FilterManager.py            |   12 +++++++++++-
 daemon/src/QuarterBack.py              |   13 ++++++++++++-
 daemon/src/Win32WebContentFiltering.py |   13 ++++++++++++-
 daemon/src/proxy/TwistedProxy.py       |   11 ++++++++++-
 4 files changed, 45 insertions(+), 4 deletions(-)
---
diff --git a/daemon/src/FilterManager.py b/daemon/src/FilterManager.py
index cb77d53..b82b11d 100644
--- a/daemon/src/FilterManager.py
+++ b/daemon/src/FilterManager.py
@@ -26,6 +26,8 @@
 import gobject
 import gio
 import os
+import sys
+
 import errno
 
 import shutil
@@ -67,7 +69,15 @@ def on_db_connect(conn):
 if os.name == "posix" :
     NANNY_DAEMON_DATA = "/var/lib/nanny/"
 elif os.name == "nt" :
-    NANNY_DAEMON_DATA = "C:\\WINDOWS\\nanny_data"
+    if not hasattr(sys, "frozen") :
+        file_dir = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
+        for x in range(6):
+            file_dir = os.path.dirname(file_dir)
+        root_path = file_dir
+        
+        NANNY_DAEMON_DATA = os.path.join(root_path, "var", "lib", "nanny")
+    else:        
+        NANNY_DAEMON_DATA = os.path.join(os.environ["ALLUSERSPROFILE"], "Gnome", "nanny")
 
 def mkdir_path(path):
     try:
diff --git a/daemon/src/QuarterBack.py b/daemon/src/QuarterBack.py
index 449d500..843e3cf 100644
--- a/daemon/src/QuarterBack.py
+++ b/daemon/src/QuarterBack.py
@@ -25,6 +25,8 @@
 
 import gobject
 import os
+import sys
+
 import copy
 import pickle
 import time
@@ -58,7 +60,16 @@ def GetInHM(m):
 if os.name == "posix" :
     BLOCK_DB = "/var/lib/nanny/nanny-block.db"
 elif os.name == "nt" :
-    BLOCK_DB = "C:\\WINDOWS\\nanny_data\\nanny-block.db"
+    if not hasattr(sys, "frozen") :
+        file_dir = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
+        for x in range(6):
+            file_dir = os.path.dirname(file_dir)
+        root_path = file_dir
+        
+        BLOCK_DB = os.path.join(root_path, "var", "lib", "nanny", "nanny-block.db")
+    else:
+        BLOCK_DB = os.path.join(os.environ["ALLUSERSPROFILE"], "Gnome", "nanny", "nanny-block.db")
+
 
 WEEKDAYS = ["sun", "mon", "tue", "wed", "thu", "fri", "sat"]
 
diff --git a/daemon/src/Win32WebContentFiltering.py b/daemon/src/Win32WebContentFiltering.py
index ebde473..af9d168 100644
--- a/daemon/src/Win32WebContentFiltering.py
+++ b/daemon/src/Win32WebContentFiltering.py
@@ -25,6 +25,7 @@
 
 import gobject
 import os
+import sys
 
 from twisted.internet import reactor
 from twisted.application import internet, service
@@ -37,7 +38,17 @@ from nanny.daemon.proxy.Controllers import WebDatabase
 import _winreg
 
 PORT_START_NUMBER=53000
-WEBDATABASE='C:\\WINDOWS\\nanny_data\\webs.db'
+
+if not hasattr(sys, "frozen") :
+    file_dir = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
+    for x in range(6):
+        file_dir = os.path.dirname(file_dir)
+    root_path = file_dir
+    
+    WEBDATABASE = os.path.join(root_path, "var", "lib", "nanny", "webs.db")
+else:
+    WEBDATABASE = os.path.join(os.environ["ALLUSERSPROFILE"], "Gnome", "nanny", "webs.db")
+
 
 class Win32WebContentFiltering(gobject.GObject) :
     def __init__(self, quarterback, app) :
diff --git a/daemon/src/proxy/TwistedProxy.py b/daemon/src/proxy/TwistedProxy.py
index c0e83a0..5720cde 100644
--- a/daemon/src/proxy/TwistedProxy.py
+++ b/daemon/src/proxy/TwistedProxy.py
@@ -31,6 +31,7 @@ import urlparse
 from urllib import quote as urlquote
 
 import os
+import sys
 from tempfile import TemporaryFile, gettempdir
 import time
 
@@ -65,7 +66,15 @@ BAD_WEB_TEMPLATE='''
 if os.name == "posix" :
     BAD_CONTENT_TMP_DIR = "/var/tmp/nanny/"
 elif os.name == "nt" :
-    BAD_CONTENT_TMP_DIR = "C:\\WINDOWS\\nanny_data\\tmp"
+    if not hasattr(sys, "frozen") :
+        file_dir = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
+        for x in range(7):
+            file_dir = os.path.dirname(file_dir)
+        root_path = file_dir
+        
+        BAD_CONTENT_TMP_DIR = os.path.join(root_path, "var", "lib", "nanny", "tmp")
+    else:        
+        BAD_CONTENT_TMP_DIR = os.path.join(os.environ["ALLUSERSPROFILE"], "Gnome", "nanny", "tmp")
 
 class BadBoyResponseFilter:
     def __init__(self, client):



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]