self.dht = dht
self.dht.loadConfig(config, config.get('DEFAULT', 'DHT'))
self.dht.join().addCallbacks(self.joinComplete, self.joinError)
- self.http_server = TopLevel(self.cache_dir.child(download_dir), self)
- self.setDirectories = self.http_server.setDirectories
- self.http_site = server.Site(self.http_server)
+ self.http_server = TopLevel(self.cache_dir.child(download_dir), self.db, self)
+ self.getHTTPFactory = self.http_server.getHTTPFactory
self.peers = PeerManager()
self.mirrors = MirrorManager(self.cache_dir)
other_dirs = [FilePath(f) for f in config.getstringlist('DEFAULT', 'OTHER_DIRS')]
self.cache = CacheManager(self.cache_dir.child(download_dir), self.db, other_dirs, self)
self.my_addr = None
- def getSite(self):
- return self.http_site
-
def joinComplete(self, result):
- self.my_addr = findMyIPAddr(result, config.getint(config.get('DEFAULT', 'DHT'), 'PORT'))
+ self.my_addr = findMyIPAddr(result,
+ config.getint(config.get('DEFAULT', 'DHT'), 'PORT'),
+ config.getboolean('DEFAULT', 'LOCAL_OK'))
if not self.my_addr:
raise RuntimeError, "IP address for this machine could not be found"
self.cache.scanDirectories()
def check_freshness(self, req, path, modtime, resp):
log.msg('Checking if %s is still fresh' % path)
- d = self.peers.get([path], "HEAD", modtime)
+ d = self.peers.get('', path, method = "HEAD", modtime = modtime)
d.addCallback(self.check_freshness_done, req, path, resp)
return d
def lookupHash_done(self, locations, hash, path, d):
if not locations:
log.msg('Peers for %s were not found' % path)
- getDefer = self.peers.get([path])
+ getDefer = self.peers.get(hash, path)
getDefer.addCallback(self.cache.save_file, hash, path)
getDefer.addErrback(self.cache.save_error, path)
getDefer.addCallbacks(d.callback, d.errback)
else:
log.msg('Found peers for %s: %r' % (path, locations))
# Download from the found peers
- getDefer = self.peers.get(locations)
+ getDefer = self.peers.get(hash, path, locations)
getDefer.addCallback(self.check_response, hash, path)
getDefer.addCallback(self.cache.save_file, hash, path)
getDefer.addErrback(self.cache.save_error, path)
def check_response(self, response, hash, path):
if response.code < 200 or response.code >= 300:
log.msg('Download from peers failed, going to direct download: %s' % path)
- getDefer = self.peers.get([path])
+ getDefer = self.peers.get(hash, path)
return getDefer
return response
- def new_cached_file(self, file_path, hash, urlpath, url = None):
+ def new_cached_file(self, file_path, hash, url = None):
"""Add a newly cached file to the DHT.
If the file was downloaded, set url to the path it was downloaded for.
if self.my_addr and hash:
site = self.my_addr + ':' + str(config.getint('DEFAULT', 'PORT'))
- full_path = urlunparse(('http', site, urlpath, None, None, None))
key = hash.norm(bits = config.getint(config.get('DEFAULT', 'DHT'), 'HASH_LENGTH'))
- storeDefer = self.dht.storeValue(key, full_path)
- storeDefer.addCallback(self.store_done, full_path)
+ storeDefer = self.dht.storeValue(key, site)
+ storeDefer.addCallback(self.store_done, hash)
return storeDefer
return None
- def store_done(self, result, path):
- log.msg('Added %s to the DHT: %r' % (path, result))
+ def store_done(self, result, hash):
+ log.msg('Added %s to the DHT: %r' % (hash, result))
\ No newline at end of file