diff --git a/rare/__init__.py b/rare/__init__.py index eeeed592..8a6ddab8 100644 --- a/rare/__init__.py +++ b/rare/__init__.py @@ -36,3 +36,7 @@ if not os.path.exists(data_dir): image_dir = os.path.join(data_dir, "images") if not os.path.exists(image_dir): os.mkdir(image_dir) + +tmp_dir = os.path.join(cache_dir, "tmp") +if not os.path.exists(tmp_dir): + os.makedirs(tmp_dir) diff --git a/rare/app.py b/rare/app.py index 907b47b5..88a57e35 100644 --- a/rare/app.py +++ b/rare/app.py @@ -2,6 +2,7 @@ import configparser import logging import os import platform +import shutil import sys import time import traceback @@ -15,7 +16,7 @@ import legendary # noinspection PyUnresolvedReferences import rare.resources.resources import rare.shared as shared -from rare import cache_dir, resources_path +from rare import cache_dir, resources_path, tmp_dir from rare.components.dialogs.launch_dialog import LaunchDialog from rare.components.main_window import MainWindow from rare.components.tray_icon import TrayIcon @@ -245,6 +246,9 @@ class App(QApplication): if self.tray_icon is not None: self.tray_icon.deleteLater() self.processEvents() + shutil.rmtree(tmp_dir) + os.makedirs(tmp_dir) + self.exit(exit_code) diff --git a/rare/components/tabs/shop/game_info.py b/rare/components/tabs/shop/game_info.py index 51d777de..d678d8ee 100644 --- a/rare/components/tabs/shop/game_info.py +++ b/rare/components/tabs/shop/game_info.py @@ -133,7 +133,7 @@ class ShopGameInfo(QWidget, Ui_shop_info): "VaultClosed", "ProductLogo", ]: - self.image.update_image(img["url"], size=(240, 320)) + self.image.update_image(img["url"], self.title_str, size=(240, 320)) self.image_stack.setCurrentIndex(0) break else: diff --git a/rare/utils/extra_widgets.py b/rare/utils/extra_widgets.py index e97e2077..d894b806 100644 --- a/rare/utils/extra_widgets.py +++ b/rare/utils/extra_widgets.py @@ -33,7 +33,7 @@ from PyQt5.QtWidgets import ( QFileIconProvider, ) -from rare import cache_dir +from rare import tmp_dir from rare.utils.qt_requests import QtRequestManager from rare.utils.utils import icon as qta_icon @@ -473,7 +473,7 @@ class ImageLabel(QLabel): def __init__(self): super(ImageLabel, self).__init__() - self.path = cache_dir + self.path = tmp_dir self.manager = QtRequestManager("bytes") def update_image(self, url, name="", size: tuple = (240, 320)): @@ -491,6 +491,7 @@ class ImageLabel(QLabel): self.manager.get(url, self.image_ready) # self.request.finished.connect(self.image_ready) else: + print("image exists") self.show_image() def image_ready(self, data): @@ -507,6 +508,8 @@ class ImageLabel(QLabel): transformMode=Qt.SmoothTransformation, ) + image.save(os.path.join(self.path, self.name)) + pixmap = QPixmap().fromImage(image) self.setPixmap(pixmap)