CodeMirror/Rare
1
0
Fork 0
mirror of synced 2024-06-23 08:40:45 +12:00
Code Issues Projects Releases Wiki Activity

Misc: rename get_size to format_size

Browse source
This commit is contained in:
loathingKernel 2023-03-04 20:56:04 +02:00
parent 958de1b3b5
commit e55c40448c
No known key found for this signature in database
GPG key ID: CE0C72D0B53821FD
9 changed files with 23 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
rare/components/dialogs/install_dialog.py
View file

@ -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)

8
rare/components/tabs/downloads/__init__.py
View file

@ -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))

6
rare/components/tabs/downloads/widgets.py
View file

@ -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))

4
rare/components/tabs/games/game_info/game_info.py
View file

@ -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)

6
rare/components/tabs/games/game_info/move_game.py
View file

@ -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)

4
rare/components/tabs/games/game_widgets/list_game_widget.py
View file

@ -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()

4
rare/components/tabs/settings/legendary.py
View file

@ -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:

6
rare/components/tabs/settings/rare.py
View file

@ -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:

2
rare/utils/misc.py
View file

@ -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"