ED/EDMarketConnector
1
0
Fork 0
mirror of https://github.com/EDCD/EDMarketConnector.git synced 2025-06-11 12:52:30 +03:00
Code Issues Projects Releases Wiki Activity

Fixed ambiguous names and logic

Browse Source
This commit is contained in:
A_D 2020-07-19 18:31:46 +02:00 committed by Athanasius
parent 1963140572
commit 33f25da270
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
monitor.py
View File

@ -234,7 +234,7 @@ class EDLogs(FileSystemEventHandler):
if __debug__: if __debug__:
print('Invalid journal entry "%s"' % repr(line)) print('Invalid journal entry "%s"' % repr(line))
logpos = loghandle.tell() log_pos = loghandle.tell()
else: else:
loghandle = None loghandle = None
@ -305,21 +305,21 @@ class EDLogs(FileSystemEventHandler):
if platform == 'darwin': if platform == 'darwin':
fcntl(loghandle, F_GLOBAL_NOCACHE, -1) # required to avoid corruption on macOS over SMB fcntl(loghandle, F_GLOBAL_NOCACHE, -1) # required to avoid corruption on macOS over SMB
logpos = 0 log_pos = 0
if __debug__: if __debug__:
print('New logfile "%s"' % logfile) print('New logfile "%s"' % logfile)
if logfile: if logfile:
loghandle.seek(0, SEEK_END) # required to make macOS notice log change over SMB loghandle.seek(0, SEEK_END) # required to make macOS notice log change over SMB
loghandle.seek(logpos, SEEK_SET) # reset EOF flag loghandle.seek(log_pos, SEEK_SET) # reset EOF flag
for line in loghandle: for line in loghandle:
self.event_queue.append(line) self.event_queue.append(line)
if self.event_queue: if self.event_queue:
self.root.event_generate('<<JournalEvent>>', when="tail") self.root.event_generate('<<JournalEvent>>', when="tail")
logpos = loghandle.tell() log_pos = loghandle.tell()
sleep(self._POLL) sleep(self._POLL)
@ -452,8 +452,8 @@ class EDLogs(FileSystemEventHandler):
self.state['Modules'] = None self.state['Modules'] = None
elif (entry['event'] == 'Loadout' and elif (entry['event'] == 'Loadout' and
not 'fighter' in self.canonicalise(entry['Ship']) and 'fighter' not in self.canonicalise(entry['Ship']) and
not 'buggy' in self.canonicalise(entry['Ship'])): 'buggy' not in self.canonicalise(entry['Ship'])):
self.state['ShipID'] = entry['ShipID'] self.state['ShipID'] = entry['ShipID']
self.state['ShipIdent'] = entry['ShipIdent'] self.state['ShipIdent'] = entry['ShipIdent']
@ -495,10 +495,10 @@ class EDLogs(FileSystemEventHandler):
self.state['Modules'].pop(entry['Slot'], None) self.state['Modules'].pop(entry['Slot'], None)
elif entry['event'] == 'ModuleSwap': elif entry['event'] == 'ModuleSwap':
toitem = self.state['Modules'].get(entry['ToSlot']) to_item = self.state['Modules'].get(entry['ToSlot'])
self.state['Modules'][entry['ToSlot']] = self.state['Modules'][entry['FromSlot']] self.state['Modules'][entry['ToSlot']] = self.state['Modules'][entry['FromSlot']]
if toitem: if to_item:
self.state['Modules'][entry['FromSlot']] = toitem self.state['Modules'][entry['FromSlot']] = to_item
else: else:
self.state['Modules'].pop(entry['FromSlot'], None) self.state['Modules'].pop(entry['FromSlot'], None)
@ -818,9 +818,9 @@ class EDLogs(FileSystemEventHandler):
elif platform == 'win32': elif platform == 'win32':
def WindowTitle(h): def WindowTitle(h):
if h: if h:
l = GetWindowTextLength(h) + 1 length = GetWindowTextLength(h) + 1
buf = ctypes.create_unicode_buffer(l) buf = ctypes.create_unicode_buffer(length)
if GetWindowText(h, buf, l): if GetWindowText(h, buf, length):
return buf.value return buf.value
return None return None