moved library

dcommon.py

@@ -23,7 +23,7 @@
 import sys, os, webbrowser
 
 PROGRAM_NAME = "Deluge"
-PROGRAM_VERSION = "0.5"
+PROGRAM_VERSION = "0.5.0"
 DELUGE_DIR = os.path.abspath(os.path.dirname(sys.argv[0]))
 GLADE_DIR = DELUGE_DIR + "/glade"
 PIXMAP_DIR = DELUGE_DIR + "/pixmaps"

delugegtk.py

@@ -97,6 +97,8 @@ class DelugeGTK:
 
 		self.filename_column.set_expand(True)
 		
+		## Should probably use rules-hint for other treevies as well
+		
 		self.peer_view = self.wtree.get_widget("peer_view")
 		self.peer_store = gtk.ListStore(str, str, str, str, str)
 		self.peer_view.set_model(self.peer_store)

setup.py

@@ -24,15 +24,57 @@ pythonVersion = platform.python_version()[0:3]
 
 from distutils.core import setup, Extension
 
+flood_core = Extension('flood_core',
+                    include_dirs = ['./include', './include/libtorrent',
+												'/usr/include/python' + pythonVersion],
+                    libraries = ['boost_filesystem', 'boost_date_time',
+											'boost_program_options', 'boost_regex',
+											'boost_serialization', 'boost_thread', 'z', 'pthread'],
+                    extra_compile_args = ["-Wno-missing-braces"],
+#                    extra_link_args = [""],
+                    sources = ['cpp/alert.cpp',
+										 'cpp/allocate_resources.cpp',
+										 'cpp/bt_peer_connection.cpp',
+										 'cpp/entry.cpp',
+										 'cpp/escape_string.cpp',
+										 'cpp/file.cpp',
+										 'cpp/http_tracker_connection.cpp',
+					                'cpp/identify_client.cpp',
+										 'cpp/ip_filter.cpp',
+ 										 'cpp/peer_connection.cpp',
+						             'cpp/piece_picker.cpp',     
+										 'cpp/policy.cpp',           
+										 'cpp/flood_core.cpp',
+					                'cpp/session.cpp',   
+					                'cpp/session_impl.cpp',
+                               'cpp/sha1.cpp',
+									    'cpp/stat.cpp',
+									    'cpp/storage.cpp',
+								       'cpp/torrent.cpp',
+										 'cpp/torrent_handle.cpp',
+										 'cpp/torrent_info.cpp',
+										 'cpp/tracker_manager.cpp',
+										 'cpp/udp_tracker_connection.cpp',
+					                'cpp/web_peer_connection.cpp',
+										 'cpp/kademlia/closest_nodes.cpp',
+										 'cpp/kademlia/dht_tracker.cpp',
+										 'cpp/kademlia/find_data.cpp',
+										 'cpp/kademlia/node.cpp',
+										 'cpp/kademlia/node_id.cpp',
+										 'cpp/kademlia/refresh.cpp',
+										 'cpp/kademlia/routing_table.cpp',
+										 'cpp/kademlia/rpc_manager.cpp',
+										 'cpp/kademlia/traversal_algorithm.cpp'])
+
 
 setup(name="Deluge", fullname="Deluge Bittorrent Client", version="0.5.0",
-	author="Zach Tibbitts",
+	author="Zach Tibbitts, Alon Zakai",
 	description="A bittorrent client written in PyGTK",
 	url="http://deluge-torrent.org",
 	license="GPLv2",
-	
-	scripts=["scripts/deluge-gtk", "scripts/deluge-tools"],
-	py_modules=["dcommon", "deluge", "delugegtk", "dexml"],
+	scripts=["scripts/deluge"],
+	py_modules=["dcommon", "delugegtk", "flood","library/flood_stats"],
+	packages=["library"],
 	data_files=[("glade", ["glade/delugegtk.glade"])],
-	##ext_modules=[torrent]
+	##ext_modules=[flood_core]
 	)