Modify khashmir's config system to not use the const module.

[quix0rs-apt-p2p.git] / apt-dht.py

diff --git a/apt-dht.py b/apt-dht.py
index 30b6a93a88d082230e90fbf38467e4dc94dd69f6..0742589a9d5dbe94c5e5f254c820d28e36bd43cf 100644 (file)
--- a/apt-dht.py
+++ b/apt-dht.py
@@ -16,8 +16,8 @@ from twisted.internet import reactor
 from twisted.python import usage, log
 from twisted.web2 import channel
 
-from apt_dht import AptDHT
-from apt_dht_conf import config
+from apt_dht.apt_dht_conf import config, version
+from apt_dht.interfaces import IDHT
 
 config_file = []
 
@@ -28,11 +28,11 @@ if __name__ == '__main__':
             ['help', 'h'],
             ]
         optParameters = [
-            ['config-file', 'c', None, "Configuration file"],
+            ['config-file', 'c', [], "Configuration file"],
             ]
         longdesc="apt-dht is a peer-to-peer downloader for apt users"
         def opt_version(self):
-            print "apt-dht 1.9.x"
+            print "apt-dht %s" % version.short()
             sys.exit(0)
 
     opts = AptDHTOptions()
@@ -45,8 +45,8 @@ if __name__ == '__main__':
     config_file = opts.opts['config-file']
 
 config.read(config_file)
-if config.defaults()['username']:
-    uid,gid = pwd.getpwnam(config.defaults()['username'])[2:4]
+if config.has_option('DEFAULT', 'username') and config.get('DEFAULT', 'username'):
+    uid,gid = pwd.getpwnam(config.get('DEFAULT', 'username'))[2:4]
 else:
     uid,gid = None,None
 
@@ -54,10 +54,18 @@ application = service.Application("apt-dht", uid, gid)
 print service.IProcess(application).processName
 service.IProcess(application).processName = 'apt-dht'
 
-myapp = AptDHT()
-site = myapp.getSite()
-s = strports.service('tcp:'+config.defaults()['port'], channel.HTTPFactory(site))
-s.setServiceParent(application)
+DHT = __import__(config.get('DEFAULT', 'DHT')+'.DHT', globals(), locals(), ['DHT'])
+assert(IDHT.implementedBy(DHT.DHT), "You must provide a DHT implementation that implements the IDHT interface.")
+myDHT = DHT.DHT()
+myDHT.loadConfig(config)
+myDHT.join()
+
+if not config.getboolean('DEFAULT', 'DHT-only'):
+    from apt_dht.apt_dht import AptDHT
+    myapp = AptDHT(myDHT)
+    site = myapp.getSite()
+    s = strports.service('tcp:'+config.get('DEFAULT', 'port'), channel.HTTPFactory(site))
+    s.setServiceParent(application)
 
 if __name__ == '__main__':
     # Run on command line