mirror/bacpypes
1
0
Fork 0
mirror of https://github.com/JoelBender/bacpypes synced 2025-09-28 22:15:23 +08:00
Code Issues Releases Wiki Activity

bug with stream and record file initialization, clean up sample applications

Browse Source
This commit is contained in:
Joel Bender 2016-11-14 21:35:30 -05:00
parent 79a1bee468
commit 39169bd5d7
5 changed files with 39 additions and 99 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
py25/bacpypes/service/file.py
View File

@ -28,16 +28,15 @@ class LocalRecordAccessFileObject(FileObject):
kwargs, kwargs,
) )
# verify the file access method or provide it
if 'fileAccessMethod' in kwargs: if 'fileAccessMethod' in kwargs:
if kwargs['fileAccessMethod'] != 'recordAccess': if kwargs['fileAccessMethod'] != 'recordAccess':
raise ValueError("inconsistent file access method") raise ValueError("inconsistent file access method")
else: else:
kwargs['fileAccessMethod'] = 'recordAccess' kwargs['fileAccessMethod'] = 'recordAccess'
FileObject.__init__(self, # continue with initialization
fileAccessMethod='recordAccess', FileObject.__init__(self, **kwargs)
**kwargs
)
def __len__(self): def __len__(self):
""" Return the number of records. """ """ Return the number of records. """
@ -66,15 +65,15 @@ class LocalStreamAccessFileObject(FileObject):
kwargs, kwargs,
) )
# verify the file access method or provide it
if 'fileAccessMethod' in kwargs: if 'fileAccessMethod' in kwargs:
if kwargs['fileAccessMethod'] != 'streamAccess': if kwargs['fileAccessMethod'] != 'streamAccess':
raise ValueError("inconsistent file access method") raise ValueError("inconsistent file access method")
else: else:
kwargs['fileAccessMethod'] = 'streamAccess' kwargs['fileAccessMethod'] = 'streamAccess'
FileObject.__init__(self, # continue with initialization
**kwargs FileObject.__init__(self, **kwargs)
)
def __len__(self): def __len__(self):
""" Return the number of octets in the file. """ """ Return the number of octets in the file. """

13
py27/bacpypes/service/file.py
View File

@ -29,16 +29,15 @@ class LocalRecordAccessFileObject(FileObject):
kwargs, kwargs,
) )
# verify the file access method or provide it
if 'fileAccessMethod' in kwargs: if 'fileAccessMethod' in kwargs:
if kwargs['fileAccessMethod'] != 'recordAccess': if kwargs['fileAccessMethod'] != 'recordAccess':
raise ValueError("inconsistent file access method") raise ValueError("inconsistent file access method")
else: else:
kwargs['fileAccessMethod'] = 'recordAccess' kwargs['fileAccessMethod'] = 'recordAccess'
FileObject.__init__(self, # continue with initialization
fileAccessMethod='recordAccess', FileObject.__init__(self, **kwargs)
**kwargs
)
def __len__(self): def __len__(self):
""" Return the number of records. """ """ Return the number of records. """
@ -66,15 +65,15 @@ class LocalStreamAccessFileObject(FileObject):
kwargs, kwargs,
) )
# verify the file access method or provide it
if 'fileAccessMethod' in kwargs: if 'fileAccessMethod' in kwargs:
if kwargs['fileAccessMethod'] != 'streamAccess': if kwargs['fileAccessMethod'] != 'streamAccess':
raise ValueError("inconsistent file access method") raise ValueError("inconsistent file access method")
else: else:
kwargs['fileAccessMethod'] = 'streamAccess' kwargs['fileAccessMethod'] = 'streamAccess'
FileObject.__init__(self, # continue with initialization
**kwargs FileObject.__init__(self, **kwargs)
)
def __len__(self): def __len__(self):
""" Return the number of octets in the file. """ """ Return the number of octets in the file. """

13
py34/bacpypes/service/file.py
View File

@ -29,16 +29,15 @@ class LocalRecordAccessFileObject(FileObject):
kwargs, kwargs,
) )
# verify the file access method or provide it
if 'fileAccessMethod' in kwargs: if 'fileAccessMethod' in kwargs:
if kwargs['fileAccessMethod'] != 'recordAccess': if kwargs['fileAccessMethod'] != 'recordAccess':
raise ValueError("inconsistent file access method") raise ValueError("inconsistent file access method")
else: else:
kwargs['fileAccessMethod'] = 'recordAccess' kwargs['fileAccessMethod'] = 'recordAccess'
FileObject.__init__(self, # continue with initialization
fileAccessMethod='recordAccess', FileObject.__init__(self, **kwargs)
**kwargs
)
def __len__(self): def __len__(self):
""" Return the number of records. """ """ Return the number of records. """
@ -66,15 +65,15 @@ class LocalStreamAccessFileObject(FileObject):
kwargs, kwargs,
) )
# verify the file access method or provide it
if 'fileAccessMethod' in kwargs: if 'fileAccessMethod' in kwargs:
if kwargs['fileAccessMethod'] != 'streamAccess': if kwargs['fileAccessMethod'] != 'streamAccess':
raise ValueError("inconsistent file access method") raise ValueError("inconsistent file access method")
else: else:
kwargs['fileAccessMethod'] = 'streamAccess' kwargs['fileAccessMethod'] = 'streamAccess'
FileObject.__init__(self, # continue with initialization
**kwargs FileObject.__init__(self, **kwargs)
)
def __len__(self): def __len__(self):
""" Return the number of octets in the file. """ """ Return the number of octets in the file. """

52
samples/ReadWriteFile.py
View File

@ -40,54 +40,6 @@ _log = ModuleLogger(globals())
# reference a simple application # reference a simple application
this_application = None this_application = None
#
# TestApplication
#
@bacpypes_debugging
class TestApplication(BIPSimpleApplication):
def request(self, apdu):
if _debug: TestApplication._debug("request %r", apdu)
# save a copy of the request
self._request = apdu
# forward it along
BIPSimpleApplication.request(self, apdu)
def confirmation(self, apdu):
if _debug: TestApplication._debug("confirmation %r", apdu)
if isinstance(apdu, Error):
sys.stdout.write("error: %s\n" % (apdu.errorCode,))
sys.stdout.flush()
elif isinstance(apdu, AbortPDU):
apdu.debug_contents()
elif (isinstance(self._request, AtomicReadFileRequest)) and (isinstance(apdu, AtomicReadFileACK)):
# suck out the record data
if apdu.accessMethod.recordAccess:
value = apdu.accessMethod.recordAccess.fileRecordData
elif apdu.accessMethod.streamAccess:
value = apdu.accessMethod.streamAccess.fileData
TestApplication._debug(" - value: %r", value)
sys.stdout.write(repr(value) + '\n')
sys.stdout.flush()
elif (isinstance(self._request, AtomicWriteFileRequest)) and (isinstance(apdu, AtomicWriteFileACK)):
# suck out the record data
if apdu.fileStartPosition is not None:
value = apdu.fileStartPosition
elif apdu.fileStartRecord is not None:
value = apdu.fileStartRecord
TestApplication._debug(" - value: %r", value)
sys.stdout.write(repr(value) + '\n')
sys.stdout.flush()
# #
# TestConsoleCmd # TestConsoleCmd
# #
@ -271,7 +223,7 @@ class TestConsoleCmd(ConsoleCmd):
value = apdu.fileStartPosition value = apdu.fileStartPosition
elif apdu.fileStartRecord is not None: elif apdu.fileStartRecord is not None:
value = apdu.fileStartRecord value = apdu.fileStartRecord
TestApplication._debug(" - value: %r", value) TestConsoleCmd._debug(" - value: %r", value)
sys.stdout.write(repr(value) + '\n') sys.stdout.write(repr(value) + '\n')
sys.stdout.flush() sys.stdout.flush()
@ -333,7 +285,7 @@ class TestConsoleCmd(ConsoleCmd):
value = apdu.fileStartPosition value = apdu.fileStartPosition
elif apdu.fileStartRecord is not None: elif apdu.fileStartRecord is not None:
value = apdu.fileStartRecord value = apdu.fileStartRecord
TestApplication._debug(" - value: %r", value) TestConsoleCmd._debug(" - value: %r", value)
sys.stdout.write(repr(value) + '\n') sys.stdout.write(repr(value) + '\n')
sys.stdout.flush() sys.stdout.flush()

47
samples/ReadWriteFileServer.py
View File

@ -14,11 +14,10 @@ from bacpypes.consolelogging import ConfigArgumentParser
from bacpypes.core import run from bacpypes.core import run
from bacpypes.object import FileObject, register_object_type
from bacpypes.app import BIPSimpleApplication from bacpypes.app import BIPSimpleApplication
from bacpypes.service.device import LocalDeviceObject from bacpypes.service.device import LocalDeviceObject
from bacpypes.service.file import FileServices from bacpypes.service.file import FileServices, \
LocalRecordAccessFileObject, LocalStreamAccessFileObject
# some debugging # some debugging
_debug = 0 _debug = 0
@ -34,19 +33,17 @@ OCTET_COUNT = int(os.getenv('OCTET_COUNT', 4096))
# #
@bacpypes_debugging @bacpypes_debugging
class LocalRecordAccessFileObject(FileObject): class TestRecordFile(LocalRecordAccessFileObject):
def __init__(self, **kwargs): def __init__(self, **kwargs):
""" Initialize a record accessed file object. """ """ Initialize a record accessed file object. """
if _debug: if _debug:
LocalRecordAccessFileObject._debug("__init__ %r", TestRecordFile._debug("__init__ %r",
kwargs, kwargs,
) )
FileObject.__init__(self, LocalRecordAccessFileObject.__init__(self, **kwargs)
fileAccessMethod='recordAccess',
**kwargs
)
# create some test data
self._record_data = [ self._record_data = [
''.join(random.choice(string.ascii_letters) ''.join(random.choice(string.ascii_letters)
for i in range(RECORD_LEN)).encode('utf-8') for i in range(RECORD_LEN)).encode('utf-8')
@ -58,13 +55,13 @@ class LocalRecordAccessFileObject(FileObject):
def __len__(self): def __len__(self):
""" Return the number of records. """ """ Return the number of records. """
if _debug: LocalRecordAccessFileObject._debug("__len__") if _debug: TestRecordFile._debug("__len__")
return len(self._record_data) return len(self._record_data)
def read_record(self, start_record, record_count): def read_record(self, start_record, record_count):
""" Read a number of records starting at a specific record. """ """ Read a number of records starting at a specific record. """
if _debug: LocalRecordAccessFileObject._debug("read_record %r %r", if _debug: TestRecordFile._debug("read_record %r %r",
start_record, record_count, start_record, record_count,
) )
@ -76,7 +73,7 @@ class LocalRecordAccessFileObject(FileObject):
def write_record(self, start_record, record_count, record_data): def write_record(self, start_record, record_count, record_data):
""" Write a number of records, starting at a specific record. """ """ Write a number of records, starting at a specific record. """
if _debug: LocalRecordAccessFileObject._debug("write_record %r %r %r", if _debug: TestRecordFile._debug("write_record %r %r %r",
start_record, record_count, record_data, start_record, record_count, record_data,
) )
@ -98,41 +95,37 @@ class LocalRecordAccessFileObject(FileObject):
# return where the 'writing' actually started # return where the 'writing' actually started
return start_record return start_record
register_object_type(LocalRecordAccessFileObject)
# #
# Local Stream Access File Object Type # Local Stream Access File Object Type
# #
@bacpypes_debugging @bacpypes_debugging
class LocalStreamAccessFileObject(FileObject): class TestStreamFile(LocalStreamAccessFileObject):
def __init__(self, **kwargs): def __init__(self, **kwargs):
""" Initialize a stream accessed file object. """ """ Initialize a stream accessed file object. """
if _debug: if _debug:
LocalStreamAccessFileObject._debug("__init__ %r", TestStreamFile._debug("__init__ %r",
kwargs, kwargs,
) )
FileObject.__init__(self, LocalStreamAccessFileObject.__init__(self, **kwargs)
fileAccessMethod='streamAccess',
**kwargs
)
# create some test data
self._file_data = ''.join(random.choice(string.ascii_letters) self._file_data = ''.join(random.choice(string.ascii_letters)
for i in range(OCTET_COUNT)).encode('utf-8') for i in range(OCTET_COUNT)).encode('utf-8')
if _debug: LocalRecordAccessFileObject._debug(" - %d octets", if _debug: TestStreamFile._debug(" - %d octets",
len(self._file_data), len(self._file_data),
) )
def __len__(self): def __len__(self):
""" Return the number of octets in the file. """ """ Return the number of octets in the file. """
if _debug: LocalStreamAccessFileObject._debug("__len__") if _debug: TestStreamFile._debug("__len__")
return len(self._file_data) return len(self._file_data)
def read_stream(self, start_position, octet_count): def read_stream(self, start_position, octet_count):
""" Read a chunk of data out of the file. """ """ Read a chunk of data out of the file. """
if _debug: LocalStreamAccessFileObject._debug("read_stream %r %r", if _debug: TestStreamFile._debug("read_stream %r %r",
start_position, octet_count, start_position, octet_count,
) )
@ -144,7 +137,7 @@ class LocalStreamAccessFileObject(FileObject):
def write_stream(self, start_position, data): def write_stream(self, start_position, data):
""" Write a number of octets, starting at a specific offset. """ """ Write a number of octets, starting at a specific offset. """
if _debug: LocalStreamAccessFileObject._debug("write_stream %r %r", if _debug: TestStreamFile._debug("write_stream %r %r",
start_position, data, start_position, data,
) )
@ -169,8 +162,6 @@ class LocalStreamAccessFileObject(FileObject):
# return where the 'writing' actually started # return where the 'writing' actually started
return start_position return start_position
register_object_type(LocalStreamAccessFileObject)
# #
# __main__ # __main__
# #
@ -205,7 +196,7 @@ def main():
this_device.protocolServicesSupported = services_supported.value this_device.protocolServicesSupported = services_supported.value
# make a record access file, add to the device # make a record access file, add to the device
f1 = LocalRecordAccessFileObject( f1 = TestRecordFile(
objectIdentifier=('file', 1), objectIdentifier=('file', 1),
objectName='RecordAccessFile1' objectName='RecordAccessFile1'
) )
@ -213,7 +204,7 @@ def main():
this_application.add_object(f1) this_application.add_object(f1)
# make a stream access file, add to the device # make a stream access file, add to the device
f2 = LocalStreamAccessFileObject( f2 = TestStreamFile(
objectIdentifier=('file', 2), objectIdentifier=('file', 2),
objectName='StreamAccessFile2' objectName='StreamAccessFile2'
) )