From e55c40448c3f75f9c3b732ae1b322035cf2e9ebb Mon Sep 17 00:00:00 2001 From: loathingKernel <142770+loathingKernel@users.noreply.github.com> Date: Sat, 4 Mar 2023 20:56:04 +0200 Subject: [PATCH] Misc: rename `get_size` to `format_size` --- rare/components/dialogs/install_dialog.py | 6 +++--- rare/components/tabs/downloads/__init__.py | 8 ++++---- rare/components/tabs/downloads/widgets.py | 6 +++--- rare/components/tabs/games/game_info/game_info.py | 4 ++-- rare/components/tabs/games/game_info/move_game.py | 6 +++--- .../tabs/games/game_widgets/list_game_widget.py | 4 ++-- rare/components/tabs/settings/legendary.py | 4 ++-- rare/components/tabs/settings/rare.py | 6 +++--- rare/utils/misc.py | 2 +- 9 files changed, 23 insertions(+), 23 deletions(-) diff --git a/rare/components/dialogs/install_dialog.py b/rare/components/dialogs/install_dialog.py index b31ce1ca..5199095b 100644 --- a/rare/components/dialogs/install_dialog.py +++ b/rare/components/dialogs/install_dialog.py @@ -15,7 +15,7 @@ from rare.shared.workers.install_info import InstallInfoWorker from rare.ui.components.dialogs.install_dialog import Ui_InstallDialog from rare.ui.components.dialogs.install_dialog_advanced import Ui_InstallDialogAdvanced from rare.utils import config_helper -from rare.utils.misc import get_size +from rare.utils.misc import format_size from rare.widgets.collapsible_widget import CollapsibleFrame from rare.widgets.indicator_edit import PathEdit, IndicatorReasonsCommon @@ -290,13 +290,13 @@ class InstallDialog(QDialog): install_size = download.analysis.install_size # install_size = self.dl_item.download.analysis.disk_space_delta if download_size or (not download_size and download.game.is_dlc): - self.ui.download_size_text.setText(get_size(download_size)) + self.ui.download_size_text.setText(format_size(download_size)) self.ui.download_size_text.setStyleSheet("font-style: normal; font-weight: bold") self.ui.install_button.setEnabled(not self.options_changed) else: self.ui.install_size_text.setText(self.tr("Game already installed")) self.ui.install_size_text.setStyleSheet("font-style: italics; font-weight: normal") - self.ui.install_size_text.setText(get_size(install_size)) + self.ui.install_size_text.setText(format_size(install_size)) self.ui.install_size_text.setStyleSheet("font-style: normal; font-weight: bold") self.ui.verify_button.setEnabled(self.options_changed) self.ui.cancel_button.setEnabled(True) diff --git a/rare/components/tabs/downloads/__init__.py b/rare/components/tabs/downloads/__init__.py index ccb64475..ab3b3b35 100644 --- a/rare/components/tabs/downloads/__init__.py +++ b/rare/components/tabs/downloads/__init__.py @@ -19,7 +19,7 @@ from rare.models.install import InstallOptionsModel, InstallQueueItemModel, Unin from rare.shared import RareCore from rare.shared.workers.install_info import InstallInfoWorker from rare.shared.workers.uninstall import UninstallWorker -from rare.utils.misc import get_size +from rare.utils.misc import format_size from rare.utils.paths import create_desktop_link, desktop_links_supported from .download import DownloadWidget from .groups import UpdateGroup, QueueGroup @@ -205,12 +205,12 @@ class DownloadsTab(QWidget): @pyqtSlot(UIUpdate, c_uint64) def __on_download_progress(self, ui_update: UIUpdate, dl_size: c_uint64): self.download_widget.ui.progress_bar.setValue(int(ui_update.progress)) - self.download_widget.ui.dl_speed.setText(f"{get_size(ui_update.download_compressed_speed)}/s") + self.download_widget.ui.dl_speed.setText(f"{format_size(ui_update.download_compressed_speed)}/s") self.download_widget.ui.cache_used.setText( - f"{get_size(ui_update.cache_usage) if ui_update.cache_usage > 1023 else '0KB'}" + f"{format_size(ui_update.cache_usage) if ui_update.cache_usage > 1023 else '0KB'}" ) self.download_widget.ui.downloaded.setText( - f"{get_size(ui_update.total_downloaded)} / {get_size(dl_size.value)}" + f"{format_size(ui_update.total_downloaded)} / {format_size(dl_size.value)}" ) self.download_widget.ui.time_left.setText(get_time(ui_update.estimated_time_left)) diff --git a/rare/components/tabs/downloads/widgets.py b/rare/components/tabs/downloads/widgets.py index a0d2d43d..a7f8e97a 100644 --- a/rare/components/tabs/downloads/widgets.py +++ b/rare/components/tabs/downloads/widgets.py @@ -12,7 +12,7 @@ from rare.shared import RareCore, ImageManagerSingleton from rare.shared.workers.install_info import InstallInfoWorker from rare.ui.components.tabs.downloads.queue_base_widget import Ui_QueueBaseWidget from rare.ui.components.tabs.downloads.queue_info_widget import Ui_QueueInfoWidget -from rare.utils.misc import get_size, widget_object_name, elide_text +from rare.utils.misc import format_size, widget_object_name, elide_text from rare.widgets.image_widget import ImageWidget, ImageSize logger = getLogger("DownloadWidgets") @@ -58,8 +58,8 @@ class QueueInfoWidget(QWidget): elide_text(self.ui.remote_version, old_igame.version if old_igame else game.app_version(igame.platform)) ) self.ui.local_version.setText(elide_text(self.ui.local_version, igame.version)) - self.ui.dl_size.setText(get_size(analysis.dl_size) if analysis else "") - self.ui.install_size.setText(get_size(analysis.install_size) if analysis else "") + self.ui.dl_size.setText(format_size(analysis.dl_size) if analysis else "") + self.ui.install_size.setText(format_size(analysis.install_size) if analysis else "") self.image.setPixmap(self.image_manager.get_pixmap(game.app_name, color=True)) diff --git a/rare/components/tabs/games/game_info/game_info.py b/rare/components/tabs/games/game_info/game_info.py index c41a52a6..4ed14c43 100644 --- a/rare/components/tabs/games/game_info/game_info.py +++ b/rare/components/tabs/games/game_info/game_info.py @@ -21,7 +21,7 @@ from rare.shared import RareCore from rare.shared.image_manager import ImageSize from rare.shared.workers import VerifyWorker, MoveWorker from rare.ui.components.tabs.games.game_info.game_info import Ui_GameInfo -from rare.utils.misc import get_size +from rare.utils.misc import format_size from rare.widgets.image_widget import ImageWidget from rare.widgets.side_tab import SideTabContents from .move_game import MoveGamePopUp, is_game_dir @@ -248,7 +248,7 @@ class GameInfo(QWidget, SideTabContents): self.ui.lbl_install_size.setEnabled(self.rgame.is_installed and not self.rgame.is_non_asset) self.ui.install_size.setEnabled(self.rgame.is_installed and not self.rgame.is_non_asset) self.ui.install_size.setText( - get_size(self.rgame.igame.install_size) if self.rgame.is_installed and not self.rgame.is_non_asset else "N/A" + format_size(self.rgame.igame.install_size) if self.rgame.is_installed and not self.rgame.is_non_asset else "N/A" ) self.ui.lbl_install_path.setEnabled(self.rgame.is_installed and not self.rgame.is_non_asset) diff --git a/rare/components/tabs/games/game_info/move_game.py b/rare/components/tabs/games/game_info/move_game.py index 53b200e8..4143b8a4 100644 --- a/rare/components/tabs/games/game_info/move_game.py +++ b/rare/components/tabs/games/game_info/move_game.py @@ -9,7 +9,7 @@ from PyQt5.QtWidgets import QWidget, QVBoxLayout, QHBoxLayout, QPushButton, QLab from rare.models.game import RareGame from rare.shared import RareCore -from rare.utils.misc import get_size +from rare.utils.misc import format_size from rare.widgets.elide_label import ElideLabel from rare.widgets.indicator_edit import PathEdit, IndicatorReasons, IndicatorReasonsCommon @@ -112,8 +112,8 @@ class MoveGamePopUp(QWidget): # Calculate from bytes to gigabytes # free_space = round(free_space / 1000 ** 3, 2) # source_size = round(source_size / 1000 ** 3, 2) - self.req_space.setText(get_size(source_size)) - self.avail_space.setText(get_size(free_space)) + self.req_space.setText(format_size(source_size)) + self.avail_space.setText(format_size(free_space)) if not os.access(path, os.W_OK) or not os.access(self.rgame.install_path, os.W_OK): return helper_func(MovePathEditReasons.NO_WRITE_PERM) diff --git a/rare/components/tabs/games/game_widgets/list_game_widget.py b/rare/components/tabs/games/game_widgets/list_game_widget.py index 59d59de2..ecce5aa9 100644 --- a/rare/components/tabs/games/game_widgets/list_game_widget.py +++ b/rare/components/tabs/games/game_widgets/list_game_widget.py @@ -13,7 +13,7 @@ from PyQt5.QtGui import ( ) from rare.models.game import RareGame -from rare.utils.misc import get_size +from rare.utils.misc import format_size from rare.widgets.image_widget import ImageWidget from .game_widget import GameWidget from .list_widget import ListWidget @@ -43,7 +43,7 @@ class ListGameWidget(GameWidget): # self.version_label.setVisible(self.is_installed) if self.rgame.igame: self.ui.version_label.setText(self.rgame.version) - self.ui.size_label.setText(get_size(self.rgame.install_size) if self.rgame.install_size else "") + self.ui.size_label.setText(format_size(self.rgame.install_size) if self.rgame.install_size else "") self.update_state() diff --git a/rare/components/tabs/settings/legendary.py b/rare/components/tabs/settings/legendary.py index cbf68dc0..1c4b7699 100644 --- a/rare/components/tabs/settings/legendary.py +++ b/rare/components/tabs/settings/legendary.py @@ -9,7 +9,7 @@ from PyQt5.QtWidgets import QSizePolicy, QWidget, QFileDialog, QMessageBox from rare.shared import LegendaryCoreSingleton from rare.shared.workers.worker import Worker from rare.ui.components.tabs.settings.legendary import Ui_LegendarySettings -from rare.utils.misc import get_size +from rare.utils.misc import format_size from rare.widgets.indicator_edit import PathEdit, IndicatorLineEdit, IndicatorReasonsCommon logger = getLogger("LegendarySettings") @@ -183,7 +183,7 @@ class LegendarySettings(QWidget, Ui_LegendarySettings): self, "Cleanup", self.tr("Cleanup complete! Successfully removed {}").format( - get_size(before - after) + format_size(before - after) ), ) else: diff --git a/rare/components/tabs/settings/rare.py b/rare/components/tabs/settings/rare.py index 230349c2..bd276bad 100644 --- a/rare/components/tabs/settings/rare.py +++ b/rare/components/tabs/settings/rare.py @@ -16,7 +16,7 @@ from rare.utils.misc import ( set_color_pallete, get_style_sheets, set_style_sheet, - get_size, + format_size, ) from rare.utils.paths import create_desktop_link, desktop_link_path, log_dir, desktop_links_supported @@ -141,7 +141,7 @@ class RareSettings(QWidget, Ui_RareSettings): for f in log_dir().iterdir() if log_dir().joinpath(f).is_file() ) - self.log_dir_size_label.setText(get_size(size)) + self.log_dir_size_label.setText(format_size(size)) # self.log_dir_clean_button.setVisible(False) # self.log_dir_size_label.setVisible(False) @@ -157,7 +157,7 @@ class RareSettings(QWidget, Ui_RareSettings): for f in log_dir().iterdir() if log_dir().joinpath(f).is_file() ) - self.log_dir_size_label.setText(get_size(size)) + self.log_dir_size_label.setText(format_size(size)) def create_start_menu_link(self): try: diff --git a/rare/utils/misc.py b/rare/utils/misc.py index 6d2b53b4..8516f946 100644 --- a/rare/utils/misc.py +++ b/rare/utils/misc.py @@ -159,7 +159,7 @@ def get_latest_version(): return "0.0.0" -def get_size(b: Union[int, float]) -> str: +def format_size(b: Union[int, float]) -> str: for s in ["", "Ki", "Mi", "Gi", "Ti", "Pi", "Ei"]: if b < 1024: return f"{b:.2f} {s}B"