From 4f7f4cf5c473495941329d1bcf415d2b519e25ab Mon Sep 17 00:00:00 2001
From: Marcos Pinto <markybob@dipconsultants.com>
Date: Wed, 30 May 2007 22:40:54 +0000
Subject: [PATCH] enc stuff

---
 encryption/msgfmt.pyc          | Bin 5012 -> 4965 bytes
 encryption/src/core.py         |  49 +++++----------------------------
 encryption/src/deluge_core.cpp |  12 ++++----
 3 files changed, 13 insertions(+), 48 deletions(-)

diff --git a/encryption/msgfmt.pyc b/encryption/msgfmt.pyc
index d228148561cb1801970671966c83d5ff1f590771..4c515765d1231f327779f49f0f915780982bfc92 100644
GIT binary patch
delta 2851
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
b8xtoZ6f&_fu`%;-adL9%a7J=U^D+Ve9TvU-

delta 2925
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
PxHvgEbvPqArFj_vDqJE2

diff --git a/encryption/src/core.py b/encryption/src/core.py
index 0bb0d01d9..6fea3089e 100644
--- a/encryption/src/core.py
+++ b/encryption/src/core.py
@@ -36,7 +36,7 @@
 #				time to calculate, so we do if efficiently
 #		3. supp_torrent_state - supplementary torrent data, from Deluge
 
-import deluge_core, common, pref
+import deluge_core
 import os, os.path, shutil, statvfs
 import pickle
 import time
@@ -118,6 +118,7 @@ class InsufficientFreeSpaceError(DelugeError):
 		return "%d %d bytes needed"%(self.free_space, self.needed_space)
 
 # A cached data item
+
 class cached_data:
 	def __init__(self, get_method, key):
 		self.get_method = get_method
@@ -166,16 +167,6 @@ class Manager:
 	# completely fresh. When quitting, the old files will be overwritten
 	def __init__(self, client_ID, version, user_agent, base_dir, blank_slate=False):
 		self.base_dir = base_dir
-		self.conf_file = os.path.join(common.CONFIG_DIR, 'deluge.conf')
-		if os.path.isdir(self.conf_file):
-			print 'Weird, the file I was trying to write to, %s, is an existing directory'%(self.conf_file)
-		        sys.exit(0)
-		if not os.path.isfile(self.conf_file):
-			f = open(self.conf_file, mode='w')
-			f.flush()
-		        f.close()
-		self.config = pref.Preferences(self.conf_file)
-
 
 		# Ensure directories exist
 		if not TORRENTS_SUBDIR in os.listdir(self.base_dir):
@@ -228,34 +219,6 @@ class Manager:
 		# Apply preferences. Note that this is before any torrents are added
 		self.apply_prefs()
 
-		#encryption
-
-                if(self.config.get("encout_disabled") == "True"):
-                        out_policy = "0"
-                elif(self.config.get("encout_enabled") == "True"):
-                        out_policy = "1"
-                elif(self.config.get("encout_forced") == "True"):
-                        out_policy = "2"
-                if(self.config.get("encin_disabled") == "True"):
-                        in_policy = "0"
-                elif(self.config.get("encin_enabled") == "True"):
-                        in_policy = "1"
-                elif(self.config.get("encin_forced") == "True"):
-                        in_policy = "2"
-                if(self.config.get("level_plaintext") == "True"):
-                        level_policy = "0"
-                elif(self.config.get("level_both") == "True"):
-                        level_policy = "1"
-                elif(self.config.get("level_rc4") == "True"):
-                        level_policy = "2"
-                if(self.config.get("prefer_rc4") == "True"):
-                        prefer_rc4 = "1"
-                elif(self.config.get("prefer_rc4") == "False"):
-                        prefer_rc4 = "0"
-                ret = self.pe_settings(out_policy, in_policy, level_policy, prefer_rc4)
-                return ret
-
-
 		# Apply DHT, if needed. Note that this is before any torrents are added
 		if self.get_pref('use_DHT'):
 			if not blank_slate:
@@ -785,8 +748,10 @@ class Manager:
 	
 
 	def create_torrent(self, filename, source_directory, trackers, comments=None,
-				pieces=256, author="Deluge"):
+					pieces=256, author="Deluge"):
+		
 		return deluge_core.create_torrent(filename, source_directory, trackers, comments, pieces, author)
 
-	def pe_settings(self, out_enc_policy, in_enc_policy, allowed_enc_level, prefer_rc4):
-		return deluge_core.pe_settings(out_enc_policy, in_enc_policy, allowed_enc_level, prefer_rc4)
+        def pe_settings(self, out_enc_policy, in_enc_policy, allowed_enc_level, prefer_rc4):
+                return deluge_core.pe_settings(out_enc_policy, in_enc_policy, allowed_enc_level, prefer_rc4)
+
diff --git a/encryption/src/deluge_core.cpp b/encryption/src/deluge_core.cpp
index 3285bf857..5249ee657 100644
--- a/encryption/src/deluge_core.cpp
+++ b/encryption/src/deluge_core.cpp
@@ -1221,12 +1221,12 @@ static PyObject *torrent_apply_IP_filter(PyObject *self, PyObject *args)
 
 static PyObject *torrent_pe_settings(PyObject *self, PyObject *args)
 {
-	pe_settings	p = pe_settings();
-	return Py_BuildValue("{p:l,p:l,p:l,p:l}",
-	        "out_enc_policy", char(p.out_enc_policy),
-	        "in_enc_policy", char(p.in_enc_policy),
-	        "allowed_enc_level", char(p.allowed_enc_level),
-	        "prefer_rc4", bool(p.prefer_rc4));
+	pe_settings	s = pe_settings();
+	return Py_BuildValue("{s:i,s:i,s:i,s:i}",
+	        "out_enc_policy", int(s.out_enc_policy),
+	        "in_enc_policy", int(s.in_enc_policy),
+	        "allowed_enc_level", int(s.allowed_enc_level),
+	        "prefer_rc4", bool(s.prefer_rc4));
 }
 
 //====================