nik/FreedomBox
1
0
Fork 0
mirror of https://github.com/freedombox/FreedomBox.git synced 2026-08-26 12:46:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Finished Tom's renaming.

Browse Source 
learn_ and provide_service are now create_, might as well use them
that way.  Added a couple line breaks.
This commit is contained in:
Nick Daly 2012-06-16 14:39:56 -05:00
parent 8422127faf
commit 7dbb3e67d2
1 changed files with 18 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
ugly_hacks/santiago/santiago.py
View File

@ -231,58 +231,62 @@ class Santiago(object):
return self.me == server return self.me == server
def learn_service(self, host, service, locations):
"""Learn a service somebody else hosts for me."""
self.create_consuming_location(host, service, locations)
def provide_service(self, client, service, locations):
"""Start hosting a service for somebody else."""
self.create_hosting_location(client, service, locations)
def create_hosting_client(self, client): def create_hosting_client(self, client):
"""Create a hosting client if one doesn't currently exist.""" """Create a hosting client if one doesn't currently exist."""
if client not in self.hosting: if client not in self.hosting:
self.hosting[client] = dict() self.hosting[client] = dict()
def create_hosting_service(self, client, service): def create_hosting_service(self, client, service):
"""Create a hosting service if one doesn't currently exist. """Create a hosting service if one doesn't currently exist.
Check that hosting client exists before trying to add service. Check that hosting client exists before trying to add service.
""" """
self.create_hosting_client(client) self.create_hosting_client(client)
if service not in self.hosting[client]: if service not in self.hosting[client]:
self.hosting[client][service] = list() self.hosting[client][service] = list()
def create_hosting_location(self, client, service, locations): def create_hosting_location(self, client, service, locations):
"""Create a hosting service if one doesn't currently exist. """Create a hosting service if one doesn't currently exist.
Check that hosting client exists before trying to add service. Check that hosting client exists before trying to add service.
Check that hosting service exists before trying to add location. Check that hosting service exists before trying to add location.
""" """
self.create_hosting_client(client)
self.create_hosting_service(client,service) self.create_hosting_service(client,service)
for location in locations: for location in locations:
if location not in self.hosting[client][service]: if location not in self.hosting[client][service]:
self.hosting[client][service].append(location) self.hosting[client][service].append(location)
def create_consuming_host(self, host): def create_consuming_host(self, host):
"""Create a consuming host if one doesn't currently exist.""" """Create a consuming host if one doesn't currently exist."""
if host not in self.consuming: if host not in self.consuming:
self.consuming[host] = dict() self.consuming[host] = dict()
def create_consuming_service(self, host, service): def create_consuming_service(self, host, service):
"""Create a consuming service if one doesn't currently exist. """Create a consuming service if one doesn't currently exist.
Check that consuming host exists before trying to add service. Check that consuming host exists before trying to add service.
""" """
self.create_consuming_host(host) self.create_consuming_host(host)
if service not in self.consuming[host]: if service not in self.consuming[host]:
self.consuming[host][service] = list() self.consuming[host][service] = list()
def create_consuming_location(self, host, service, locations): def create_consuming_location(self, host, service, locations):
"""Create a consuming location if one doesn't currently exist. """Create a consuming location if one doesn't currently exist.
Check that consuming host exists before trying to add service. Check that consuming host exists before trying to add service.
Check that consuming service exists before trying to add location. Check that consuming service exists before trying to add location.
""" """
self.create_consuming_host(host)
self.create_consuming_service(host,service) self.create_consuming_service(host,service)
for location in locations: for location in locations:
if location not in self.consuming[host][service]: if location not in self.consuming[host][service]:
self.consuming[host][service].append(location) self.consuming[host][service].append(location)
@ -476,7 +480,7 @@ class Santiago(object):
if not self.i_am(host): if not self.i_am(host):
self.proxy(to, host, client, service, reply_to) self.proxy(to, host, client, service, reply_to)
else: else:
self.learn_service(client, "santiago", reply_to) self.create_consuming_location(client, "santiago", reply_to)
self.outgoing_request( self.outgoing_request(
self.me, client, self.me, client, self.me, client, self.me, client,
@ -526,8 +530,8 @@ class Santiago(object):
self.proxy() self.proxy()
return return
self.learn_service(host, "santiago", reply_to) self.create_consuming_location(host, "santiago", reply_to)
self.learn_service(host, service, locations) self.create_consuming_location(host, service, locations)
self.requests[host].remove(service) self.requests[host].remove(service)
# clean buffers # clean buffers
@ -665,7 +669,7 @@ class SantiagoListener(SantiagoConnector):
def provide(self, client, service, location): def provide(self, client, service, location):
"""Provide a service for the client at the location.""" """Provide a service for the client at the location."""
return self.santiago.provide_service(client, service, [location]) return self.santiago.create_hosting_location(client, service, [location])
class SantiagoSender(SantiagoConnector): class SantiagoSender(SantiagoConnector):
"""Generic Santiago Sender superclass. """Generic Santiago Sender superclass.