BodgeMaster
/
NORM-mirror
mirror of https://github.com/USNavalResearchLaboratory/norm.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3 from LVancina/example-bug-fixes 

Fixed a bugs in normCast.py and normFileSend.py
pull/82/head
LVancina 2023-09-11 00:10:51 -07:00 committed by GitHub
parent 12f5937f68 159eaeb25e
commit 3a7b7d5b6c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
examples/python/normCast.py
View File

@ -301,14 +301,16 @@ class NormCaster():
self.is_running = False self.is_running = False
return return
obj:Optional[pynorm.Object] = session.fileEnqueue(self.pendingSendFilePath, info= self.pendingSendFilePath.replace("\\","/").encode() ) lastSlash = self.pendingSendFilePath.rfind('/')
filename = self.pendingSendFilePath[lastSlash+1:]
obj:Optional[pynorm.Object] = session.fileEnqueue(self.pendingSendFilePath, info= filename.encode() )
if obj: if obj:
if self.opts.ack: if self.opts.ack:
session.setWatermark(obj,True) session.setWatermark(obj,True)
logging.info(f"add file:{self.pendingSendFilePath} {obj._object}") logging.info(f"add file:{self.pendingSendFilePath} {obj._object}")
self.pendingSendFilePath = None # succeed enqued self.pendingSendFilePath = None # succeed enqued
else: else:
logging.warning(f"fileEnqueue: {sendFilePath} failure!") logging.warning(f"fileEnqueue: {self.pendingSendFilePath} failure!")
def handle_norm_event(self, event:pynorm.Event): def handle_norm_event(self, event:pynorm.Event):
session:pynorm.Session = event.session session:pynorm.Session = event.session

2
examples/python/normFileSend.py
View File

@ -44,7 +44,7 @@ def main(argv):
session.startSender(randint(0, 1000), 1024**2, 1400, 64, 16) session.startSender(randint(0, 1000), 1024**2, 1400, 64, 16)
print(('Sending file %s' % filename)) print(('Sending file %s' % filename))
session.fileEnqueue(filepath, filename) session.fileEnqueue(filepath, info=filename.encode())
try: try:
for event in instance: for event in instance: