Ticket #1943: commit-dd1c179

commit dd1c179625acbe83dede29bfef4b7a8eb39f5c40
Author: Jens Maier <jens@elberet.de>
Date:   Tue Sep 27 18:39:03 2011 +0200

    fix session lookup error

diff --git a/deluge/core/rpcserver.py b/deluge/core/rpcserver.py
index b9b417e..36d2f35 100644
--- a/deluge/core/rpcserver.py
+++ b/deluge/core/rpcserver.py
@@ -494,7 +494,11 @@ def get_session_auth_level(self):
         """
         if not self.listen:
             return AUTH_LEVEL_ADMIN
-        return self.factory.authorized_sessions[self.get_session_id()][0]
+        session_id = self.get_session_id()
+        if session_id > -1:
+            return self.factory.authorized_sessions[self.get_session_id()][0]
+        else:
+            return AUTH_LEVEL_ADMIN
 
     def get_rpc_auth_level(self, rpc):
         """
diff --git a/deluge/plugins/AutoAdd/deluge/plugins/autoadd/core.py b/deluge/plugins/AutoAdd/deluge/plugins/autoadd/core.py
index a8405b4..6d2ccff 100644
--- a/deluge/plugins/AutoAdd/deluge/plugins/autoadd/core.py
+++ b/deluge/plugins/AutoAdd/deluge/plugins/autoadd/core.py
@@ -205,6 +205,8 @@ def update_watchdir(self, watchdir_id):
             if OPTIONS_AVAILABLE.get(option):
                 if watchdir.get(option+'_toggle', True):
                     opts[option] = value
+        # Force session ID to -1 so this isn't mistaken for an RPC call
+        component.get("RPCServer").factory.session_id = -1
         for filename in os.listdir(watchdir["abspath"]):
             try:
                 filepath = os.path.join(watchdir["abspath"], filename)