diff --git a/.gitignore b/.gitignore index 4d8d338..370ea03 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,5 @@ virtenv waterfall.png __pycache__ -scripts \ No newline at end of file +scripts +result \ No newline at end of file diff --git a/result b/result deleted file mode 120000 index fe6a563..0000000 --- a/result +++ /dev/null @@ -1 +0,0 @@ -/nix/store/fxzpj6qdbgr6mcxs12004v71h2hzzqld-satnogs-demo-display-1.0 \ No newline at end of file diff --git a/update.py b/update.py index 4beaee5..ca0f599 100644 --- a/update.py +++ b/update.py @@ -62,10 +62,12 @@ def main(): ob['norad_cat_id']) sat_name = resp.json()['name'] - sat_img_url = "https://db-satnogs.freetls.fastly.net/media/%s" % (resp.json()['image']) + sat_img_url = "https://db-satnogs.freetls.fastly.net/media/%s" % ( + resp.json()['image']) print(sat_img_url) mode_desc = ob['transmitter_mode'] + frequency = ob['observation_frequency'] / 1_000_000 resp = requests.get(ob['waterfall']) waterfall = Image.open(BytesIO(resp.content)).convert('RGBA') @@ -84,13 +86,11 @@ def main(): sat_img_aplha = Image.open(BytesIO(resp.content)).convert('RGBA') alpha_chan = sat_img_aplha.convert('RGBA').split()[-1] - sat_img = Image.new("RGBA", sat_img_aplha.size, (255,255, 255, 255)) + sat_img = Image.new("RGBA", sat_img_aplha.size, (255, 255, 255, 255)) sat_img.paste(sat_img_aplha, mask=alpha_chan) sat_img = scale_to_width(sat_img, 500) - - img = Image.new('RGBA', (1280, 1024)) draw = ImageDraw.Draw(img) draw.rectangle((0, 0, 1280, 1024), fill=(0, 0, 0, 255)) @@ -98,8 +98,8 @@ def main(): station_name = ob['station_name'] if len(station_name) > 20: station_name = station_name[:20] + "..." - infos = "Satellite: %s\nStation: %s\nMode: %s\nStart: %s\nEnd: %s" % ( - sat_name, station_name, mode_desc, ob['start'], ob['end']) + infos = "Satellite: %s\nStation: %s\nMode: %s\nFrequency: %f MHz\nStart: %s\nEnd: %s" % ( + sat_name, station_name, mode_desc, frequency, ob['start'], ob['end']) font = ImageFont.truetype("Montserrat-Regular.otf", FONT_SIZE) draw.text((water_width + 100, logo_h + 50), infos, TEXT_COLOR, font=font) @@ -107,7 +107,7 @@ def main(): img.paste(waterfall, (0, 0)) img.paste(logo, (water_width + 100, 20)) if sat_img != None: - img.paste(sat_img, (water_width + 100, 400)) + img.paste(sat_img, (water_width + 100, 500)) img.save('waterfall_tmp.png') os.rename('waterfall_tmp.png', 'waterfall.png')