From 09472169824fc47c359cdee65652a12a7ba46806 Mon Sep 17 00:00:00 2001 From: Cameron Dale Date: Wed, 16 Apr 2008 10:10:33 -0700 Subject: [PATCH] Save the files downloaded from peers in a peers subdirectory. --- apt_p2p/HTTPServer.py | 2 +- apt_p2p/apt_p2p.py | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/apt_p2p/HTTPServer.py b/apt_p2p/HTTPServer.py index 87e235f..b5dec02 100644 --- a/apt_p2p/HTTPServer.py +++ b/apt_p2p/HTTPServer.py @@ -393,7 +393,7 @@ if __name__ == '__builtin__': return [{'pieces': 'abcdefghij0123456789\xca\xec\xb8\x0c\x00\xe7\x07\xf8~])\x8f\x9d\xe5_B\xff\x1a\xc4!'}] return [{'path': FilePath(os.path.expanduser('~/school/optout'))}] - t = TopLevel(FilePath(os.path.expanduser('~')), DB(), None, 0) + t = TopLevel(FilePath(os.path.expanduser('~')), DB(), None) factory = t.getHTTPFactory() # Standard twisted application Boilerplate diff --git a/apt_p2p/apt_p2p.py b/apt_p2p/apt_p2p.py index f88fd79..4200f62 100644 --- a/apt_p2p/apt_p2p.py +++ b/apt_p2p/apt_p2p.py @@ -6,7 +6,7 @@ @var TORRENT_PIECES: the maximum number of pieces to store as a separate entry in the DHT @var download_dir: the name of the directory to use for downloaded files - +@var peer_dir: the name of the directory to use for peer downloads """ from binascii import b2a_hex @@ -34,6 +34,7 @@ DHT_PIECES = 4 TORRENT_PIECES = 70 download_dir = 'cache' +peer_dir = 'peers' class AptP2P: """The main code object that does all of the work. @@ -77,6 +78,8 @@ class AptP2P: self.cache_dir = FilePath(config.get('DEFAULT', 'CACHE_DIR')) if not self.cache_dir.child(download_dir).exists(): self.cache_dir.child(download_dir).makedirs() + if not self.cache_dir.child(peer_dir).exists(): + self.cache_dir.child(peer_dir).makedirs() self.db = DB(self.cache_dir.child('apt-p2p.db')) self.dht = dhtClass() self.dht.loadConfig(config, config.get('DEFAULT', 'DHT')) @@ -84,7 +87,7 @@ class AptP2P: self.stats = StatsLogger(self.db) self.http_server = TopLevel(self.cache_dir.child(download_dir), self.db, self) self.getHTTPFactory = self.http_server.getHTTPFactory - self.peers = PeerManager(self.cache_dir, self.dht, self.stats) + self.peers = PeerManager(self.cache_dir.child(peer_dir), self.dht, self.stats) self.mirrors = MirrorManager(self.cache_dir) self.cache = CacheManager(self.cache_dir.child(download_dir), self.db, self) self.my_contact = None -- 2.39.5