Merge SVGdraw.py
Dan Williams
18 years ago
parent
0ca5a7fed5
commit
6b78600646
@ -0,0 +1,32 @@
|
||||
#!/bin/sh
|
||||
|
||||
# Errors that we may fix in the future
|
||||
#
|
||||
# C0301 Line length
|
||||
# W0201 Attribute defined outside __init__
|
||||
# R0201 Method could be a function
|
||||
TODO="C0301,W0201,R0201"
|
||||
|
||||
# Errors we don't like
|
||||
#
|
||||
# W0613 Unused argument (glib signals)
|
||||
# W0511 - FIXME/TODO/XXX
|
||||
DISABLE="W0613,W0511"
|
||||
|
||||
MSGS="$TODO,$DISABLE"
|
||||
ARG="sugar"
|
||||
|
||||
pylint \
|
||||
--disable-all \
|
||||
--include-ids=y \
|
||||
--enable-variables=y \
|
||||
--enable-exceptions=y \
|
||||
--enable-miscellaneous=y \
|
||||
--enable-format=y \
|
||||
--enable-classes=y \
|
||||
--disable-msg=$MSGS \
|
||||
--reports=n \
|
||||
--enable-metrics=n \
|
||||
--indent-string=" " \
|
||||
--ignore="SVGdraw.py" \
|
||||
$ARG
|
||||
@ -1,121 +0,0 @@
|
||||
# -*- tab-width: 4; indent-tabs-mode: t -*-
|
||||
|
||||
import presence
|
||||
import avahi
|
||||
|
||||
ACTION_BUDDY_ADDED = "added"
|
||||
ACTION_BUDDY_REMOVED = "removed"
|
||||
|
||||
|
||||
class Buddy(object):
|
||||
def __init__(self, nick, realname, servicename, host, address, port, key=None):
|
||||
self._nick = nick
|
||||
self._realname = realname
|
||||
self._servicename = servicename
|
||||
self._key = key
|
||||
self._host = host
|
||||
self._address = str(address)
|
||||
self._port = int(port)
|
||||
self._chat = None
|
||||
|
||||
def set_chat(self, chat):
|
||||
self._chat = chat
|
||||
|
||||
def chat(self):
|
||||
return self._chat
|
||||
|
||||
def nick(self):
|
||||
return self._nick
|
||||
|
||||
def realname(self):
|
||||
return self._realname
|
||||
|
||||
def servicename(self):
|
||||
return self._servicename
|
||||
|
||||
def host(self):
|
||||
return self._host
|
||||
|
||||
def address(self):
|
||||
return self._address
|
||||
|
||||
def port(self):
|
||||
return self._port
|
||||
|
||||
def key(self):
|
||||
return self._key
|
||||
|
||||
class BuddyList(object):
|
||||
""" Manage a list of buddies """
|
||||
|
||||
def __init__(self, servicename):
|
||||
self._listeners = []
|
||||
self._buddies = {}
|
||||
self._servicename = servicename
|
||||
self._pdiscovery = presence.PresenceDiscovery()
|
||||
self._pdiscovery.add_service_listener(self._on_service_change)
|
||||
|
||||
def start(self):
|
||||
self._pdiscovery.start()
|
||||
|
||||
def add_buddy_listener(self, listener):
|
||||
self._listeners.append(listener)
|
||||
|
||||
def _add_buddy(self, host, address, port, servicename, data):
|
||||
# Ignore ourselves
|
||||
if servicename == self._servicename:
|
||||
return
|
||||
|
||||
if len(data) > 0 and 'name' in data.keys():
|
||||
buddy = self._find_buddy_by_service_name(servicename)
|
||||
if not buddy:
|
||||
buddy = Buddy(data['name'], data['realname'], servicename, host, address, port)
|
||||
self._buddies[data['name']] = buddy
|
||||
self._notify_listeners(ACTION_BUDDY_ADDED, buddy)
|
||||
|
||||
def _remove_buddy(self, buddy):
|
||||
nick = buddy.nick()
|
||||
self._notify_listeners(ACTION_BUDDY_REMOVED, buddy)
|
||||
del self._buddies[nick]
|
||||
|
||||
def _find_buddy_by_service_name(self, servicename):
|
||||
for buddy in self._buddies.values():
|
||||
if buddy.servicename() == servicename:
|
||||
return buddy
|
||||
return None
|
||||
|
||||
def find_buddy_by_address(self, address):
|
||||
for buddy_name in self._buddies.keys():
|
||||
buddy = self._buddies[buddy_name]
|
||||
if buddy.address() == address:
|
||||
return buddy
|
||||
return None
|
||||
|
||||
def _notify_listeners(self, action, buddy):
|
||||
for listener in self._listeners:
|
||||
listener(action, buddy)
|
||||
|
||||
def _on_service_change(self, action, interface, protocol, name, stype, domain, flags):
|
||||
if stype != presence.OLPC_CHAT_SERVICE:
|
||||
return
|
||||
if action == presence.ACTION_SERVICE_NEW:
|
||||
self._pdiscovery.resolve_service(interface, protocol, name, stype, domain, self._on_service_resolved)
|
||||
elif action == presence.ACTION_SERVICE_REMOVED:
|
||||
buddy = self._find_buddy_by_service_name(name)
|
||||
if buddy:
|
||||
self._remove_buddy(buddy)
|
||||
|
||||
def _pair_to_dict(self, l):
|
||||
res = {}
|
||||
for el in l:
|
||||
tmp = el.split('=', 1)
|
||||
if len(tmp) > 1:
|
||||
res[tmp[0]] = tmp[1]
|
||||
else:
|
||||
res[tmp[0]] = ''
|
||||
return res
|
||||
|
||||
def _on_service_resolved(self, interface, protocol, name, stype, domain, host, aprotocol, address, port, txt, flags):
|
||||
data = self._pair_to_dict(avahi.txt_array_to_string_array(txt))
|
||||
self._add_buddy(host, address, port, name, data)
|
||||
|
||||
@ -1,9 +1,7 @@
|
||||
import os
|
||||
|
||||
try:
|
||||
from sugar.__uninstalled__ import *
|
||||
from sugar.__uninstalled__ import internal_get_data_file
|
||||
except ImportError:
|
||||
from sugar.__installed__ import *
|
||||
from sugar.__installed__ import internal_get_data_file
|
||||
|
||||
def get_data_file(filename):
|
||||
return internal_get_data_file(filename)
|
||||
|
||||
@ -0,0 +1,27 @@
|
||||
from Service import Service
|
||||
import network
|
||||
|
||||
class NotificationListener:
|
||||
TYPE = "_olpc_model_notification._udp"
|
||||
ADDRESS = "224.0.0.222"
|
||||
PORT = 6300
|
||||
|
||||
def __init__(self, group, name):
|
||||
server = network.GroupServer(NotificationListener.TYPE,
|
||||
NotificationListener.PORT,
|
||||
self._recv_multicast)
|
||||
server.start()
|
||||
|
||||
service = Service(name, NotificationListener.TYPE,
|
||||
NotificationListener.ADDRESS,
|
||||
NotificationListener.PORT, True)
|
||||
service.register(group)
|
||||
|
||||
self._listeners = {}
|
||||
|
||||
def add_listener(self, listener):
|
||||
self._listeners.add(listener)
|
||||
|
||||
def _recv_multicast(self, msg):
|
||||
for listener in self._listeners:
|
||||
listener(msg)
|
||||
@ -0,0 +1,11 @@
|
||||
import network
|
||||
|
||||
class Notifier:
|
||||
def __init__(self, group, name):
|
||||
service = group.get_service(name)
|
||||
address = service.get_address()
|
||||
port = service.get_port()
|
||||
self._client = network.GroupClient(address, port)
|
||||
|
||||
def notify(self, msg):
|
||||
self._client.send_msg(msg)
|
||||
@ -0,0 +1,10 @@
|
||||
class AbstractModel:
|
||||
def __init__(self):
|
||||
self._listeners = []
|
||||
|
||||
def add_listener(self, listener):
|
||||
self._listeners.append(listener)
|
||||
|
||||
def _notify_model_change(self, key):
|
||||
for listener in self._listeners:
|
||||
listener(self, key)
|
||||
@ -0,0 +1,55 @@
|
||||
import socket
|
||||
|
||||
from sugar.p2p.Service import Service
|
||||
from sugar.p2p.model.AbstractModel import AbstractModel
|
||||
from sugar.p2p import network
|
||||
|
||||
class ModelRequestHandler(object):
|
||||
def __init__(self, model):
|
||||
self._model = model
|
||||
|
||||
def get_value(self, key):
|
||||
return self._model.get_value(key)
|
||||
|
||||
def set_value(self, key, value):
|
||||
return self._model.set_value(key, value)
|
||||
|
||||
class LocalModel(AbstractModel):
|
||||
SERVICE_TYPE = "_olpc_model._tcp"
|
||||
SERVICE_PORT = 6300
|
||||
|
||||
def __init__(self, group, model_id):
|
||||
AbstractModel.__init__(self)
|
||||
self._group = group
|
||||
self._model_id = model_id
|
||||
self._values = {}
|
||||
|
||||
self._setup_service()
|
||||
|
||||
def get_value(self, key):
|
||||
return self._values[key]
|
||||
|
||||
def set_value(self, key, value):
|
||||
self._values[key] = value
|
||||
self._notify_model_change(key)
|
||||
|
||||
def _setup_service(self):
|
||||
service = Service(self._model_id, LocalModel.SERVICE_TYPE, '',
|
||||
LocalModel.SERVICE_PORT)
|
||||
self._setup_server(service)
|
||||
service.register(self._group)
|
||||
|
||||
# FIXME this is duplicated with StreamReader
|
||||
def _setup_server(self, service):
|
||||
started = False
|
||||
tries = 10
|
||||
port = service.get_port()
|
||||
while not started and tries > 0:
|
||||
try:
|
||||
p2p_server = network.GlibXMLRPCServer(("", port))
|
||||
p2p_server.register_instance(ModelRequestHandler(self))
|
||||
started = True
|
||||
except(socket.error):
|
||||
port = port + 1
|
||||
tries = tries - 1
|
||||
service.set_port(port)
|
||||
@ -0,0 +1,6 @@
|
||||
sugardir = $(pythondir)/sugar/p2p/model
|
||||
sugar_PYTHON = \
|
||||
__init__.py \
|
||||
LocalModel.py \
|
||||
RemoteModel.py \
|
||||
Store.py
|
||||
@ -0,0 +1,26 @@
|
||||
import xmlrpclib
|
||||
|
||||
from sugar.p2p.NotificationListener import NotificationListener
|
||||
from sugar.p2p.model.AbstractModel import AbstractModel
|
||||
|
||||
class RemoteModel(AbstractModel):
|
||||
def __init__(self, service):
|
||||
AbstractModel.__init__(self)
|
||||
|
||||
self._service = service
|
||||
|
||||
addr = "http://%s:%d" % (service.get_address(), service.get_port())
|
||||
self._client = xmlrpclib.ServerProxy(addr)
|
||||
|
||||
self._setup_notification_listener()
|
||||
|
||||
def get_value(self, key):
|
||||
return self._client.get_value(key)
|
||||
|
||||
def set_value(self, key, value):
|
||||
self._client.set_value(key, value)
|
||||
|
||||
def _setup_notification_listener(self):
|
||||
name = self._service.get_name()
|
||||
self._notification = NotificationListener(self._group, name)
|
||||
self._notification.add_listener(self._notify_model_change)
|
||||
@ -0,0 +1,22 @@
|
||||
from sugar.p2p.model.RemoteModel import RemoteModel
|
||||
from sugar.p2p.model.LocalModel import LocalModel
|
||||
|
||||
class Store:
|
||||
def __init__(self, group):
|
||||
self._group = group
|
||||
self._local_models = {}
|
||||
|
||||
def create_model(self, model_id):
|
||||
model = LocalModel(self._group, model_id)
|
||||
self._local_models[model_id] = model
|
||||
return model
|
||||
|
||||
def get_model(self, model_id):
|
||||
if self._local_models.has_key(model_id):
|
||||
return self._local_models(model_id)
|
||||
else:
|
||||
service = self._group.get_service(model_id, LocalModel.SERVICE_TYPE)
|
||||
if service:
|
||||
return RemoteModel(service)
|
||||
else:
|
||||
return None
|
||||
Loading…
Reference in New Issue