third-party-mirrors/EDDN
1
0
Fork 0
mirror of https://github.com/EDCD/EDDN.git synced 2025-04-21 11:07:38 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #70 from Marginal/master

Browse Source 
Make duplicate test cheaper
This commit is contained in:
AnthorNet 2018-01-06 12:41:22 +01:00 committed by GitHub
commit 63cac32704
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/eddn/core/DuplicateMessages.py
View File

@ -2,7 +2,6 @@
import hashlib
import re
import simplejson
import copy
from datetime import datetime, timedelta
from eddn.conf.Settings import Settings
@ -33,36 +32,23 @@ class DuplicateMessages(Thread):
def isDuplicated(self, json):
with self.lock:
jsonTest = copy.deepcopy(json)
# Test messages are not duplicate
if re.search('test', jsonTest['$schemaRef'], re.I):
if re.search('test', json['$schemaRef'], re.I):
return False
# Remove headers
if 'gatewayTimestamp' in jsonTest['header']:
del jsonTest['header']['gatewayTimestamp'] # Prevent dupe with new timestamp
if 'timestamp' in jsonTest['message']:
del jsonTest['message']['timestamp'] # Prevent dupe with new timestamp
if 'softwareName' in jsonTest['header']:
del jsonTest['header']['softwareName'] # Prevent dupe with different software
if 'softwareVersion' in jsonTest['header']:
del jsonTest['header']['softwareVersion'] # Prevent dupe with different software version
if 'uploaderID' in jsonTest['header']:
del jsonTest['header']['uploaderID'] # Prevent dupe with different uploaderID
# Shallow copy, minus headers
jsonTest = {
'$schemaRef': json['$schemaRef'],
'message': json['message'],
}
# Convert starPos to avoid software modification in dupe messages
if 'StarPos' in jsonTest['message']:
if jsonTest['message']['StarPos'][0]:
jsonTest['message']['StarPos'][0] = round(jsonTest['message']['StarPos'][0] *32)
if jsonTest['message']['StarPos'][1]:
jsonTest['message']['StarPos'][1] = round(jsonTest['message']['StarPos'][1] *32)
if jsonTest['message']['StarPos'][2]:
jsonTest['message']['StarPos'][2] = round(jsonTest['message']['StarPos'][2] *32)
jsonTest['message']['StarPos'] = [int(round(x * 32)) for x in jsonTest['message']['StarPos']]
# Prevent Docked event with small difference in distance from start
if 'DistFromStarLS' in jsonTest['message']:
jsonTest['message']['DistFromStarLS'] = round(jsonTest['message']['DistFromStarLS'])
jsonTest['message']['DistFromStarLS'] = int(jsonTest['message']['DistFromStarLS'] + 0.5)
message = simplejson.dumps(jsonTest, sort_keys=True) # Ensure most duplicate messages will get the same key
key = hashlib.sha256(message).hexdigest()