Finalized first draft

justkowal · Oct 22, 2021 · b8f146a · b8f146a
1 parent 7938d61
commit b8f146a
Show file tree

Hide file tree

Showing 4 changed files with 213 additions and 18 deletions.
diff --git a/index.js b/index.js
@@ -2,11 +2,11 @@ const fetch = require('cross-fetch');
 const { app, Menu, Tray, BrowserWindow } = require('electron')
 const client = require('discord-rich-presence')('900398628529664030');
 const infogetter = require('./infogetter.js')
-var path = require("path")
+const path = require("path")
 
 let appIcon = null
 app.whenReady().then(() => {
-
+  recenticao=""
   appIcon = new Tray(path.resolve("./trayicon.png"))
   const contextMenu = Menu.buildFromTemplate([
       {

diff --git a/infogetter.js b/infogetter.js
@@ -69,24 +69,37 @@ module.exports = function(address,port,cb){
                 return res.json();
               })
               .then(airspeedres => {
-                icon = iconres.children[13].value
-                paintjob = "unknown"
-                paintjobtext = liveryres.value
-                if(geolocres.city == "") {
-                  if(geolocres.locality == "") {
-                    airspace = geolocres.principalSubdivision
+                fetch(`http://localhost:8080/json//environment/metar/data`)
+                .then(res => {
+                  if (res.status >= 400) {
+                    throw new Error("Bad response from server");
+                  }
+                  return res.json();
+                })
+                .then(metarres => {
+                  icao = metarres.value.split(" ")[0]
+                  icon = iconres.children[13].value
+                  paintjob = "unknown"
+                  paintjobtext = liveryres.value
+                  if(geolocres.city == "") {
+                    if(geolocres.locality == "") {
+                      airspace = geolocres.principalSubdivision
+                    }else{
+                      airspace = geolocres.locality
+                    }
                   }else{
-                    airspace = geolocres.locality
+                    airspace = geolocres.city
                   }
-                }else{
-                  airspace = geolocres.city
-                }
-                if(geolocres.countryCode == ""){
-                  airspace = geolocres.locality + "🌊"
-                }else{
-                  airspace = airspace + ` ${country2emoji(geolocres.countryCode)}`
-                }
-                cb({altidude:posres.children[2].value,airspeed:airspeedres.value ,aircraft:aircraft, icon:icon, paintjobicon:paintjob, paintjobtext:paintjobtext, airspace:airspace, latitude:posres.children[1].value, longitude:posres.children[0].value})
+                  if(geolocres.countryCode == ""){
+                    airspace = geolocres.locality + "🌊"
+                  }else{
+                    airspace = airspace + ` ${country2emoji(geolocres.countryCode)}`
+                  }
+                  cb({icao:icao,altidude:posres.children[2].value,airspeed:airspeedres.value ,aircraft:aircraft, icon:icon, paintjobicon:paintjob, paintjobtext:paintjobtext, airspace:airspace, latitude:posres.children[1].value, longitude:posres.children[0].value})
+                })
+                .catch(err => {
+                  console.error(err);
+                })
               })
               .catch(err => {
                 console.error(err);

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -21,6 +21,7 @@
     "electron": "^15.2.0"
   },
   "dependencies": {
+    "@ffmpeg-installer/ffmpeg": "^1.1.0",
     "cross-fetch": "^3.1.4",
     "discord-rich-presence": "^0.0.8",
     "node-fetch": "^3.0.0",