Changeset 3509

Timestamp:

08/17/08 18:14:47 (5 years ago)

Author:

nopper

Message:

preference file is now stored under ~/.PacketManipulator

Location:

branch/PacketManipulator/PM

Files:

• Backend/Scapy/wrapper.py (modified) (1 diff)
• Core/Const.py (modified) (2 diffs)
• Manager/PreferenceManager.py (modified) (4 diffs)
• PacketManipulator (modified) (1 diff)

branch/PacketManipulator/PM/Backend/Scapy/wrapper.py

@@ -92 +92 @@
 
 def get_proto_layer(proto):
-    return None
+    return getattr(proto, '_pm_layer', None)
 
 def get_proto_fields(proto_inst):

branch/PacketManipulator/PM/Core/Const.py

@@ -35 +35 @@
 HOME = os.path.expanduser("~")
 CURRENT_DIR = os.getcwd()
+PM_HOME = os.path.join(HOME, '.PacketManipulator')
 
 main_dir = os.path.abspath(os.path.dirname(sys.argv[0]))
@@ -46 +47 @@
 LOCALE_DIR = os.path.join(main_dir, "share", "locale")
 PIXMAPS_DIR = os.path.join(main_dir, "share", "pixmaps", "umit")
+
+if os.path.exists(HOME) and \
+   os.access(HOME, os.R_OK and os.W_OK) and \
+   not os.path.exists(PM_HOME):
+    os.mkdir(PM_HOME)
+else:
+    print "No permission to create %s" % PM_HOME

branch/PacketManipulator/PM/Manager/PreferenceManager.py

@@ -25 +25 @@
 
 import sys
+import os.path
 
 from xml.sax import handler, make_parser
@@ -30 +31 @@
 from xml.sax.xmlreader import AttributesNSImpl
 
+from PM.Core.Const import PM_HOME
 from PM.Core.Atoms import Singleton
 
@@ -180 +182 @@
 
     def __init__(self):
-        self.fname = 'pm-prefs.xml'
+        self.fname = os.path.join(PM_HOME, 'pm-prefs.xml')
         
         try:
@@ -208 +210 @@
     def __getitem__(self, x):
         return self.options[x]
-
-if __name__ == "__main__":
-    Prefs().load_options('test.xml')
-

branch/PacketManipulator/PM/PacketManipulator

@@ -24 +24 @@
 
 try:
-    if os.getenv('PM_DEVELOPMENT', False):
+    if os.getenv('PM_NOPSYCO', False):
         raise ImportError