WebSVN - pytwidcpp - Различия - Редакция 4 и 6


Я -*- coding: utf-8 -*-
""" PyCODC NMDC/ADC Client """
from twisted.internet import protocol
from twisted.protocols import basic
from twisted.python import log

import socket
import re

class NMDC(basic.LineReceiver):
    """
    NMDC Protocol implementation
    """

    delimiter = "|"

    buffer = ""
    encoding = None
    hostname = None

    def lineReceived(self, line):
        print "Line Received: %s" % line
        self.parseLine(line)
 

    def connectionLost(self, reason):
        print "Conlost: %s" %self

    def connectionMade(self):
        print "Made connect"
        if self.hostname is None:
            self.hostname = socket.getfqdn()

    def sendLine(self, line):
        _to_send = line.encode('utf-8')
        self.transport.write(_to_send)

    def parseLine(self, line):
        """
        Returns NMDC command and params
        """
        print "parse: %s" % line
        if line.startswith("$"):
            try:
                m = re.match("^\$(?P<command>[a-zA-Z]+)[ ](?P<params>.+$)", line)

                command = m.group("command")
                params = m.group("params")
                self.handleCommand(command, params)
            except:
                print "Exception: %s"% line
 
 
 

    def handleCommand(self, command, params):
        print "handleCommand: %s %s" % (command, params)
        method = getattr(self, "nmdc_%s" % command, None)
        try:
            if method is not None:
                method(params)
            else: self.nmdc_unknown(command, params)
        except:
            print "handleCommand except"
            log.deferr()
        pass

    def makeAnswer(self, command, params):
        if params is not "":
            answer = "$%s %s|" % (command, params)
        else:
            answer = "$%s|"% command

        self.sendLine(answer)
        print "makeAnswer: %s" % answer

    def nmdc_rawline(self, line):
        print "rawline: %s"% line

    def nmdc_unknown(self, command):
        print "nmdc_%s doesn't exist." % command

 

Редакция 4	Редакция 6
1	# -- coding: utf-8 --	1	Я -- coding: utf-8 --
2	""" PyCODC NMDC/ADC Client """	2	""" PyCODC NMDC/ADC Client """
3	from twisted.internet import protocol	3	from twisted.internet import protocol
4	from twisted.protocols import basic	4	from twisted.protocols import basic
5	from twisted.python import log	5	from twisted.python import log
6		6
7	import socket	7	import socket
8	import re	8	import re
9		9
10	class NMDC(basic.LineReceiver):	10	class NMDC(basic.LineReceiver):
11	"""	11	"""
12	NMDC Protocol implementation	12	NMDC Protocol implementation
13	"""	13	"""
14		14
15	delimiter = "\|"	15	delimiter = "\|"
16		16
17	buffer = ""	17	buffer = ""
18	encoding = None	18	encoding = None
19	hostname = None	19	hostname = None
20		20
21	def lineReceived(self, line):	21	def lineReceived(self, line):
22	print "Line Received: %s" % line	22	print "Line Received: %s" % line
23	command, params = self.parseLine(line)	23	self.parseLine(line)
24	self.handleCommand(command, params)	-
25		24
26	def connectionLost(self, reason):	25	def connectionLost(self, reason):
27	print "Conlost: %s" %self	26	print "Conlost: %s" %self
28		27
29	def connectionMade(self):	28	def connectionMade(self):
30	print "Made connect"	29	print "Made connect"
31	if self.hostname is None:	30	if self.hostname is None:
32	self.hostname = socket.getfqdn()	31	self.hostname = socket.getfqdn()
33		32
34	def sendLine(self, line):	33	def sendLine(self, line):
35	_to_send = line.encode('utf-8')	34	_to_send = line.encode('utf-8')
36	self.transport.write(_to_send)	35	self.transport.write(_to_send)
37		36
38	def parseLine(self, line):	37	def parseLine(self, line):
39	"""	38	"""
40	Returns NMDC command and params	39	Returns NMDC command and params
41	"""	40	"""
42	print "parse: %s" % line	41	print "parse: %s" % line
43	if line.startswith("$"):	42	if line.startswith("$"):
44	try:	43	try:
45	m = re.match("^\$(?P<command>[a-zA-Z]+)[ ](?P<params>.+$)", line)	44	m = re.match("^\$(?P<command>[a-zA-Z]+)[ ](?P<params>.+$)", line)
46		45
47	command = m.group("command")	46	command = m.group("command")
48	params = m.group("params")	47	params = m.group("params")
49	print "NMDC Command: %s; Params: %s" %(command, params)	48	self.handleCommand(command, params)
50	except:	49	except:
51	print "Exception: %s"% line	50	print "Exception: %s"% line
52	return command, params	-
53	else:	-
54	return "", ""	-
55		51
56	def handleCommand(self, command, params):	52	def handleCommand(self, command, params):
57	print "handleCommand: %s %s" % (command, params)	53	print "handleCommand: %s %s" % (command, params)
58	method = getattr(self, "nmdc_%s" % command, None)	54	method = getattr(self, "nmdc_%s" % command, None)
59	try:	55	try:
60	if method is not None:	56	if method is not None:
61	method(params)	57	method(params)
62	else: self.nmdc_unknown(command, params)	58	else: self.nmdc_unknown(command, params)
63	except:	59	except:
64	print "handleCommand except"	60	print "handleCommand except"
65	log.deferr()	61	log.deferr()
66	pass	62	pass
67		63
68	def makeAnswer(self, command, params):	64	def makeAnswer(self, command, params):
69	if params is not "":	65	if params is not "":
70	answer = "$%s %s\|" % (command, params)	66	answer = "$%s %s\|" % (command, params)
71	else:	67	else:
72	answer = "$%s\|"% command	68	answer = "$%s\|"% command
73		69
74	self.sendLine(answer)	70	self.sendLine(answer)
75	print "makeAnswer: %s" % answer	71	print "makeAnswer: %s" % answer
76		72
-		73	def nmdc_rawline(self, line):
-		74	print "rawline: %s"% line
-		75
77	def nmdc_unknown(self, command, params):	76	def nmdc_unknown(self, command):
78	print "nmdc_%s doesn't exist. Called with params: %s" % (command,params)	77	print "nmdc_%s doesn't exist." % command
79		78
80		79

Хранилища Subversion pytwidcpp

(root)/trunk/protocol.py - Редакция 4 → 6