v0.4.5, minor bug fixes: invalid instrument approach on APP UPLOAD, e…

…mpty ROUTER in APP SCRAPE, clear console after installing modules.
glott · Apr 13, 2023 · 071616d · 071616d
1 parent b7f9b65
commit 071616d
Show file tree

Hide file tree

Showing 17 changed files with 36 additions and 20 deletions.
diff --git a/APP_SCRAPE.py b/APP_SCRAPE.py
@@ -15,6 +15,7 @@
                            'install', 'selenium']);
     subprocess.check_call([sys.executable, '-m', 'pip', 
                            'install', 'webdriver_manager']);
+    os.system('cls')
 
 import requests
 from selenium import webdriver
@@ -151,9 +152,11 @@ def wait(w=1, t=5):
 s = 'ident,type,dep,arr,alt,speed,route,rules,equip,spawn-delay,' \
     + 'gate,lat,lon,ralt,rspeed,hdg,dct,proc'
 goal_intercept_alt = int(read_config_value('INTERCEPT_ALT'))
-router_long = read_config_value('ROUTER').split(',')
-router = [i.split(':') for i in router_long]
-routes = [i[0] for i in router]
+routes = list()
+if ',' in read_config_value('ROUTER'):
+    router_long = read_config_value('ROUTER').split(',')
+    router = [i.split(':') for i in router_long]
+    routes = [i[0] for i in router]
 
 def find_intercept(tracklog_url):
     wait(w=random.uniform(1, 2.5))

diff --git a/APP_UPLOAD.py b/APP_UPLOAD.py
@@ -15,6 +15,7 @@
                            'install', 'selenium']);
     subprocess.check_call([sys.executable, '-m', 'pip', 
                            'install', 'webdriver_manager']);
+    os.system('cls')
 
 import requests
 from selenium import webdriver
@@ -244,7 +245,9 @@ def delete_existing(ident):
     prev_spawn_delay = true_spawn_delay
     set_data(pos, 'spawnDelay', true_spawn_delay)
     set_data(pos, 'airportId', plane['arr'][1:])
-    set_data(pos, 'expectedApproach', plane['proc'])
+    exp_app = 'I' + plane['proc'] if len(plane['proc']) > 0 and \
+        plane['proc'][0].isdigit() else plane['proc']
+    set_data(pos, 'expectedApproach', exp_app)
 
     click_button('Create Flight Plan')
 

diff --git a/ARR_SCRAPE.py b/ARR_SCRAPE.py
@@ -15,6 +15,7 @@
                            'install', 'selenium']);
     subprocess.check_call([sys.executable, '-m', 'pip', 
                            'install', 'webdriver_manager']);
+    os.system('cls')
 
 import requests
 from selenium import webdriver

diff --git a/ARR_UPLOAD.py b/ARR_UPLOAD.py
@@ -15,6 +15,7 @@
                            'install', 'selenium']);
     subprocess.check_call([sys.executable, '-m', 'pip', 
                            'install', 'webdriver_manager']);
+    os.system('cls')
 
 import requests
 from selenium import webdriver

diff --git a/DEP_SCRAPE.py b/DEP_SCRAPE.py
@@ -15,6 +15,7 @@
                            'install', 'selenium']);
     subprocess.check_call([sys.executable, '-m', 'pip', 
                            'install', 'webdriver_manager']);
+    os.system('cls')
 
 import requests
 from selenium import webdriver

diff --git a/DEP_UPLOAD.py b/DEP_UPLOAD.py
@@ -15,6 +15,7 @@
                            'install', 'selenium']);
     subprocess.check_call([sys.executable, '-m', 'pip', 
                            'install', 'webdriver_manager']);
+    os.system('cls')
 
 import requests
 from selenium import webdriver

diff --git a/DEP_VFR.py b/DEP_VFR.py
@@ -15,6 +15,7 @@
                            'install', 'selenium']);
     subprocess.check_call([sys.executable, '-m', 'pip', 
                            'install', 'webdriver_manager']);
+    os.system('cls')
 
 import requests
 from selenium import webdriver

diff --git a/FAST_UPDATE.py b/FAST_UPDATE.py
@@ -8,6 +8,7 @@
 except ImportError:
     subprocess.check_call([sys.executable, '-m', 'pip', 
                            'install', 'requests']);
+    os.system('cls')
 
 import requests
 

diff --git a/Jupyter/APP_SCRAPE.ipynb b/Jupyter/APP_SCRAPE.ipynb
@@ -24,6 +24,7 @@
     "                           'install', 'selenium']);\n",
     "    subprocess.check_call([sys.executable, '-m', 'pip', \n",
     "                           'install', 'webdriver_manager']);\n",
+    "    os.system('cls')\n",
     "\n",
     "import requests\n",
     "from selenium import webdriver\n",
@@ -188,9 +189,11 @@
     "s = 'ident,type,dep,arr,alt,speed,route,rules,equip,spawn-delay,' \\\n",
     "    + 'gate,lat,lon,ralt,rspeed,hdg,dct,proc'\n",
     "goal_intercept_alt = int(read_config_value('INTERCEPT_ALT'))\n",
-    "router_long = read_config_value('ROUTER').split(',')\n",
-    "router = [i.split(':') for i in router_long]\n",
-    "routes = [i[0] for i in router]\n",
+    "routes = list()\n",
+    "if ',' in read_config_value('ROUTER'):\n",
+    "    router_long = read_config_value('ROUTER').split(',')\n",
+    "    router = [i.split(':') for i in router_long]\n",
+    "    routes = [i[0] for i in router]\n",
     "\n",
     "def find_intercept(tracklog_url):\n",
     "    wait(w=random.uniform(1, 2.5))\n",

diff --git a/Jupyter/APP_UPLOAD.ipynb b/Jupyter/APP_UPLOAD.ipynb
@@ -24,6 +24,7 @@
     "                           'install', 'selenium']);\n",
     "    subprocess.check_call([sys.executable, '-m', 'pip', \n",
     "                           'install', 'webdriver_manager']);\n",
+    "    os.system('cls')\n",
     "\n",
     "import requests\n",
     "from selenium import webdriver\n",
@@ -287,7 +288,9 @@
     "    prev_spawn_delay = true_spawn_delay\n",
     "    set_data(pos, 'spawnDelay', true_spawn_delay)\n",
     "    set_data(pos, 'airportId', plane['arr'][1:])\n",
-    "    set_data(pos, 'expectedApproach', plane['proc'])\n",
+    "    exp_app = 'I' + plane['proc'] if len(plane['proc']) > 0 and \\\n",
+    "        plane['proc'][0].isdigit() else plane['proc']\n",
+    "    set_data(pos, 'expectedApproach', exp_app)\n",
     "\n",
     "    click_button('Create Flight Plan')\n",
     "    \n",

diff --git a/Jupyter/ARR_SCRAPE.ipynb b/Jupyter/ARR_SCRAPE.ipynb
@@ -24,6 +24,7 @@
     "                           'install', 'selenium']);\n",
     "    subprocess.check_call([sys.executable, '-m', 'pip', \n",
     "                           'install', 'webdriver_manager']);\n",
+    "    os.system('cls')\n",
     "\n",
     "import requests\n",
     "from selenium import webdriver\n",

diff --git a/Jupyter/ARR_UPLOAD.ipynb b/Jupyter/ARR_UPLOAD.ipynb
@@ -24,6 +24,7 @@
     "                           'install', 'selenium']);\n",
     "    subprocess.check_call([sys.executable, '-m', 'pip', \n",
     "                           'install', 'webdriver_manager']);\n",
+    "    os.system('cls')\n",
     "\n",
     "import requests\n",
     "from selenium import webdriver\n",

diff --git a/Jupyter/DEP_SCRAPE.ipynb b/Jupyter/DEP_SCRAPE.ipynb
@@ -24,6 +24,7 @@
     "                           'install', 'selenium']);\n",
     "    subprocess.check_call([sys.executable, '-m', 'pip', \n",
     "                           'install', 'webdriver_manager']);\n",
+    "    os.system('cls')\n",
     "\n",
     "import requests\n",
     "from selenium import webdriver\n",

diff --git a/Jupyter/DEP_UPLOAD.ipynb b/Jupyter/DEP_UPLOAD.ipynb
@@ -24,6 +24,7 @@
     "                           'install', 'selenium']);\n",
     "    subprocess.check_call([sys.executable, '-m', 'pip', \n",
     "                           'install', 'webdriver_manager']);\n",
+    "    os.system('cls')\n",
     "\n",
     "import requests\n",
     "from selenium import webdriver\n",

diff --git a/Jupyter/DEP_VFR.ipynb b/Jupyter/DEP_VFR.ipynb
@@ -24,6 +24,7 @@
     "                           'install', 'selenium']);\n",
     "    subprocess.check_call([sys.executable, '-m', 'pip', \n",
     "                           'install', 'webdriver_manager']);\n",
+    "    os.system('cls')\n",
     "\n",
     "import requests\n",
     "from selenium import webdriver\n",

diff --git a/Jupyter/FAST_UPDATE.ipynb b/Jupyter/FAST_UPDATE.ipynb
@@ -2,18 +2,10 @@
  "cells": [
   {
    "cell_type": "code",
-   "execution_count": 1,
+   "execution_count": null,
    "id": "e1b6f10f",
    "metadata": {},
-   "outputs": [
-    {
-     "name": "stdout",
-     "output_type": "stream",
-     "text": [
-      "Installed!\n"
-     ]
-    }
-   ],
+   "outputs": [],
    "source": [
     "# IMPORTS AND ZIP DOWNLOAD\n",
     "import zipfile, os, shutil, urllib.request, subprocess, sys, warnings\n",
@@ -25,6 +17,7 @@
     "except ImportError:\n",
     "    subprocess.check_call([sys.executable, '-m', 'pip', \n",
     "                           'install', 'requests']);\n",
+    "    os.system('cls')\n",
     "\n",
     "import requests\n",
     "\n",

diff --git a/README.md b/README.md
@@ -2,11 +2,11 @@
 
 _by [Josh Glottmann](https://github.com/glott)_
 
-**Version 0.4.4** - 04/11/2023
+**Version 0.4.5** - 04/13/2023
 
 Creates scenario files for [ATCTrainer](https://atctrainer.collinkoldoff.dev/#about) by [Collin Koldoff](https://github.com/collink2451) using data from [FlightAware](https://flightaware.com/)\*.
 
-__[Download v0.4.4](https://github.com/glott/FAST/releases/latest/download/FAST.zip)__ 
+__[Download v0.4.5](https://github.com/glott/FAST/releases/latest/download/FAST.zip)__ 
 
 ---
 ### Installation