From 1358b43a1364bead2c77ef6c5d077908ba56d410 Mon Sep 17 00:00:00 2001
From: David Silva <d.silva@eslgaming.com>
Date: Thu, 14 Jul 2022 12:49:09 +0200
Subject: [PATCH] feat(main): tzlocal/zoneinfo

---
 main.py          | 13 +++++++++----
 requirements.txt |  1 +
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/main.py b/main.py
index 44a4cde..32cd202 100644
--- a/main.py
+++ b/main.py
@@ -4,6 +4,8 @@ import datetime
 from bs4 import BeautifulSoup
 from python_utils import converters
 import time
+import zoneinfo
+import tzlocal
 
 def padIfNeeded(numberStr: str):
     if int(numberStr) < 10:
@@ -181,10 +183,11 @@ def get_matches():
             matchObj['url'] = "https://hltv.org" + getMatch.find("a", {"class": "match a-reset"}).get("href")
             
             if (date and getMatch.find("div", {"class": "matchTime"})):
-                timeFromHLTV = datetime.datetime.strptime(date + " " + getMatch.find("div", {"class": "matchTime"}).text,'%Y-%m-%d %H:%M')
+                timeFromHLTV = datetime.datetime.strptime(date + " " + getMatch.find("div", {"class": "matchTime"}).text,'%Y-%m-%d %H:%M').replace(tzinfo=zoneinfo.ZoneInfo('Europe/Copenhagen'))
+                timeFromHLTV = timeFromHLTV.astimezone(zoneinfo.ZoneInfo(tzlocal.get_localzone_name()))
                 matchObj['date'] = timeFromHLTV.strftime('%Y-%m-%d')
                 matchObj['time'] = timeFromHLTV.strftime('%H:%M')
-                timenow = datetime.datetime.now().strftime('%Y-%m-%d %H:%M')
+                timenow = datetime.datetime.now().astimezone(zoneinfo.ZoneInfo(tzlocal.get_localzone_name())).strftime('%Y-%m-%d %H:%M')
                 deadline = date + " " + getMatch.find("div", {"class": "matchTime"}).text
                 currentTime = datetime.datetime.strptime(timenow,'%Y-%m-%d %H:%M')
                 ends = datetime.datetime.strptime(deadline, '%Y-%m-%d %H:%M')
@@ -229,8 +232,10 @@ def get_results():
                 dateArr = dateText.split()
 
                 dateTextFromArrPadded = padIfNeeded(dateArr[2]) + "-" + padIfNeeded(monthNameToNumber(dateArr[0])) + "-" + padIfNeeded(dateArr[1])
-                timeFromHLTV = datetime.datetime.strptime(dateTextFromArrPadded,'%Y-%m-%d')
-                resultObj['date'] = timeFromHLTV.strftime('%Y-%m-%d')
+                dateFromHLTV = datetime.datetime.strptime(dateTextFromArrPadded,'%Y-%m-%d').replace(tzinfo=zoneinfo.ZoneInfo('Europe/Copenhagen'))
+                dateFromHLTV = dateFromHLTV.astimezone(zoneinfo.ZoneInfo(tzlocal.get_localzone_name()))
+
+                resultObj['date'] = dateFromHLTV.strftime('%Y-%m-%d')
             else:
                 dt = datetime.date.today()
                 resultObj['date'] = str(dt.day) + '/' + str(dt.month) + '/' + str(dt.year)
diff --git a/requirements.txt b/requirements.txt
index ee6201b..824c2ba 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -4,3 +4,4 @@ lxml==4.9.1
 python-utils==2.0.0
 requests==2.20.0
 six==1.10.0
+tzlocal==4.2