Обновить dwmbar

dwmbar

@@ -12,21 +12,20 @@ from datetime import datetime
 
 DD = ';'
 DELIM = '  '
-COLOR = False
+COLOR = True
 
 
 def shutdown():
-	for task in asyncio.Task.all_tasks():
-		if task is not asyncio.tasks.Task.current_task():
-			task.cancel()
+	print("Shutting down...")
+	loop.stop()
 
 
 async def dwmbar():
-	global bl, br
+	global DD
 
 	await asyncio.sleep(1)
 	while True:
-		bar = f"{status()}{DD}{bl}{DD}{br}"
+		bar = f"{status()}{DD}{extrabar()}"
 
 #		print(bar)
 		run(["xprop", "-root", "-set", "WM_NAME", bar], check=True)
@@ -34,6 +33,7 @@ async def dwmbar():
 		await asyncio.sleep(0.1)
 
 
+net = ram = cpu = gpu = wlan = disk = vol = lang = dat = tim = currates = weather = 0
 def status():
 	global DELIM, net, ram, cpu, gpu, wlan, disk, vol, lang, dat, tim
 
@@ -55,45 +55,47 @@ def status():
 		return ''
 
 
-async def bl():
-	global bl, COLOR
+def extrabar():
+	global DELIM, currates, weather, COLOR
+
+	try:
+		bar = [
+			weather,
+#			currates
+		]
+
+		return DELIM.join(bar)
+	except:
+		return ''
+
+
+async def currates():
+	global DELIM, currates, COLOR
 
 	COLOR1='#AAAAAA'
 	COLOR2='#444444'
 
 	while True:
 		curs = []
-		curs.append(['', f"${float(requests.get('https://api.binance.com/api/v3/ticker/24hr?symbol=XMRUSDT').json()['lastPrice']):.2f}"])
-		curs.append(['', f"${float(requests.get('https://api.binance.com/api/v3/ticker/24hr?symbol=BTCUSDT').json()['lastPrice']):.2f}"])
-		curs.append(['', f"${float(requests.get('https://api.binance.com/api/v3/ticker/24hr?symbol=LTCUSDT').json()['lastPrice']):.2f}"])
-		curs.append(['Ð', f"${float(requests.get('https://api.binance.com/api/v3/ticker/24hr?symbol=DOGEUSDT').json()['lastPrice']):.2f}"])
-		curs.append(['$', f"{float(requests.get('https://api.binance.com/api/v3/ticker/24hr?symbol=USDTRUB').json()['lastPrice']):.2f} RUB"])
+		try:
+			curs.append(['', f"${float(requests.get('https://api.binance.com/api/v3/ticker/24hr?symbol=BTCUSDT').json()['lastPrice']):.2f}"])
+#			curs.append(['', f"${float(requests.get('https://api.binance.com/api/v3/ticker/24hr?symbol=LTCUSDT').json()['lastPrice']):.2f}"])
+#			curs.append(['Ð', f"${float(requests.get('https://api.binance.com/api/v3/ticker/24hr?symbol=DOGEUSDT').json()['lastPrice']):.2f}"])
 
-		curs.append(['',
-			f"""{
-				float(requests.get('https://api.binance.com/api/v3/ticker/24hr?symbol=USDTRUB').json()['lastPrice']) /
-				float(requests.get('https://api.binance.com/api/v3/ticker/24hr?symbol=USDTTRY').json()['lastPrice'])
-			:.2f} RUB"""
-		])
-		curs.append(['₴',
-			f"""{
-				float(requests.get('https://api.binance.com/api/v3/ticker/24hr?symbol=USDTRUB').json()['lastPrice']) /
-				float(requests.get('https://api.binance.com/api/v3/ticker/24hr?symbol=USDTUAH').json()['lastPrice'])
-			:.2f} RUB"""
-		])
+			if COLOR:
+				row = list(map(lambda x: f'^b{COLOR1}^^c{COLOR2}^ {x[0]} ^c{COLOR1}^^b{COLOR2}^ {x[1]} ^d^', curs))
+			else:
+				row = list(map(lambda x: f'[{x[0]} | {x[1]}]', curs))
 
-		if COLOR:
-			row = list(map(lambda x: f'^b{COLOR1}^^c{COLOR2}^ {x[0]} ^c{COLOR1}^^b{COLOR2}^ {x[1]} ^d^', curs))
-		else:
-			row = list(map(lambda x: f'[{x[0]} | {x[1]}]', curs))
-
-		bl = DELIM.join(row)
+			currates = DELIM.join(row)
+		except:
+			pass
 
 		await asyncio.sleep(60 * 10)
 
 
-async def br():
-	global br, COLOR
+async def weather():
+	global weather, COLOR
 
 	COLOR1='#AAAAAA'
 	COLOR2='#444444'
@@ -101,14 +103,17 @@ async def br():
 	CITY='Tyumen'
 
 	while True:
-		i = requests.get(f"https://wttr.in/{CITY}?format=%c").text.strip() #.encode('utf-8')[0:3].decode('utf-8')
-		t = requests.get(f"https://wttr.in/{CITY}?format=%t").text.strip()
-		w = requests.get(f"https://wttr.in/{CITY}?format=j2").json()['current_condition'][0]['windspeedKmph'].strip()
+		try:
+			i = requests.get(f"https://wttr.in/{CITY}?format=%c").text.strip() #.encode('utf-8')[0:3].decode('utf-8')
+			t = requests.get(f"https://wttr.in/{CITY}?format=%t").text.strip()
+			w = requests.get(f"https://wttr.in/{CITY}?format=j2").json()['current_condition'][0]['windspeedKmph'].strip()
 
-		if COLOR:
-			br = f"^b{COLOR2}^^c{COLOR1}^ {w} km/h ^b{COLOR1}^^c{COLOR2}^ {i} ^c{COLOR1}^^b{COLOR2}^ {t} ^d^"
-		else:
-			br = f"[{w} km/h | {i} | {t}]"
+			if COLOR:
+				weather = f"^b{COLOR2}^^c{COLOR1}^ {w} km/h ^b{COLOR1}^^c{COLOR2}^ {i} ^c{COLOR1}^^b{COLOR2}^ {t} ^d^"
+			else:
+				weather = f"[{w} km/h | {i} | {t}]"
+		except:
+			pass
 
 		await asyncio.sleep(60 * 30)
 
@@ -161,8 +166,8 @@ async def ram():
 async def cpu():
 	global cpu, COLOR
 
-	COLOR1='#990057'
-	COLOR2='#FF00B2'
+	COLOR1='#FF00B2'
+	COLOR2='#990057'
 
 	while True:
 		load = psutil.cpu_percent()
@@ -178,11 +183,11 @@ async def cpu():
 async def gpu():
 	global gpu, COLOR
 
-	COLOR1='#990057'
-	COLOR2='#FF00B2'
+	COLOR1='#FF00B2'
+	COLOR2='#990057'
 
 	while True:
-		load = open('/sys/class/drm/card0/device/gpu_busy_percent').read().strip()
+		load = open('/sys/class/drm/card1/device/gpu_busy_percent').read().strip()
 
 		if COLOR:
 			gpu = f'^b{COLOR1}^^c{COLOR2}^  ^c{COLOR1}^^b{COLOR2}^ {load}% ^d^'
@@ -307,11 +312,8 @@ async def dat():
 		await asyncio.sleep(1)
 
 
-if __name__ == '__main__':
-	signal.signal(signal.SIGINT, lambda n, f: shutdown())
-
-	loop = asyncio.get_event_loop()
-	main_task = asyncio.wait([
+async def main():
+	await asyncio.gather(
 		dwmbar(),
 		net(),
 		ram(),
@@ -322,12 +324,20 @@ if __name__ == '__main__':
 		lang(),
 		dat(),
 		tim(),
-		bl(),
-		br()
-	])
+#		currates(),
+		weather()
+	)
+
+
+if __name__ == '__main__':
+	signal.signal(signal.SIGINT, lambda n, f: shutdown())
+
+	loop = asyncio.get_event_loop()
+	main_task = asyncio.ensure_future(main())
 
 	try:
 		loop.run_until_complete(main_task)
-	except asyncio.CancelledError:
-		loop.run_until_complete(main_task)
-	loop.close()
+	except KeyboardInterrupt:
+		print("KeyboardInterrupt: Stopping the event loop...")
+	finally:
+		loop.close()