csd4ni3l/siege-calendar
1
0
Fork 0
mirror of https://github.com/csd4ni3l/siege-calendar.git synced 2026-01-01 04:23:47 +01:00
Code Issues Packages Projects Releases 1 Wiki Activity

Remove slow printing, fix hour goals

Browse Source
This commit is contained in:
csd4ni3l
2025-09-07 21:45:56 +02:00
parent 389b51308d
commit a49b2f2050
2 changed files with 31 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
app/cli.py
View File

@@ -1,4 +1,4 @@
from utils.utils import slow_print, getchar, is_valid_date, siege_week from utils.utils import getchar, is_valid_date, siege_week
from utils.hackatime import Client from utils.hackatime import Client
from rich.console import Console from rich.console import Console
@@ -35,7 +35,7 @@ class CLI():
selected_option = '' selected_option = ''
while selected_option not in options: while selected_option not in options:
slow_print(text) print(text)
selected_option = self.wait_for_input("Select an option: ") selected_option = self.wait_for_input("Select an option: ")
os.system('cls' if os.name == 'nt' else 'clear') os.system('cls' if os.name == 'nt' else 'clear')
@@ -43,8 +43,8 @@ class CLI():
def render_logo(self): def render_logo(self):
from utils.constants import LOGO_ASCII_ART, PROJECT_INFO from utils.constants import LOGO_ASCII_ART, PROJECT_INFO
slow_print(LOGO_ASCII_ART, 0.01) print(LOGO_ASCII_ART, 0.01)
slow_print(PROJECT_INFO) print(PROJECT_INFO)
def home(self, start=False): def home(self, start=False):
os.system('cls' if os.name == 'nt' else 'clear') os.system('cls' if os.name == 'nt' else 'clear')
@@ -56,17 +56,17 @@ class CLI():
self.command_wait(HOME_SCREEN.format(siege_week=siege_week()), {"q": sys.exit, "t": lambda: self.stats_screen(True), "a": self.stats_screen, "p": self.projects, "g": self.goals, "h": self.shop, "s": self.statistics, "c": self.calendar}) self.command_wait(HOME_SCREEN.format(siege_week=siege_week()), {"q": sys.exit, "t": lambda: self.stats_screen(True), "a": self.stats_screen, "p": self.projects, "g": self.goals, "h": self.shop, "s": self.statistics, "c": self.calendar})
def statistics(self): def statistics(self):
slow_print("Comming Soon!") print("Comming Soon!")
self.wait_for_exit() self.wait_for_exit()
self.home() self.home()
def calendar(self): def calendar(self):
slow_print("Comming Soon!") print("Comming Soon!")
self.wait_for_exit() self.wait_for_exit()
self.home() self.home()
def projects(self): def projects(self):
slow_print("Due to platform limitations, you have to add your projects from Hackatime manually. Sorry about this.") print("Due to platform limitations, you have to add your projects from Hackatime manually. Sorry about this.")
print("Loading Hackatime stats...") print("Loading Hackatime stats...")
data = self.hackatime_client.get_stats() data = self.hackatime_client.get_stats()
@@ -88,7 +88,7 @@ class CLI():
console.print(table) console.print(table)
else: else:
slow_print("You dont have any Siege projects.") print("You dont have any Siege projects.")
self.command_wait("""You can do the following: self.command_wait("""You can do the following:
a - Add project from Hackatime a - Add project from Hackatime
@@ -116,7 +116,7 @@ q - Exit to home""", {"a": self.add_project, "q": self.home, "c": self.create_sh
console.print(table) console.print(table)
else: else:
slow_print("You dont have any Siege projects.") print("You dont have any Siege projects.")
self.wait_for_exit() self.wait_for_exit()
self.projects() self.projects()
return return
@@ -146,13 +146,13 @@ q - Exit to home""", {"a": self.add_project, "q": self.home, "c": self.create_sh
self.data["coffers"] += coffer_amount self.data["coffers"] += coffer_amount
self.save_data() self.save_data()
slow_print(f"Succesfully added ship event to {project_name} on date {ship_date} for {hour_amount} hours and {coffer_amount} coffers!") print(f"Succesfully added ship event to {project_name} on date {ship_date} for {hour_amount} hours and {coffer_amount} coffers!")
self.wait_for_exit() self.wait_for_exit()
self.projects() self.projects()
def add_project(self): def add_project(self):
slow_print("Here are your Hackatime projects starting from September 1th, 2025.") print("Here are your Hackatime projects starting from September 1th, 2025.")
print("Loading Hackatime stats...") print("Loading Hackatime stats...")
data = self.hackatime_client.get_stats() data = self.hackatime_client.get_stats()
@@ -178,7 +178,7 @@ q - Exit to home""", {"a": self.add_project, "q": self.home, "c": self.create_sh
self.data["projects"][project_name] = {"ship_events": [], "total_coffers": 0} self.data["projects"][project_name] = {"ship_events": [], "total_coffers": 0}
self.save_data() self.save_data()
slow_print(f"Project {project_name} succesfully added to Siege projects!") print(f"Project {project_name} succesfully added to Siege projects!")
self.wait_for_exit() self.wait_for_exit()
self.projects() self.projects()
@@ -195,9 +195,9 @@ q - Exit to home""", {"a": self.add_project, "q": self.home, "c": self.create_sh
self.data["coffers"] += int(coffers) self.data["coffers"] += int(coffers)
self.save_data() self.save_data()
slow_print(f"Multiplier: {round(int(coffers) / int(hours), 2)}x") print(f"Multiplier: {round(int(coffers) / int(hours), 2)}x")
slow_print(f"Date: {self.hackatime_client.get_date()}") print(f"Date: {self.hackatime_client.get_date()}")
slow_print(f"You are now the proud owner of {self.data['data']['coffers']} coffers!") print(f"You are now the proud owner of {self.data['data']['coffers']} coffers!")
self.wait_for_exit() self.wait_for_exit()
self.home() self.home()
@@ -250,30 +250,30 @@ q - Exit to home""", {"a": self.add_project, "q": self.home, "c": self.create_sh
os.system('cls' if os.name == 'nt' else 'clear') os.system('cls' if os.name == 'nt' else 'clear')
remaining_days = (date(*map(int, goal_date.split("-"))) - date.today()).days remaining_days = (date(*map(int, goal_date.split("-"))) - date.today()).days
slow_print(f"You have {remaining_days} remaining days of siege to complete this goal!") print(f"You have {remaining_days} remaining days of siege to complete this goal!")
if goal_type == "coffers": if goal_type == "coffers":
if self.data["coffers"] > goal_number: if self.data["coffers"] > goal_number:
slow_print("Goal already completed, skipping...") print("Goal already completed, skipping...")
return return
slow_print(f"You need {goal_number - self.data['data']['coffers']} more coffers to complete this goal!") print(f"You need {goal_number - self.data['data']['coffers']} more coffers to complete this goal!")
elif goal_type == "hours": elif goal_type == "hours":
if stats[3] / 3600 > goal_number: if stats[5] / 3600 > goal_number:
slow_print("Goal already completed, skipping...") print("Goal already completed, skipping...")
return return
difference = goal_number - (stats[5] / 3600) difference = goal_number - (stats[5] / 3600)
daily_average_hours = (stats[7] / 3600) daily_average_hours = (stats[7] / 3600)
slow_print(f"You need {round(difference, 1)} more hours to complete this goal!") print(f"You need {round(difference, 1)} more hours to complete this goal!")
slow_print(f"Your daily average time is {stats[6]}") print(f"Your daily average time is {stats[6]}")
if difference > remaining_days * daily_average_hours: if difference > remaining_days * daily_average_hours:
slow_print(f"If you don't hurry up, you cant complete this goal!\nWith your current daily average, you would complete it in {round(difference / daily_average_hours, 1)} days!") print(f"If you don't hurry up, you cant complete this goal!\nWith your current daily average, you would complete it in {round(difference / daily_average_hours, 1)} days!")
else: else:
slow_print(f"With your daily average time, you can complete this goal this in {round(difference / daily_average_hours, 1)} days!") print(f"With your daily average time, you can complete this goal this in {round(difference / daily_average_hours, 1)} days!")
self.data["goals"][goal_name] = [goal_date, goal_type, goal_number] self.data["goals"][goal_name] = [goal_date, goal_type, goal_number]
self.save_data() self.save_data()
@@ -291,7 +291,7 @@ q - Exit to home""", {"a": self.add_project, "q": self.home, "c": self.create_sh
def shop(self): def shop(self):
from utils.constants import SHOP_SCREEN, shop_items from utils.constants import SHOP_SCREEN, shop_items
slow_print(SHOP_SCREEN) print(SHOP_SCREEN)
console = Console() console = Console()
@@ -339,25 +339,25 @@ q - Exit to home""", {"b": self.buy_item, "q": self.home})
item_id = int(item_id) item_id = int(item_id)
if shop_items[item_id][3] < 1: if shop_items[item_id][3] < 1:
slow_print("There is no stock left for the item.") print("There is no stock left for the item.")
self.wait_for_exit() self.wait_for_exit()
self.shop() self.shop()
return return
if not self.data["coffers"] >= shop_items[item_id][2]: if not self.data["coffers"] >= shop_items[item_id][2]:
slow_print("You don't have enough coffers to buy this item.") print("You don't have enough coffers to buy this item.")
slow_print(f"You need {shop_items[item_id][2] - self.data['coffers']} more coffers!") print(f"You need {shop_items[item_id][2] - self.data['coffers']} more coffers!")
self.wait_for_exit() self.wait_for_exit()
self.shop() self.shop()
return return
slow_print(f"You successfully bought the {shop_items[item_id][0]} item!") print(f"You successfully bought the {shop_items[item_id][0]} item!")
self.data["coffers"] -= shop_items[item_id][2] self.data["coffers"] -= shop_items[item_id][2]
self.data["bought_items"].append(shop_items[item_id][0]) self.data["bought_items"].append(shop_items[item_id][0])
self.save_data() self.save_data()
slow_print(f"You now have {self.data['coffers']} remaining coffers!") print(f"You now have {self.data['coffers']} remaining coffers!")
self.wait_for_exit() self.wait_for_exit()
self.shop() self.shop()

10
utils/utils.py
View File

@@ -1,15 +1,7 @@
import sys, time import sys
from datetime import date, datetime from datetime import date, datetime
def slow_print(text, interval=.03):
for char in text:
sys.stdout.write(char)
sys.stdout.flush()
time.sleep(interval)
sys.stdout.write('\n')
def getchar(): def getchar():
try: try:
import msvcrt import msvcrt