RomanNum3ral
/
plane-notify
mirror of https://github.com/RomanNum3ral/plane-notify.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Move config files/reduce repase, intital airport lookup

This commit is contained in:
Jxck-S 2020-10-25 22:42:50 -04:00
parent 24e4b6c133
commit a2a3e44476
10 changed files with 148 additions and 85 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
NotifyBotMulti.py
View File

@ -13,14 +13,14 @@ from planeClass import Plane
from datetime import datetime from datetime import datetime
import pytz import pytz
main_config = configparser.ConfigParser() main_config = configparser.ConfigParser()
main_config.read('mainconf.ini') main_config.read('./configs/mainconf.ini')
import os import os
#Setup Plane Objects off of Plane configs #Setup Plane Objects off of Plane configs
planes = {} planes = {}
for filename in os.listdir(os. getcwd()): for filename in os.listdir("./configs"):
if filename.endswith(".ini") and filename != "mainconf.ini": if filename.endswith(".ini") and filename != "mainconf.ini":
plane_config = configparser.ConfigParser() plane_config = configparser.ConfigParser()
plane_config.read(filename) plane_config.read(("./configs/" + filename))
planes[plane_config.get('DATA', 'ICAO').upper()] = Plane(plane_config.get('DATA', 'ICAO'), filename) planes[plane_config.get('DATA', 'ICAO').upper()] = Plane(plane_config.get('DATA', 'ICAO'), filename)
running_Count = 0 running_Count = 0

4
mainconf.ini → configs/mainconf.ini
View File

@ -19,3 +19,7 @@ API_KEY = apikey
USERNAME = None USERNAME = None
PASSWORD = None PASSWORD = None
[GOOGLE]
#API KEY for Google Static Maps only if you using this on any of the planes.
API_KEY = googleapikey

20
plane1.ini → configs/plane1.ini
View File

@ -1,20 +1,22 @@
[DATA] [DATA]
#Plane to track, based of ICAO or ICAO24 which is the unique transponder address of a plane. #Plane to track, based of ICAO or ICAO24 which is the unique transponder address of a plane.
ICAO = icao ICAO = icaohere
[MAP]
#Map to create from Google Static Maps or screenshot global tar1090 from globe.adsbexchange.com
#Enter GOOGLESTATICMAP or ADSBX
OPTION = ADSBX
#TITLE for Twitter, PB and Discord are Just text added to the front of each message/tweet sent
[TWITTER] [TWITTER]
ENABLE = FALSE ENABLE = FALSE
TITLE =
CONSUMER_KEY = ckhere CONSUMER_KEY = ckhere
CONSUMER_SECRET = cshere CONSUMER_SECRET = cshere
ACCESS_TOKEN = athere ACCESS_TOKEN = athere
ACCESS_TOKEN_SECRET = atshere ACCESS_TOKEN_SECRET = atshere
[GOOGLE]
#API KEYS
#If static map disabled will load up tar1090 ads-b exchange and take screenshot instead.
STATICMAP_ENABLE = FALSE
STATICMAPKEY = googleapikey
[PUSHBULLET] [PUSHBULLET]
ENABLE = FALSE ENABLE = FALSE
TITLE = Title Of Pushbullet message TITLE = Title Of Pushbullet message
@ -22,8 +24,8 @@ API_KEY = apikey
CHANNEL_TAG = channeltag CHANNEL_TAG = channeltag
[DISCORD] [DISCORD]
ENABLE = FALSE ENABLE = TRUE
#WEBHOOK URL https://support.discord.com/hc/en-us/articles/228383668-Intro-to-Webhooks #WEBHOOK URL https://support.discord.com/hc/en-us/articles/228383668-Intro-to-Webhooks
URL = webhookurl URL = webhookurl
Title = title Title =
USERNAME = plane-notify USERNAME = plane-notify

46
defADSBX.py
View File

@ -4,8 +4,10 @@ import configparser
import time import time
from datetime import datetime from datetime import datetime
from http.client import IncompleteRead from http.client import IncompleteRead
import http.client as http
import urllib3
main_config = configparser.ConfigParser() main_config = configparser.ConfigParser()
main_config.read('mainconf.ini') main_config.read('./configs/mainconf.ini')
def pullADSBX(planes): def pullADSBX(planes):
if len(planes) > 1: if len(planes) > 1:
url = "https://adsbexchange.com/api/aircraft/json/" url = "https://adsbexchange.com/api/aircraft/json/"
@ -14,22 +16,46 @@ def pullADSBX(planes):
headers = { headers = {
'api-auth': main_config.get('ADSBX', 'API_KEY'), 'api-auth': main_config.get('ADSBX', 'API_KEY'),
'Content-Encoding': 'gzip' 'Accept-Encoding': 'gzip'
} }
try: try:
response = requests.get(url, headers = headers) response = requests.get(url, headers = headers)
data = response.text response.raise_for_status()
data = json.loads(data) except (requests.exceptions.HTTPError, requests.exceptions.ConnectionError, requests.exceptions.Timeout, requests.exceptions.RequestException):
failed = False print("Basic Connection Error")
except (requests.HTTPError, requests.Timeout, IncompleteRead, ConnectionError, ConnectionResetError) as error_message:
print("ADSBX Connection Error")
print(error_message) print(error_message)
failed = True failed = True
except json.decoder.JSONDecodeError as error_message: data = None
print("Error with JSON") except (urllib3.exceptions.RemoteDisconected, IncompleteRead, http.IncompleteRead, ConnectionResetError, requests.ChunkEncodingError, urllib3.exceptions.ProtocolError, ValueError) as error_message:
print (json.dumps(data, indent = 2)) print("Connection Error")
print(error_message) print(error_message)
failed = True failed = True
data = None
except Exception as error_message:
print("Connection Error uncaught, basic exception for all")
print(error_message)
failed = True
data = None
else:
if response.status_code == 200:
try:
data = json.loads(response.text)
except (json.decoder.JSONDecodeError, ValueError) as error_message:
print("Error with JSON")
print (json.dumps(data, indent = 2))
print(error_message)
failed = True
data = None
except TypeError as error_message:
print("Type Error", error_message)
failed = True
data = None
else:
failed = False
else:
failed = True
data = None
print ("HTTP Status Code:", response.status_code) print ("HTTP Status Code:", response.status_code)
if failed is False: if failed is False:
data_ctime = float(data['ctime']) / 1000.0 data_ctime = float(data['ctime']) / 1000.0

27
defAirport.py Normal file
View File

@ -0,0 +1,27 @@
#https://www.geeksforgeeks.org/python-calculate-distance-between-two-places-using-geopy/
#https://openflights.org/data.html
def getAirport(latitude, longitude):
import json
import csv
from geopy.distance import geodesic
plane = (latitude, longitude)
header = ["id", "name", "city", "country", "iata", "icao", "lat", "lng", "alt", "tz", "dst", "tz_db", "type", "source"]
airports = []
first_run = True
with open('airports.dat', encoding='utf-8') as csvf:
reader = csv.DictReader( csvf, header)
#for row in reader:
# airports.append(row)
for row in reader:
airport = row
airport_coord = float(airport['lat']), float(airport['lng'])
airport_dist = float((geodesic(plane, airport_coord).mi))
if first_run:
closest_airport_dict = airport
closest_airport_dist = airport_dist
first_run = False
elif airport_dist < closest_airport_dist:
closest_airport_dict = airport
closest_airport_dist = airport_dist
print("Closest Airport:", closest_airport_dict['icao'], closest_airport_dict['name'], closest_airport_dist, "Miles Away")
return closest_airport_dict

5
defDiscord.py
View File

@ -1,9 +1,6 @@
def sendDis(message, map_file_name, conf_file): def sendDis(message, map_file_name, config):
from discord_webhook import DiscordWebhook from discord_webhook import DiscordWebhook
import configparser
config = configparser.ConfigParser()
config.read(conf_file)
webhook = DiscordWebhook(url=config.get('DISCORD', 'URL'), content=message, username=config.get('DISCORD', 'USERNAME')) webhook = DiscordWebhook(url=config.get('DISCORD', 'URL'), content=message, username=config.get('DISCORD', 'USERNAME'))
with open(map_file_name, "rb") as f: with open(map_file_name, "rb") as f:

7
defMap.py
View File

@ -1,9 +1,9 @@
def getMap(mapLocation): def getMap(mapLocation, icao):
import requests import requests
import configparser import configparser
config = configparser.ConfigParser() config = configparser.ConfigParser()
config.read('config.ini') config.read('./configs/mainconf.ini')
api_key = config.get('GOOGLE', 'STATICMAPKEY') api_key = config.get('GOOGLE', 'API_KEY')
url = "https://maps.googleapis.com/maps/api/staticmap?" url = "https://maps.googleapis.com/maps/api/staticmap?"
center = str(mapLocation) center = str(mapLocation)
@ -14,6 +14,7 @@ def getMap(mapLocation):
api_key + "&sensor=false") api_key + "&sensor=false")
# wb mode is stand for write binary mode # wb mode is stand for write binary mode
file_name = icao + "_map.png"
f = open('map.png', 'wb') f = open('map.png', 'wb')
# r.content gives content, # r.content gives content,

2
defOpenSky.py
View File

@ -1,7 +1,7 @@
def pullOpenSky(planes): def pullOpenSky(planes):
import configparser import configparser
main_config = configparser.ConfigParser() main_config = configparser.ConfigParser()
main_config.read('mainconf.ini') main_config.read('./configs/mainconf.ini')
from opensky_api import OpenSkyApi from opensky_api import OpenSkyApi
planeData = None planeData = None
opens_api = OpenSkyApi(username= None if main_config.get('OPENSKY', 'USERNAME').upper() == "NONE" else main_config.get('OPENSKY', 'USERNAME'), password= None if main_config.get('OPENSKY', 'PASSWORD').upper() == "NONE" else main_config.get('OPENSKY', 'PASSWORD').upper()) opens_api = OpenSkyApi(username= None if main_config.get('OPENSKY', 'USERNAME').upper() == "NONE" else main_config.get('OPENSKY', 'USERNAME'), password= None if main_config.get('OPENSKY', 'PASSWORD').upper() == "NONE" else main_config.get('OPENSKY', 'PASSWORD').upper())

5
defTweet.py
View File

@ -1,9 +1,6 @@
# Authenticate to Twitter # Authenticate to Twitter
def tweepysetup(conf_file): def tweepysetup(config):
import configparser
config = configparser.ConfigParser()
config.read(conf_file)
import tweepy import tweepy
#DOCU #DOCU
#https://realpython.com/twitter-bot-python-tweepy/ #https://realpython.com/twitter-bot-python-tweepy/

111
planeClass.py
View File

@ -38,24 +38,26 @@ class Plane:
#Setup Config File #Setup Config File
import configparser import configparser
self.config = configparser.ConfigParser() self.config = configparser.ConfigParser()
self.config.read(self.conf_file) self.config.read(("./configs/"+ self.conf_file))
main_config = configparser.ConfigParser() main_config = configparser.ConfigParser()
main_config.read('mainconf.ini') main_config.read('./configs/mainconf.ini')
#Platform for determining OS for strftime #Platform for determining OS for strftime
import platform import platform
from defAirport import getAirport
if self.config.getboolean('GOOGLE', 'STATICMAP_ENABLE'): if self.config.get('MAP', 'OPTION') == "GOOGLESTATICMAP":
from defMap import getMap from defMap import getMap
else: elif self.config.get('MAP', 'OPTION') == "ADSBX":
from defSS import getSS from defSS import getSS
else:
raise Exception("Map option not set correctly in this planes conf")
if self.config.getboolean('DISCORD', 'ENABLE'): if self.config.getboolean('DISCORD', 'ENABLE'):
from defDiscord import sendDis from defDiscord import sendDis
#Setup Tweepy #Setup Tweepy
if self.config.getboolean('TWITTER', 'ENABLE'): if self.config.getboolean('TWITTER', 'ENABLE'):
from defTweet import tweepysetup from defTweet import tweepysetup
self.tweet_api = tweepysetup(self.conf_file) self.tweet_api = tweepysetup(self.config)
#Setup PushBullet #Setup PushBullet
if self.config.getboolean('PUSHBULLET', 'ENABLE'): if self.config.getboolean('PUSHBULLET', 'ENABLE'):
from pushbullet import Pushbullet from pushbullet import Pushbullet
@ -70,13 +72,14 @@ class Plane:
self.latitude = None self.latitude = None
self.on_ground = None self.on_ground = None
self.has_location = None self.has_location = None
#Get States from ADSBX or OPENS Vector #Parse OpenSky Vector
self.plane_Dict = None self.plane_Dict = None
if main_config.get('DATA', 'SOURCE') == "OPENS": if main_config.get('DATA', 'SOURCE') == "OPENS":
self.val_error = False self.val_error = False
if ac_dict != None: if ac_dict != None:
#print (Fore.YELLOW + "OpenSky Sourced Data: ", ac_dict)
try: try:
self.plane_Dict ={'icao' : ac_dict.icao24, 'callsign' : ac_dict.callsign, 'latitude' : ac_dict.latitude, 'longitude' : ac_dict.longitude, 'on_ground' : bool(ac_dict.on_ground)} self.plane_Dict ={'icao' : ac_dict.icao24.upper(), 'callsign' : ac_dict.callsign, 'latitude' : ac_dict.latitude, 'longitude' : ac_dict.longitude, 'on_ground' : bool(ac_dict.on_ground)}
if ac_dict.geo_altitude != None: if ac_dict.geo_altitude != None:
self.plane_Dict['geo_alt_ft'] = float(ac_dict.geo_altitude) * 3.281 self.plane_Dict['geo_alt_ft'] = float(ac_dict.geo_altitude) * 3.281
elif self.plane_Dict['on_ground']: elif self.plane_Dict['on_ground']:
@ -89,13 +92,11 @@ class Plane:
else: else:
self.plane_Dict = None self.plane_Dict = None
print (Fore.YELLOW) #Parse ADBSX Vector
print ("OpenSky Sourced Data: ", self.plane_Dict)
print(Style.RESET_ALL)
elif main_config.get('DATA', 'SOURCE') == "ADSBX": elif main_config.get('DATA', 'SOURCE') == "ADSBX":
self.val_error = False self.val_error = False
if ac_dict != None: if ac_dict != None:
#print (Fore.YELLOW +"ADSBX Sourced Data: ", ac_dict + Style.RESET_ALL)
try: try:
self.plane_Dict = {'icao' : ac_dict['icao'], 'callsign' : ac_dict['call'], 'reg' : ac_dict['reg'], 'latitude' : float(ac_dict['lat']), 'longitude' : float(ac_dict['lon']), 'geo_alt_ft' : int(ac_dict['galt']), 'on_ground' : bool(int(ac_dict["gnd"]))} self.plane_Dict = {'icao' : ac_dict['icao'], 'callsign' : ac_dict['call'], 'reg' : ac_dict['reg'], 'latitude' : float(ac_dict['lat']), 'longitude' : float(ac_dict['lon']), 'geo_alt_ft' : int(ac_dict['galt']), 'on_ground' : bool(int(ac_dict["gnd"]))}
if self.plane_Dict['on_ground']: if self.plane_Dict['on_ground']:
@ -105,32 +106,32 @@ class Plane:
self.val_error = True self.val_error = True
print("Got data but some data is invalid!") print("Got data but some data is invalid!")
print(e) print(e)
if "to" in ac_dict.keys():
self.plane_Dict['to_location'] = ac_dict["to"]
if "from" in ac_dict.keys():
self.plane_Dict['from_location'] = ac_dict["from"]
else: else:
self.plane_Dict = None self.plane_Dict = None
print (Fore.CYAN + "ICAO:", self.icao + Style.RESET_ALL)
print (Fore.YELLOW) #Print out data, and convert to locals
print ("ADSBX Sourced Data: ", self.plane_Dict)
print(Style.RESET_ALL)
print (Fore.CYAN)
print ("ICAO:", self.icao)
print(Style.RESET_ALL)
if self.val_error is False: if self.val_error is False:
if self.plane_Dict == None: if self.plane_Dict == None:
self.feeding = False self.feeding = False
print("No Data")
elif self.plane_Dict != None: elif self.plane_Dict != None:
self.feeding = True self.feeding = True
self.__dict__.update(self.plane_Dict) self.__dict__.update(self.plane_Dict)
print (Fore.CYAN) if "reg" in self.plane_Dict.keys():
if main_config.get('DATA', 'SOURCE') == "ADSBX": print(Fore.CYAN + "Registration: ", self.reg)
print("Registration: ", self.reg) if "from_location" in self.plane_Dict.keys():
print ("Callsign: ", self.callsign) print("From: ", self.from_location)
if "to_location" in self.plane_Dict.keys():
print("To: ", self.to_location)
print (Fore.CYAN + "Callsign: ", self.callsign)
print ("On Ground: ", self.on_ground) print ("On Ground: ", self.on_ground)
print ("Latitude: ", self.latitude) print ("Latitude: ", self.latitude)
print ("Longitude: ", self.longitude) print ("Longitude: ", self.longitude)
print ("GEO Alitude Ft: ", self.geo_alt_ft) print ("GEO Alitude Ft: ", self.geo_alt_ft, Style.RESET_ALL)
print(Style.RESET_ALL)
#Set Check for inconsistancy in data #Set Check for inconsistancy in data
if not self.last_recheck_needed: if not self.last_recheck_needed:
#Recheck needed if feeding state changes #Recheck needed if feeding state changes
@ -146,9 +147,9 @@ class Plane:
#Run a Check compares new data to last flagged(check) data #Run a Check compares new data to last flagged(check) data
if self.last_recheck_needed: if self.last_recheck_needed:
if self.recheck_feeding == self.feeding: if self.recheck_feeding == self.feeding:
print("Data Feeding change Consistent") print("Data Feeding change consistent")
elif self.recheck_feeding != self.feeding: elif self.recheck_feeding != self.feeding:
print("Data Feeding change was Inconsistent last data ignored") print("Data Feeding change was inconsistent last data ignored")
self.recheck_feeding = self.feeding self.recheck_feeding = self.feeding
self.last_recheck_needed = self.recheck_needed self.last_recheck_needed = self.recheck_needed
@ -176,7 +177,7 @@ class Plane:
self.tookoff = False self.tookoff = False
#self.tookoff = bool(self.below_desired_ft and self.on_ground is False and ((self.last_feeding is False and self.feeding) or (self.last_on_ground))) #self.tookoff = bool(self.below_desired_ft and self.on_ground is False and ((self.last_feeding is False and self.feeding) or (self.last_on_ground)))
print ("Tookoff Just Now:", self.tookoff) #print ("Tookoff Just Now:", self.tookoff)
#Check if Landed #Check if Landed
@ -193,12 +194,12 @@ class Plane:
self.landed = False self.landed = False
else: else:
self.landed = False self.landed = False
#self.landed = bool(self.last_below_desired_ft and ((self.last_feeding and self.feeding is False and self.last_on_ground is False) or (self.on_ground and self.last_on_ground is False))) #self.landed = bool(self.last_below_desired_ft and ((self.last_feeding and self.feeding is False and self.last_on_ground is False) or (self.on_ground and self.last_on_ground is False)))
print ("Landed Just Now:", self.landed) #print ("Landed Just Now:", self.landed)
if self.landed or self.tookoff: if self.landed:
print ("Trigger Type:", self.trigger_type) print ("Landed by", self.trigger_type)
if self.tookoff:
print("Tookoff by", self.trigger_type)
#Lookup Location of coordinates #Lookup Location of coordinates
if self.landed or self.tookoff: if self.landed or self.tookoff:
if self.landed and self.last_longitude != None and self.last_latitude != None: if self.landed and self.last_longitude != None and self.last_latitude != None:
@ -273,23 +274,28 @@ class Plane:
#Set Discord Title #Set Discord Title
if self.config.getboolean('DISCORD', 'ENABLE'): if self.config.getboolean('DISCORD', 'ENABLE'):
self.dis_title = self.icao if self.config.get('DISCORD', 'TITLE') == "icao" else self.callsign if self.config.get('DISCORD', 'TITLE') == "callsign" else self.config.get('DISCORD', 'TITLE') self.dis_title = self.icao if self.config.get('DISCORD', 'TITLE') == "icao" else self.callsign if self.config.get('DISCORD', 'TITLE') == "callsign" else self.config.get('DISCORD', 'TITLE')
#Set Twitter Title
if self.config.getboolean('TWITTER', 'ENABLE'):
self.twitter_title = self.icao if self.config.get('TWITTER', 'TITLE') == "icao" else self.callsign if self.config.get('TWITTER', 'TITLE') == "callsign" else self.config.get('TWITTER', 'TITLE')
#Takeoff Notifcation and Landed #Takeoff Notifcation and Landed
if self.tookoff: if self.tookoff:
if self.invalid_Location is False: if self.invalid_Location is False:
self.tookoff_message = (self.tookoff_header + self.aera_hierarchy + ", " + self.state + ", " + self.country_code) self.tookoff_message = (self.tookoff_header + self.aera_hierarchy + ", " + self.state + ", " + self.country_code + ". ")
else: else:
self.tookoff_message = ("Took off") self.tookoff_message = ("Took off")
print (self.tookoff_message) print (self.tookoff_message)
#Google Map or tar1090 screenshot #Google Map or tar1090 screenshot
if self.config.getboolean('GOOGLE', 'STATICMAP_ENABLE'): if self.config.get('MAP', 'OPTION') == "GOOGLESTATICMAP":
getMap(self.aera_hierarchy + ", " + self.state + ", " + self.country_code) getMap((self.aera_hierarchy + ", " + self.state + ", " + self.country_code), self.icao)
else: elif self.config.get('MAP', 'OPTION') == "ADSBX":
getSS(self.icao) getSS(self.icao)
else:
raise Exception("Map option not set correctly in this planes conf")
#Discord #Discord
if self.config.getboolean('DISCORD', 'ENABLE'): if self.config.getboolean('DISCORD', 'ENABLE'):
self.dis_message = self.dis_title + " " + self.tookoff_message nearest = getAirport(self.latitude, self.longitude)
sendDis(self.dis_message, self.map_file_name, self.conf_file) self.dis_message = (self.dis_title + " " + self.tookoff_message + nearest['icao'] + ", " + nearest["name"]).strip()
sendDis(self.dis_message, self.map_file_name, self.config)
#PushBullet #PushBullet
if self.config.getboolean('PUSHBULLET', 'ENABLE'): if self.config.getboolean('PUSHBULLET', 'ENABLE'):
with open(self.map_file_name, "rb") as pic: with open(self.map_file_name, "rb") as pic:
@ -298,7 +304,7 @@ class Plane:
push = self.pb_channel.push_file(**map_data) push = self.pb_channel.push_file(**map_data)
#Twitter #Twitter
if self.config.getboolean('TWITTER', 'ENABLE'): if self.config.getboolean('TWITTER', 'ENABLE'):
self.tweet_api.update_with_media(self.map_file_name, status = self.tookoff_message) self.tweet_api.update_with_media(self.map_file_name, status = (self.twitter_title + " " + self.tookoff_message).strip())
self.takeoff_time = time.time() self.takeoff_time = time.time()
os.remove(self.map_file_name) os.remove(self.map_file_name)
@ -308,23 +314,26 @@ class Plane:
if self.takeoff_time != None: if self.takeoff_time != None:
self.landed_time = time.time() - self.takeoff_time self.landed_time = time.time() - self.takeoff_time
if platform.system() == "Linux": if platform.system() == "Linux":
self.landed_time_msg = time.strftime("Apx. flt. time %-H Hours : %-M Mins ", time.gmtime(self.landed_time)) self.landed_time_msg = time.strftime("Apx. flt. time %-H Hours : %-M Mins. ", time.gmtime(self.landed_time))
elif platform.system() == "Windows": elif platform.system() == "Windows":
self.landed_time_msg = time.strftime("Apx. flt. time %#H Hours : %#M Mins ", time.gmtime(self.landed_time)) self.landed_time_msg = time.strftime("Apx. flt. time %#H Hours : %#M Mins. ", time.gmtime(self.landed_time))
if self.invalid_Location is False: if self.invalid_Location is False:
self.landed_message = (self.landed_header + self.aera_hierarchy + ", " + self.state + ", " + self.country_code + ". " + self.landed_time_msg) self.landed_message = (self.landed_header + self.aera_hierarchy + ", " + self.state + ", " + self.country_code + ". " + self.landed_time_msg)
else: else:
self.landed_message = ("Landed", self.landed_time_msg) self.landed_message = ("Landed", self.landed_time_msg)
print (self.landed_message) print (self.landed_message)
#Google Map or tar1090 screenshot #Google Map or tar1090 screenshot
if self.config.getboolean('GOOGLE', 'STATICMAP_ENABLE'): if self.config.get('MAP', 'OPTION') == "GOOGLESTATICMAP":
getMap(self.aera_hierarchy + ", " + self.state + ", " + self.country_code) getMap((self.aera_hierarchy + ", " + self.state + ", " + self.country_code), self.icao)
else: elif self.config.get('MAP', 'OPTION') == "ADSBX":
getSS(self.icao) getSS(self.icao)
else:
raise Exception("Map option not set correctly in this planes conf")
#Discord #Discord
if self.config.getboolean('DISCORD', 'ENABLE'): if self.config.getboolean('DISCORD', 'ENABLE'):
self.dis_message = self.dis_title + " " + self.landed_message nearest = getAirport(self.last_latitude, self.last_longitude)
sendDis(self.dis_message, self.map_file_name, self.conf_file) self.dis_message = (self.dis_title + " " +self.landed_message + nearest['icao'] + ", " + nearest["name"]).strip()
sendDis(self.dis_message, self.map_file_name, self.config)
#PushBullet #PushBullet
if self.config.getboolean('PUSHBULLET', 'ENABLE'): if self.config.getboolean('PUSHBULLET', 'ENABLE'):
with open(self.map_file_name, "rb") as pic: with open(self.map_file_name, "rb") as pic:
@ -333,7 +342,7 @@ class Plane:
push = self.pb_channel.push_file(**map_data) push = self.pb_channel.push_file(**map_data)
#Twitter #Twitter
if self.config.getboolean('TWITTER', 'ENABLE'): if self.config.getboolean('TWITTER', 'ENABLE'):
self.tweet_api.update_with_media(self.map_file_name, status = self.landed_message) self.tweet_api.update_with_media(self.map_file_name, status = (self.twitter_title + " " + self.landed_message).strip())
self.takeoff_time = None self.takeoff_time = None
self.landed_time = None self.landed_time = None
self.time_since_tk = None self.time_since_tk = None