wouter/Artemis
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Forecast data are now downloaded asynchronously. This is much faster

Browse Source
This commit is contained in:
alessandro90
2019-04-26 17:36:24 +02:00
parent f45d36dc6d
commit 9c77ac8278
4 changed files with 51 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
artemis.py
View File

@@ -42,7 +42,8 @@ from utilities import (checksum_ok,
format_numbers, format_numbers,
resource_path,) resource_path,)
# import icon_rc import icon_rc
qt_creator_file = resource_path("artemis.ui") qt_creator_file = resource_path("artemis.ui")
Ui_MainWindow, _ = uic.loadUiType(qt_creator_file) Ui_MainWindow, _ = uic.loadUiType(qt_creator_file)

31
constants.py
View File

@@ -1,18 +1,22 @@
from collections import namedtuple from collections import namedtuple
from enum import Enum, auto from enum import Enum, auto
class Ftype(object): class Ftype(object):
FREQ = "freq" FREQ = "freq"
BAND = "band" BAND = "band"
class GfdType(Enum): class GfdType(Enum):
FREQ = auto() FREQ = auto()
LOC = auto() LOC = auto()
class ChecksumWhat(Enum): class ChecksumWhat(Enum):
FOLDER = auto() FOLDER = auto()
DB = auto() DB = auto()
class Messages(object): class Messages(object):
DB_UP_TO_DATE = "Already up to date" DB_UP_TO_DATE = "Already up to date"
DB_UP_TO_DATE_MSG = "No newer version to download." DB_UP_TO_DATE_MSG = "No newer version to download."
@@ -27,6 +31,7 @@ class Messages(object):
BAD_DOWNLOAD = "Something went wrong" BAD_DOWNLOAD = "Something went wrong"
BAD_DOWNLOAD_MSG = "Something went wrong with the downaload.\nCheck your internet connection and try again." BAD_DOWNLOAD_MSG = "Something went wrong with the downaload.\nCheck your internet connection and try again."
class Signal(object): class Signal(object):
NAME = "name" NAME = "name"
INF_FREQ = "inf_freq" INF_FREQ = "inf_freq"
@@ -42,6 +47,7 @@ class Signal(object):
ACF = "acf" ACF = "acf"
WIKI_CLICKED = "url_clicked" WIKI_CLICKED = "url_clicked"
class Database(object): class Database(object):
LINK_LOC = "https://aresvalley.com/Storage/Artemis/Database/data.zip" LINK_LOC = "https://aresvalley.com/Storage/Artemis/Database/data.zip"
LINK_REF = "https://aresvalley.com/Storage/Artemis/Database/data.zip.log" LINK_REF = "https://aresvalley.com/Storage/Artemis/Database/data.zip.log"
@@ -66,25 +72,26 @@ class Database(object):
Signal.SUP_BAND, Signal.SUP_BAND,
Signal.CATEGORY_CODE,) Signal.CATEGORY_CODE,)
class Constants(object): class Constants(object):
CLICK_TO_UPDATE_STR = "Click to update" CLICK_TO_UPDATE_STR = "Click to update"
UPDATING_STR = "Updating..." UPDATING_STR = "Updating..."
ACF_DOCS = "https://aresvalley.com/documentation/" ACF_DOCS = "https://aresvalley.com/documentation/"
FORECAST_XRAY = "https://services.swpc.noaa.gov/text/goes-xray-flux-primary.txt" FORECAST_XRAY = "https://services.swpc.noaa.gov/text/goes-xray-flux-primary.txt"
FORECAST_PROT = "https://services.swpc.noaa.gov/text/goes-particle-flux-primary.txt" FORECAST_PROT_EL = "https://services.swpc.noaa.gov/text/goes-particle-flux-primary.txt"
FORECAST_AK_IND = "https://services.swpc.noaa.gov/text/wwv.txt" FORECAST_AK_INDEX = "https://services.swpc.noaa.gov/text/wwv.txt"
FORECAST_SGAS = "https://services.swpc.noaa.gov/text/sgas.txt" FORECAST_SGAS = "https://services.swpc.noaa.gov/text/sgas.txt"
FORECAST_G = "https://services.swpc.noaa.gov/text/3-day-forecast.txt" FORECAST_GEO_STORM = "https://services.swpc.noaa.gov/text/3-day-forecast.txt"
FORECAST_INFO = "https://www.swpc.noaa.gov/sites/default/files/images/NOAAscales.pdf" FORECAST_INFO = "https://www.swpc.noaa.gov/sites/default/files/images/NOAAscales.pdf"
FORECAST_IMG_0 = "http://www.mmmonvhf.de/eme/eme.png" FORECAST_IMGS = ["http://www.mmmonvhf.de/eme/eme.png",
FORECAST_IMG_1 = "http://www.mmmonvhf.de/ms/ms.png" "http://www.mmmonvhf.de/ms/ms.png",
FORECAST_IMG_2 = "http://www.mmmonvhf.de/es/es.png" "http://www.mmmonvhf.de/es/es.png",
FORECAST_IMG_3 = "http://www.mmmonvhf.de/solar/solar.png" "http://www.mmmonvhf.de/solar/solar.png",
FORECAST_IMG_4 = "http://amunters.home.xs4all.nl/eskipstatusNA.gif" "http://amunters.home.xs4all.nl/eskipstatusNA.gif",
FORECAST_IMG_5 = "http://amunters.home.xs4all.nl/aurorastatus.gif" "http://amunters.home.xs4all.nl/aurorastatus.gif",
FORECAST_IMG_6 = "http://amunters.home.xs4all.nl/eskipstatus.gif" "http://amunters.home.xs4all.nl/eskipstatus.gif",
FORECAST_IMG_7 = "http://amunters.home.xs4all.nl/eskip50status.gif" "http://amunters.home.xs4all.nl/eskip50status.gif",
FORECAST_IMG_8 = "http://amunters.home.xs4all.nl/eskip70status.gif" "http://amunters.home.xs4all.nl/eskip70status.gif"]
SEARCH_LABEL_IMG = "search_icon.png" SEARCH_LABEL_IMG = "search_icon.png"
VOLUME_LABEL_IMG = "volume.png" VOLUME_LABEL_IMG = "volume.png"
DATA_FOLDER = "Data" DATA_FOLDER = "Data"

1
download_window.py
View File

@@ -7,6 +7,7 @@ from constants import Messages
Ui_Download_window, _ = uic.loadUiType(resource_path("download_db_window.ui")) Ui_Download_window, _ = uic.loadUiType(resource_path("download_db_window.ui"))
class DownloadWindow(QWidget, Ui_Download_window): class DownloadWindow(QWidget, Ui_Download_window):
complete = pyqtSignal() complete = pyqtSignal()

45
threads.py
View File

@@ -1,3 +1,4 @@
import asyncio
from enum import Enum, auto from enum import Enum, auto
from io import BytesIO from io import BytesIO
import os.path import os.path
@@ -7,6 +8,8 @@ from zipfile import ZipFile
from PyQt5.QtCore import QThread from PyQt5.QtCore import QThread
from constants import Constants, Database, ChecksumWhat from constants import Constants, Database, ChecksumWhat
from utilities import checksum_ok from utilities import checksum_ok
import aiohttp
class ThreadStatus(Enum): class ThreadStatus(Enum):
OK = auto() OK = auto()
@@ -15,6 +18,7 @@ class ThreadStatus(Enum):
BAD_DOWNLOAD_ERR = auto() BAD_DOWNLOAD_ERR = auto()
UNDEFINED = auto() UNDEFINED = auto()
class DownloadThread(QThread): class DownloadThread(QThread):
def __init__(self): def __init__(self):
super().__init__() super().__init__()
@@ -73,24 +77,33 @@ class UpadteSpaceWeatherThread(QThread):
self.terminate() self.terminate()
self.wait() self.wait()
def run(self): async def __download_resource(self, session, link):
get_request_data = lambda link: urllib3.PoolManager().request('GET', link).data resp = await session.get(link)
return await resp.read()
async def __download_property(self, session, property_name):
link = getattr(Constants, "FORECAST_" + property_name.upper())
data = await self.__download_resource(session, link)
setattr(self.__space_weather_data, property_name, str(data, 'utf-8'))
async def __download_image(self, session, n):
im = await self.__download_resource(session, Constants.FORECAST_IMGS[n])
self.__space_weather_data.images[n].loadFromData(im)
async def __download_resources(self, *links):
session = aiohttp.ClientSession()
properties = ("xray", "prot_el", "ak_index", "sgas", "geo_storm")
try: try:
self.__space_weather_data.xray = str(get_request_data(Constants.FORECAST_XRAY), 'utf-8') t = [asyncio.create_task(self.__download_property(session, p)) for p in properties]
self.__space_weather_data.prot_el = str(get_request_data(Constants.FORECAST_PROT), 'utf-8') tot_images = range(len(Constants.FORECAST_IMGS))
self.__space_weather_data.ak_index = str(get_request_data(Constants.FORECAST_AK_IND), 'utf-8') t1 = [asyncio.create_task(self.__download_image(session, im_number)) for im_number in tot_images]
self.__space_weather_data.sgas = str(get_request_data(Constants.FORECAST_SGAS), 'utf-8') await asyncio.gather(*t, *t1)
self.__space_weather_data.geo_storm = str(get_request_data(Constants.FORECAST_G), 'utf-8')
self.__space_weather_data.images[0].loadFromData(get_request_data(Constants.FORECAST_IMG_0))
self.__space_weather_data.images[1].loadFromData(get_request_data(Constants.FORECAST_IMG_1))
self.__space_weather_data.images[2].loadFromData(get_request_data(Constants.FORECAST_IMG_2))
self.__space_weather_data.images[3].loadFromData(get_request_data(Constants.FORECAST_IMG_3))
self.__space_weather_data.images[4].loadFromData(get_request_data(Constants.FORECAST_IMG_4))
self.__space_weather_data.images[5].loadFromData(get_request_data(Constants.FORECAST_IMG_5))
self.__space_weather_data.images[6].loadFromData(get_request_data(Constants.FORECAST_IMG_6))
self.__space_weather_data.images[7].loadFromData(get_request_data(Constants.FORECAST_IMG_7))
self.__space_weather_data.images[8].loadFromData(get_request_data(Constants.FORECAST_IMG_8))
except Exception: except Exception:
self.__status = ThreadStatus.UNKNOWN_ERR self.__status = ThreadStatus.UNKNOWN_ERR
else: else:
self.__status = ThreadStatus.OK self.__status = ThreadStatus.OK
finally:
await session.close()
def run(self):
asyncio.run(self.__download_resources())