--- nfo/projects/netfraggle/bin/fraggleEngine.py	2004/08/31 02:23:07	1.6
+++ nfo/projects/netfraggle/bin/fraggleEngine.py	2004/09/01 21:43:30	1.9
@@ -5,13 +5,23 @@
 # Author:      joko
 #
 # Created:     2004/30/08
-# RCS-ID:      $Id: fraggleEngine.py,v 1.6 2004/08/31 02:23:07 joko Exp $
+# RCS-ID:      $Id: fraggleEngine.py,v 1.9 2004/09/01 21:43:30 xabbu Exp $
 # Copyright:   (c) 2004 netfrag.org
 # Licence:     GPL
 #-----------------------------------------------------------------------------
 
 #-----------------------------------------------------------------------------
 # $Log: fraggleEngine.py,v $
+# Revision 1.9  2004/09/01 21:43:30  xabbu
+# +Moved funtion getDefaultDir from FraggleCtlPreferences to FraggleEngine for more convenience
+# +FraggleCtlModules class creation for handling content modules
+#
+# Revision 1.8  2004/08/31 16:48:19  joko
+# + def authenticate
+#
+# Revision 1.7  2004/08/31 09:34:10  joko
+# + def query_remote: don't do "getTopicById" here anymore
+#
 # Revision 1.6  2004/08/31 02:23:07  joko
 # U changes to (dummy) topics metadata (FraggleXml)
 # + def query_remote: wrapper for making remote xmlrpc call
@@ -31,12 +41,14 @@
 from fraggleConstants import *
 import FraggleXMLRPC
 import fraggleCtlPreferences
+import FraggleCtlModules
 
 class FraggleEngine:
     """Back-end doing the work."""
     def __init__(self):
         self.settings = {}
         self.topics = {}
+        self.modules = FraggleCtlModules.create(self)
         self.preferences = fraggleCtlPreferences.create(self)
         self.rpc = FraggleXMLRPC.create(self, self.preferences.getConfig())
 
@@ -128,8 +140,7 @@
     def getTopicById(self, id):
         return self.topics[id]
 
-    def query_remote(self, topicid):
-        topicmeta = self.getTopicById(topicid)
+    def query_remote(self, topicmeta):
 
         if topicmeta['target']['type'] == 'XMLRPC':
             # TODO: make FraggleXMLRPC do all stuff
@@ -156,7 +167,34 @@
                 except Error, v:
                     print "ERROR", v
         return topicdata
-                    
+
+    def authenticate(self, server, username, password):
+        from xmlrpclib import Server, Error
+        rpc = Server(server)
+        try:
+            return rpc.authenticate({'user': username, 'pass': password})
+        except Error, v:
+            print "ERROR", v
+        
+    def getDefaultDir(self):
+        """Gets location of default dir and creates it
+           if necessary. ($HOME/.pears/)"""
+        try:
+            import pearsdebug
+            savedir = pearsdebug.savedir
+        except:
+            dir = '.netfraggle'
+            savedir = os.path.expanduser(os.path.join('~', dir))
+            if len(savedir)<=len("c:\\/" + dir):
+                # problem that might occur on Win2k (no $HOME environment variable)
+                temp = os.path.join(os.path.expandvars('$USERPROFILE'), dir)
+                if temp > len("c:\\/" + dir):
+                    savedir = temp
+            # create dir if it doesn't exist
+            if not os.path.exists(savedir):
+                os.makedirs(savedir)
+        return savedir
+                   
 class urlOpener(object):
     """Opens urls."""
     def __init__(self):