Changeset 243 for indytube/trunk

Timestamp:

10/14/07 23:52:37 (15 months ago)

Author:

andy

Message:

Updates to get bittorrent perseptive broker impl

Location:

indytube/trunk/bittorrent

Files:

• client.py (modified) (1 diff)
• server.py (modified) (3 diffs)

indytube/trunk/bittorrent/client.py

@@ -56 +56 @@
 
         def _callRemoteFailed(self, result):
-                print "failed! %s " % result
+
+                print "failed! " 
+                print " .__class__ =", result.__class__
+                print " .getErrorMessage() =", result.getErrorMessage()
+                print " .type =", result.type
                 self._doReactorStop()
 
         def runReactor(self):
-                reactor.run(installSignalHandlers=0)
+                #start the twisted reactor
+                # see http://twistedmatrix.com/trac/wiki/FrequentlyAskedQuestions#Igetexceptions.ValueError:signalonlyworksinmainthreadwhenItrytorunmyTwistedprogramWhatswrong
+                # if you want to not install the signal handlers
+                #reactor.run(installSignalHandlers=0)
+                reactor.run()
         
         def _doReactorStop(self):
-                reactor.crash()
+                reactor.stop()
+                print "stopping reactor!"
+                #crash? if you do installSignalHandlers = 0 you may need it
+                #reactor.crash()
+
+
+def main():
+        # test a simple connection to the server, on the localhost
+        client = IndyTubeClient('localhost',9119)
+        client.setupOperation('http://localhost/download/video','filename.ogg')
+        client.connectToServer()
+        client.runReactor()
+
+# this only runs if the module was *not* imported
+if __name__ == '__main__':
+    main()
+

indytube/trunk/bittorrent/server.py

@@ -90 +90 @@
         self.pb_downloadDir = config.get('pb-server', 'DOWNLOAD_DIR')
         self.pb_serverName = config.get('pb-server', 'SERVER_NAME')
+        self.pb_trackerUrl = config.get('pb-server', 'TRACKER_URL')
 
-        print "I have %s %s %s %s " % ( self.pb_protocolPort , self.pb_torrentDir , self.pb_downloadDir, self.pb_serverName )
+        print "I have %s %s %s %s %s " % ( self.pb_protocolPort , self.pb_torrentDir , self.pb_downloadDir, self.pb_serverName, self.pb_trackerUrl )
 
     def __init__(self):
@@ -117 +118 @@
         torrent_filepath = self.pb_torrentDir + '/' + filename + ".torrent"
         incoming_comment = "Torrent file made by Indytube"
-        make_meta_files( trackerURL, [incoming_fp], piece_len_pow2=18, comment=incoming_comment, target = torrent_filepath)
+        make_meta_files( self.pb_trackerUrl, [incoming_fp], piece_len_pow2=18, comment=incoming_comment, target = torrent_filepath)
 
         #4. Seeding and tracking!
@@ -162 +163 @@
 #
 #Ready for running via 
-#$ twisted -ny <nameofscript.py>
+#$ twisted -ny bittorrent/server.py