+
Modified: trunk/apps/rubyFreenet/doc/classes/Freenet/FCP/Client.src/M000018.html
===================================================================
--- trunk/apps/rubyFreenet/doc/classes/Freenet/FCP/Client.src/M000018.html 2006-06-10 22:12:33 UTC (rev 9142)
+++ trunk/apps/rubyFreenet/doc/classes/Freenet/FCP/Client.src/M000018.html 2006-06-11 03:36:17 UTC (rev 9143)
@@ -5,15 +5,22 @@
-
load_request (Freenet::FCP::Client)
+
new (Freenet::FCP::Client)
-
- def load_request (message )
- message .load_only = true
- @message_queue << message
+
+ def initialize (client_name =nil , server ="127.0.0.1" , port =9481 , options ={})
+ @client_name = client_name || MD5 .md5 (Time .now .to_s )
+ @options , @server , @port = options , server , port
+ @messages = {}
+ @running = false
+ @lock = Mutex .new
+ @logger = Logger .new ('FCPClientLog' ,'daily' )
+ @message_queue = Queue .new
+ connect
+ hello
end
\ No newline at end of file
Modified: trunk/apps/rubyFreenet/doc/classes/Freenet/FCP/Client.src/M000019.html
===================================================================
--- trunk/apps/rubyFreenet/doc/classes/Freenet/FCP/Client.src/M000019.html 2006-06-10 22:12:33 UTC (rev 9142)
+++ trunk/apps/rubyFreenet/doc/classes/Freenet/FCP/Client.src/M000019.html 2006-06-11 03:36:17 UTC (rev 9143)
@@ -5,20 +5,22 @@
- generate_keypair (Freenet::FCP::Client)
+ connect (Freenet::FCP::Client)
- def generate_keypair (async , & callback )
- message = Message .new ('GenerateSSK' , nil , nil , callback )
- send (message , async )
- if async
- message
- else
- [message .response .items ['InsertURI' ], message .response .items ['RequestURI' ]]
+
+ def connect
+ @lock .synchronize do
+ log (INFO , "Connecting to #{@server}:#{@port}" )
+ @socket = TCPSocket .open (@server , @port )
+ @running = true
+ @socket_thread = Thread .new {socket_thread }
+ log (DEBUG , "Running thread" )
end
+ rescue
+ raise FCPConnectionError .new ('Connection failed' )
end
\ No newline at end of file
Modified: trunk/apps/rubyFreenet/doc/classes/Freenet/FCP/Client.src/M000020.html
===================================================================
--- trunk/apps/rubyFreenet/doc/classes/Freenet/FCP/Client.src/M000020.html 2006-06-10 22:12:33 UTC (rev 9142)
+++ trunk/apps/rubyFreenet/doc/classes/Freenet/FCP/Client.src/M000020.html 2006-06-11 03:36:17 UTC (rev 9143)
@@ -5,43 +5,18 @@
- get (Freenet::FCP::Client)
+ disconnect (Freenet::FCP::Client)
- def get (uri , async =false , options =nil , & callback )
- uri = uri .uri if uri .respond_to? :uri
- async = true if callback
- options = {'IgnoreDS' => false ,
- 'DSOnly' => false ,
- 'Verbosity' => 1 ,
- 'ReturnType' => 'direct' ,
- 'PriorityClass' => 1 ,
- 'Persistence' => 'reboot' ,
- 'Global' => false }.merge (options || {})
- options ['Persistence' ] = 'connection' unless async
- options ['URI' ] = uri
- message = Message .new ('ClientGet' , nil , options , callback )
- send (message , async )
- if async
- message
- else
- loop do
- message .lock
- case message .response .type
- when 'AllData'
- message .unlock
- return message .response
- when 'GetFailed'
- message .unlock
- raise RequestFailed .new (message .response )
- else
- message .unlock
- end
- end
+
+ def disconnect
+ log (INFO , 'Disconnecting' )
+ @lock .synchronize do
+ @running = false
end
+ @socket_thread .join if @socket_thread
end
\ No newline at end of file
Modified: trunk/apps/rubyFreenet/doc/classes/Freenet/FCP/Client.src/M000021.html
===================================================================
--- trunk/apps/rubyFreenet/doc/classes/Freenet/FCP/Client.src/M000021.html 2006-06-10 22:12:33 UTC (rev 9142)
+++ trunk/apps/rubyFreenet/doc/classes/Freenet/FCP/Client.src/M000021.html 2006-06-11 03:36:17 UTC (rev 9143)
@@ -5,42 +5,15 @@
- put (Freenet::FCP::Client)
+ load_request (Freenet::FCP::Client)
- def put (uri , data =nil , async =false , options =nil , & callback )
- uri = uri .uri if uri .respond_to? :uri
- async = true if callback
- options = {'Metadata.ContentType' => 'application/octet-stream' ,
- 'Verbosity' => 1 ,
- 'MaxRetries' => 10 ,
- 'Persistence' => 'reboot' ,
- 'UploadFrom' => 'direct' }.merge (options || {})
- options ['Persistence' ] = 'connection' unless async
- options ['URI' ] = uri
- message = Message .new ('ClientPut' , data , options , callback )
- message .content - type = options ['Metadata.ContentType' ]
- send (message , async )
- if async
- message
- else
- loop do
- message .lock
- case message .response .type
- when 'PutSuccessful'
- message .unlock
- return message .response .items ['URI' ]
- when 'PutFailed'
- message .unlock
- raise RequestFailed .new (message .response )
- else
- message .unlock
- end
- end
- end
+
+ def load_request (message )
+ message .load_only = true
+ @message_queue << message
end
\ No newline at end of file
Modified: trunk/apps/rubyFreenet/doc/classes/Freenet/FCP/Client.src/M000022.html
===================================================================
--- trunk/apps/rubyFreenet/doc/classes/Freenet/FCP/Client.src/M000022.html 2006-06-10 22:12:33 UTC (rev 9142)
+++ trunk/apps/rubyFreenet/doc/classes/Freenet/FCP/Client.src/M000022.html 2006-06-11 03:36:17 UTC (rev 9143)
@@ -5,41 +5,20 @@
- putdir (Freenet::FCP::Client)
+ generate_keypair (Freenet::FCP::Client)
- def putdir (uri , dir , async =false , options =nil , & callback )
- uri = uri .uri if uri .respond_to? :uri
- async = true if callback
- options = {'Verbosity' => 1 ,
- 'MaxRetries' => 10 ,
- 'PriorityClass' => 3 ,
- 'DefaultName' => 'index.html' ,
- 'Filename' => dir .to_s
- 'AllowUnreadableFiles' => 'true' }.merge (options || {})
- options ['Persistence' ] = 'connection' unless async
- options ['URI' ] = uri
- message = Message .new ('ClientPutDiskDir' , nil , options , callback )
+
+ def generate_keypair (async = false , & callback )
+ message = Message .new ('GenerateSSK' , nil , nil , callback )
send (message , async )
if async
message
else
- loop do
- message .lock
- case message .response .type
- when 'PutSuccessful'
- message .unlock
- return message .response .items ['URI' ]
- when 'PutFailed'
- message .unlock
- raise RequestFailed .new (message .response )
- else
- message .unlock
- end
- end
+ message .wait_for_response
+ [message .response .items ['InsertURI' ], message .response .items ['RequestURI' ]]
end
end
Modified: trunk/apps/rubyFreenet/doc/classes/Freenet/FCP/Client.src/M000023.html
===================================================================
--- trunk/apps/rubyFreenet/doc/classes/Freenet/FCP/Client.src/M000023.html 2006-06-10 22:12:33 UTC (rev 9142)
+++ trunk/apps/rubyFreenet/doc/classes/Freenet/FCP/Client.src/M000023.html 2006-06-11 03:36:17 UTC (rev 9143)
@@ -5,16 +5,49 @@
- request_status (Freenet::FCP::Client)
+ get (Freenet::FCP::Client)
- def request_status (identifier , global , async =false )
- log (DEBUG , 'Requesting status' )
- message = Message .new ('GetRequestStatus' , nil , 'Identifier' => identifier , 'Global' => global )
+
+ def get (uri , async =false , options =nil , & callback )
+ uri = uri .uri if uri .respond_to? :uri
+ async = true if callback
+ options = {'IgnoreDS' => false ,
+ 'DSOnly' => false ,
+ 'Verbosity' => 1 ,
+ 'ReturnType' => 'direct' ,
+ 'PriorityClass' => 1 ,
+ 'Persistence' => 'reboot' ,
+ 'Global' => false }.merge (options || {})
+ options ['Persistence' ] = 'connection' unless async
+ options ['URI' ] = uri
+ message = Message .new ('ClientGet' , nil , options , callback )
send (message , async )
+ if async
+ message
+ else
+ loop do
+ message .wait_for_response
+ puts "Got response: #{message.response.type}"
+ message .lock
+ case message .response .type
+ when 'AllData'
+ message .unlock
+ return message .response
+ when 'GetFailed' ,'ProtocolError'
+ message .unlock
+ if message .response .items ['Code' ] == '27'
+ get (message .response .items ['RedirectURI' ], true , options )
+ else
+ raise RequestFailed .new (message .response )
+ end
+ else
+ message .unlock
+ end
+ end
+ end
end
\ No newline at end of file
Added: trunk/apps/rubyFreenet/doc/classes/Freenet/FCP/Client.src/M000024.html
===================================================================
--- trunk/apps/rubyFreenet/doc/classes/Freenet/FCP/Client.src/M000024.html 2006-06-10 22:12:33 UTC (rev 9142)
+++ trunk/apps/rubyFreenet/doc/classes/Freenet/FCP/Client.src/M000024.html 2006-06-11 03:36:17 UTC (rev 9143)
@@ -0,0 +1,47 @@
+
+
+
+
+
+ put (Freenet::FCP::Client)
+
+ def put (uri , data =nil , async =false , options =nil , & callback )
+ uri = uri .uri if uri .respond_to? :uri
+ async = true if callback
+ options = {'Metadata.ContentType' => 'application/octet-stream' ,
+ 'Verbosity' => 1 ,
+ 'MaxRetries' => 10 ,
+ 'Persistence' => 'reboot' ,
+ 'UploadFrom' => 'direct' }.merge (options || {})
+ options ['Persistence' ] = 'connection' unless async
+ options ['URI' ] = uri
+ message = Message .new ('ClientPut' , data , options , callback )
+ message .content - type = options ['Metadata.ContentType' ]
+ send (message , async )
+ if async
+ message
+ else
+ loop do
+ message .wait_for_response
+ message .lock
+ case message .response .type
+ when 'PutSuccessful'
+ message .unlock
+ return message .response .items ['URI' ]
+ when 'PutFailed' ,'ProtocolError'
+ message .unlock
+ raise RequestFailed .new (message .response )
+ else
+ message .unlock
+ end
+ end
+ end
+ end
+
+
\ No newline at end of file
Added: trunk/apps/rubyFreenet/doc/classes/Freenet/FCP/Client.src/M000025.html
===================================================================
--- trunk/apps/rubyFreenet/doc/classes/Freenet/FCP/Client.src/M000025.html 2006-06-10 22:12:33 UTC (rev 9142)
+++ trunk/apps/rubyFreenet/doc/classes/Freenet/FCP/Client.src/M000025.html 2006-06-11 03:36:17 UTC (rev 9143)
@@ -0,0 +1,47 @@
+
+
+
+
+
+ putdir (Freenet::FCP::Client)
+
+ def putdir (uri , dir , async =false , options =nil , & callback )
+ uri = uri .uri if uri .respond_to? :uri
+ async = true if callback
+ options = {'Verbosity' => 1 ,
+ 'MaxRetries' => 10 ,
+ 'PriorityClass' => 3 ,
+ 'DefaultName' => 'index.html' ,
+ 'Filename' => dir .to_s ,
+ 'AllowUnreadableFiles' => 'true' }.merge (options || {})
+ options ['Persistence' ] = 'connection' unless async
+ options ['URI' ] = uri
+ message = Message .new ('ClientPutDiskDir' , nil , options , callback )
+ send (message , async )
+ if async
+ message
+ else
+ loop do
+ message .wait_for_response
+ message .lock
+ case message .response .type
+ when 'PutSuccessful'
+ message .unlock
+ return message .response .items ['URI' ]
+ when 'PutFailed' ,'ProtocolError'
+ message .unlock
+ raise RequestFailed .new (message .response )
+ else
+ message .unlock
+ end
+ end
+ end
+ end
+
+
\ No newline at end of file
Added: trunk/apps/rubyFreenet/doc/classes/Freenet/FCP/Client.src/M000026.html
===================================================================
--- trunk/apps/rubyFreenet/doc/classes/Freenet/FCP/Client.src/M000026.html 2006-06-10 22:12:33 UTC (rev 9142)
+++ trunk/apps/rubyFreenet/doc/classes/Freenet/FCP/Client.src/M000026.html 2006-06-11 03:36:17 UTC (rev 9143)
@@ -0,0 +1,21 @@
+
+
+
+
+
+ request_status (Freenet::FCP::Client)
+
+ def request_status (identifier , global , async =false )
+ log (DEBUG , 'Requesting status' )
+ message = Message .new ('GetRequestStatus' , nil , 'Identifier' => identifier , 'Global' => global )
+ send (message , async )
+ message .wait_for_response
+ end
+
+
\ No newline at end of file
Modified: trunk/apps/rubyFreenet/doc/classes/Freenet/FCP/Message.html
===================================================================
--- trunk/apps/rubyFreenet/doc/classes/Freenet/FCP/Message.html 2006-06-10 22:12:33 UTC (rev 9142)
+++ trunk/apps/rubyFreenet/doc/classes/Freenet/FCP/Message.html 2006-06-11 03:36:17 UTC (rev 9143)
@@ -112,12 +112,15 @@
Methods