Rare: Replace utcnow()
due to deprecation notice
This commit is contained in:
parent
ad5ecc3d58
commit
a53293f279
4 changed files with 13 additions and 9 deletions
|
@ -1,7 +1,7 @@
|
||||||
import os
|
import os
|
||||||
import shutil
|
import shutil
|
||||||
from argparse import Namespace
|
from argparse import Namespace
|
||||||
from datetime import datetime, timezone
|
from datetime import datetime, timezone, UTC
|
||||||
from typing import Optional
|
from typing import Optional
|
||||||
|
|
||||||
import requests.exceptions
|
import requests.exceptions
|
||||||
|
@ -60,7 +60,7 @@ class Rare(RareApp):
|
||||||
|
|
||||||
def poke_timer(self):
|
def poke_timer(self):
|
||||||
dt_exp = datetime.fromisoformat(self.core.lgd.userdata['expires_at'][:-1]).replace(tzinfo=timezone.utc)
|
dt_exp = datetime.fromisoformat(self.core.lgd.userdata['expires_at'][:-1]).replace(tzinfo=timezone.utc)
|
||||||
dt_now = datetime.utcnow().replace(tzinfo=timezone.utc)
|
dt_now = datetime.now(UTC)
|
||||||
td = abs(dt_exp - dt_now)
|
td = abs(dt_exp - dt_now)
|
||||||
self.relogin_timer.start(int(td.total_seconds() - 60) * 1000)
|
self.relogin_timer.start(int(td.total_seconds() - 60) * 1000)
|
||||||
self.logger.info(f"Renewed session expires at {self.core.lgd.userdata['expires_at']}")
|
self.logger.info(f"Renewed session expires at {self.core.lgd.userdata['expires_at']}")
|
||||||
|
|
|
@ -1,12 +1,12 @@
|
||||||
from dataclasses import dataclass, field
|
from dataclasses import dataclass, field
|
||||||
from datetime import datetime, timezone
|
from datetime import datetime, timezone, UTC
|
||||||
from typing import List
|
from typing import List
|
||||||
|
|
||||||
|
|
||||||
@dataclass
|
@dataclass
|
||||||
class SearchDateRange:
|
class SearchDateRange:
|
||||||
start_date: datetime = datetime(year=1990, month=1, day=1, tzinfo=timezone.utc)
|
start_date: datetime = datetime(year=1990, month=1, day=1, tzinfo=timezone.utc)
|
||||||
end_date: datetime = datetime.utcnow().replace(tzinfo=timezone.utc)
|
end_date: datetime = datetime.now(UTC)
|
||||||
|
|
||||||
def __str__(self):
|
def __str__(self):
|
||||||
def fmt_date(date: datetime) -> str:
|
def fmt_date(date: datetime) -> str:
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
import datetime
|
|
||||||
import logging
|
import logging
|
||||||
|
from datetime import datetime, UTC
|
||||||
from typing import List
|
from typing import List
|
||||||
|
|
||||||
from PyQt5.QtCore import Qt, pyqtSlot, pyqtSignal, QObject, QEvent
|
from PyQt5.QtCore import Qt, pyqtSlot, pyqtSignal, QObject, QEvent
|
||||||
|
@ -184,7 +184,7 @@ class LandingWidget(QWidget, SideTabContents):
|
||||||
self.free_games_next.layout().removeWidget(w)
|
self.free_games_next.layout().removeWidget(w)
|
||||||
w.deleteLater()
|
w.deleteLater()
|
||||||
|
|
||||||
date = datetime.datetime.utcnow().replace(tzinfo=datetime.timezone.utc)
|
date = datetime.now(UTC)
|
||||||
free_now = []
|
free_now = []
|
||||||
free_next = []
|
free_next = []
|
||||||
for item in free_games:
|
for item in free_games:
|
||||||
|
|
|
@ -34,6 +34,7 @@ class RareGame(RareGameSlim):
|
||||||
steam_appid: Optional[int] = None
|
steam_appid: Optional[int] = None
|
||||||
steam_grade: Optional[str] = None
|
steam_grade: Optional[str] = None
|
||||||
steam_date: datetime = datetime.min
|
steam_date: datetime = datetime.min
|
||||||
|
steam_shortcut: Optional[int] = None
|
||||||
tags: List[str] = field(default_factory=list)
|
tags: List[str] = field(default_factory=list)
|
||||||
|
|
||||||
@classmethod
|
@classmethod
|
||||||
|
@ -46,6 +47,7 @@ class RareGame(RareGameSlim):
|
||||||
steam_appid=data.get("steam_appid", None),
|
steam_appid=data.get("steam_appid", None),
|
||||||
steam_grade=data.get("steam_grade", None),
|
steam_grade=data.get("steam_grade", None),
|
||||||
steam_date=datetime.fromisoformat(x) if (x := data.get("steam_date", "")) else datetime.min,
|
steam_date=datetime.fromisoformat(x) if (x := data.get("steam_date", "")) else datetime.min,
|
||||||
|
steam_shortcut=data.get("steam_shortcut", None),
|
||||||
tags=data.get("tags", []),
|
tags=data.get("tags", []),
|
||||||
)
|
)
|
||||||
|
|
||||||
|
@ -59,6 +61,7 @@ class RareGame(RareGameSlim):
|
||||||
steam_appid=self.steam_appid,
|
steam_appid=self.steam_appid,
|
||||||
steam_grade=self.steam_grade,
|
steam_grade=self.steam_grade,
|
||||||
steam_date=self.steam_date.isoformat() if self.steam_date else datetime.min,
|
steam_date=self.steam_date.isoformat() if self.steam_date else datetime.min,
|
||||||
|
steam_shortcut=self.steam_shortcut,
|
||||||
tags=self.tags,
|
tags=self.tags,
|
||||||
)
|
)
|
||||||
|
|
||||||
|
@ -118,7 +121,7 @@ class RareGame(RareGameSlim):
|
||||||
@pyqtSlot(int)
|
@pyqtSlot(int)
|
||||||
def __game_launched(self, code: int):
|
def __game_launched(self, code: int):
|
||||||
self.state = RareGame.State.RUNNING
|
self.state = RareGame.State.RUNNING
|
||||||
self.metadata.last_played = datetime.now()
|
self.metadata.last_played = datetime.now(UTC)
|
||||||
if code == GameProcess.Code.ON_STARTUP:
|
if code == GameProcess.Code.ON_STARTUP:
|
||||||
return
|
return
|
||||||
self.__save_metadata()
|
self.__save_metadata()
|
||||||
|
@ -430,7 +433,7 @@ class RareGame(RareGameSlim):
|
||||||
if platform.system() == "Windows" or self.is_unreal:
|
if platform.system() == "Windows" or self.is_unreal:
|
||||||
return "na"
|
return "na"
|
||||||
if self.metadata.steam_grade != "pending":
|
if self.metadata.steam_grade != "pending":
|
||||||
elapsed_time = abs(datetime.utcnow() - self.metadata.steam_date)
|
elapsed_time = abs(datetime.now(UTC) - self.metadata.steam_date)
|
||||||
|
|
||||||
if elapsed_time.days > 3:
|
if elapsed_time.days > 3:
|
||||||
logger.info("Refreshing ProtonDB grade for %s", self.app_title)
|
logger.info("Refreshing ProtonDB grade for %s", self.app_title)
|
||||||
|
@ -458,7 +461,7 @@ class RareGame(RareGameSlim):
|
||||||
if appid and self.steam_appid is None:
|
if appid and self.steam_appid is None:
|
||||||
self.set_steam_appid(appid)
|
self.set_steam_appid(appid)
|
||||||
self.metadata.steam_grade = grade
|
self.metadata.steam_grade = grade
|
||||||
self.metadata.steam_date = datetime.utcnow()
|
self.metadata.steam_date = datetime.now(UTC)
|
||||||
self.__save_metadata()
|
self.__save_metadata()
|
||||||
self.signals.widget.update.emit()
|
self.signals.widget.update.emit()
|
||||||
|
|
||||||
|
@ -499,6 +502,7 @@ class RareGame(RareGameSlim):
|
||||||
QPixmapCache.clear()
|
QPixmapCache.clear()
|
||||||
return self.image_manager.get_pixmap(self.app_name, color)
|
return self.image_manager.get_pixmap(self.app_name, color)
|
||||||
|
|
||||||
|
@pyqtSlot(object)
|
||||||
def set_pixmap(self):
|
def set_pixmap(self):
|
||||||
self.pixmap = self.image_manager.get_pixmap(self.app_name, self.is_installed)
|
self.pixmap = self.image_manager.get_pixmap(self.app_name, self.is_installed)
|
||||||
QPixmapCache.clear()
|
QPixmapCache.clear()
|
||||||
|
|
Loading…
Reference in a new issue