Merge pull request #2 from scottjsh/dev

Fix table display view & Fix encoding error

main.py

@@ -1,5 +1,6 @@
+#*-* coding: utf-8 *-*
 import win32gui
-import pywintypes
+import pywintypes # fix win32gui dll error
 import asyncio
 import os
 import socket
@@ -36,6 +37,7 @@
 from src.table import Table
 from src.websocket import Ws
 from src.os import get_os
+from src.get_title import get_title
 
 from src.account_manager.account_manager import AccountManager
 from src.account_manager.account_config import AccountConfig
@@ -49,31 +51,46 @@
 
 server = ""
 
-# os.system("mode con cols=200 lines=50")
-
-# import pygetwindow
-# win = pygetwindow.getWindowsWithTitle(title_with_version)[0]
-# win.size = (1536, 864)
+try:
+    Logging = Logging()
+    log = Logging.log
+except Exception as e:
+    print("Failed to initialize logger!")
+    print(e)
+    input("press enter to exit...\n")
+    os._exit(1)
 
+# solve table display issue
 os_string = get_os()
 if "Windows 10" in os_string:
     os.system("mode con cols=200 lines=50")
 elif "Windows 11" in os_string:
     try:
         hwnd = win32gui.FindWindow(None, title_with_version)
         x0, y0, x1, y1 = win32gui.GetWindowRect(hwnd)
-        win32gui.MoveWindow(hwnd, x0, y0, x0+1536, y0+864, True)
-    except:
-        print("Do not run with administrator privileges.")
-        input("press enter to exit...\n")
-        os._exit(1)
+        win32gui.MoveWindow(hwnd, x0, y0, x0+1286, y0+654, True)
+    except Exception as check_admin:
+        try:
+            hwnd = win32gui.FindWindow(None, "관리자:  " + title_with_version)
+            x0, y0, x1, y1 = win32gui.GetWindowRect(hwnd)
+            win32gui.MoveWindow(hwnd, x0, y0, x0+1286, y0+654, True)
+        except Exception as check_korean:
+            try:
+                hwnd = win32gui.FindWindow(None, "Administrator:  " + title_with_version)
+                x0, y0, x1, y1 = win32gui.GetWindowRect(hwnd)
+                win32gui.MoveWindow(hwnd, x0, y0, x0+1286, y0+654, True)
+            except Exception as check_english:
+                log(f"Failed to resize window: {check_admin}\n{check_korean}\n{check_english}\n\nAll title name: {get_title()}")
+                print("Do not run with administrative privilege.\nUnless please contact to scottjsh@whitesky.kr with log files.")
+                input("press enter to exit...\n")
+                os._exit(1)
 else:
     print("This tool only supports Windows 10, Windows 11.")
     input("press enter to exit...\n")
     os._exit(1)
 
 
-def program_exit(status: int):  # so we don't need to import the entire sys module
+def program_exit(status: int):
     log(f"exited program with error code {status}")
     raise sys.exit(status)
 
@@ -93,9 +110,6 @@ def get_ip():
 
 
 try:
-    Logging = Logging()
-    log = Logging.log
-
     # OS Logging
     log(f"Operating system: {get_os()}\n")
 

setup.py

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 import sys
 from cx_Freeze import setup, Executable
 from src.constants import version

src/Loadouts.py

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 import time
 import requests
 from colr import color

src/account_manager/account_auth.py

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 import requests
 import time
 import re

src/account_manager/account_config.py

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 import yaml
 import json
 import os

src/account_manager/account_manager.py

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 import InquirerPy
 import subprocess
 import re

src/chatlogs.py

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 import glob
 import os
 import time
@@ -22,12 +23,12 @@ def chatLog(self, stringToLog: str):
         if self.chatFileOpened:
             with open(f"chat_logs/chat_log-{max(filenames)}.txt", "a") as logFile:
                 logFile.write(
-                    f"{self.escape_ansi(stringToLog.encode('ascii', 'replace').decode())}\n")
+                    f"{self.escape_ansi(stringToLog.encode('utf-8', 'replace').decode())}\n")
         else:
             with open(f"chat_logs/chat_log-{max(filenames) + 1}.txt", "w") as logFile:
                 self.chatFileOpened = True
                 logFile.write(
-                    f"{self.escape_ansi(stringToLog.encode('ascii', 'replace').decode())}\n")
+                    f"{self.escape_ansi(stringToLog.encode('utf-8', 'replace').decode())}\n")
 
     def escape_ansi(self, line):
         ansi_escape = re.compile(r'(?:\x1B[@-_]|[\x80-\x9F])[0-?]*[ -/]*[@-~]')

src/colors.py

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 from colr import color
 from src.constants import tierDict
 import re

src/config.py

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 import json
 from io import TextIOWrapper
 from json import JSONDecodeError

src/configurator.py

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 import json
 import os
 

src/constants.py

@@ -1,7 +1,8 @@
+# -*- coding: utf-8 -*-
 import requests
 from colr import color
 
-version = "4.61"
+version = "4.65"
 enablePrivateLogging = True
 hide_names = True
 hide_levels = True

src/content.py

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 import requests
 
 

src/errors.py

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 import socket
 import os.path
 import time

src/experimental.py

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 import requests
 
 

src/get_title.py

@@ -0,0 +1,21 @@
+# -*- coding: utf-8 -*-
+import win32gui
+
+output = []
+
+def callback(hwnd, strings):
+    if win32gui.IsWindowVisible(hwnd):
+        window_title = win32gui.GetWindowText(hwnd)
+        left, top, right, bottom = win32gui.GetWindowRect(hwnd)
+        if window_title and right-left and bottom-top:
+            strings.append('0x{:08x}: "{}"'.format(hwnd, window_title))
+    return True
+
+def get_title():
+    win_list = []  # list of strings containing win handles and window titles
+    win32gui.EnumWindows(callback, win_list)  # populate list
+
+    for window in win_list:  # print results
+        output.append(window)
+
+    return output

src/logs.py

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 import glob
 import os
 import time
@@ -34,4 +35,4 @@ def log(self, log_string: str):
             current_time = time.strftime(
                 "%Y.%m.%d-%H.%M.%S", time.localtime(time.time()))
             log_file.write(
-                f"[{current_time}] {log_string.encode('ascii', 'replace').decode()}\n")
+                f"[{current_time}] {log_string.encode('utf-8', 'replace').decode()}\n")

src/names.py

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 import requests
 
 

src/os.py

@@ -1,9 +1,7 @@
+# -*- coding: utf-8 -*-
 import platform
 import sys
 
-# This function detects the OS the user is running and if Valorant is officially supported in said platform
-# returns ["operating system" (string), "Runs Valorant" (bool)]
-
 
 def get_os():
     # Handles Windows operating systems

src/player_stats.py

@@ -1,4 +1,4 @@
-
+# -*- coding: utf-8 -*-
 class PlayerStats:
     def __init__(self, Requests, log, config):
         self.Requests = Requests

src/presences.py

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 import base64
 import json
 import time
@@ -19,9 +20,6 @@ def get_game_state(self, presences):
     def get_private_presence(self, presences):
         for presence in presences:
             if presence['puuid'] == self.Requests.puuid:
-                # preventing VAS from crashing when lol is open
-                # print(presence)
-                # print(presence.get("championId"))
                 if presence.get("championId") is not None or presence.get("product") == "league_of_legends":
                     return None
                 else:

src/questions.py

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 from InquirerPy.base.control import Choice
 from src.constants import DEFAULT_CONFIG, WEAPONS
 

src/rank.py

@@ -1,4 +1,4 @@
-
+# -*- coding: utf-8 -*-
 class Rank:
     def __init__(self, Requests, log, content, ranks_before):
         self.Requests = Requests

src/requestsV.py

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 import base64
 import json
 import time
@@ -50,16 +51,6 @@ def check_version(version, copy_run_update_script):
             print(f"New version available! {link}")
             input("press enter to exit...\n")
             os._exit(1)
-            # if sys.argv[0][-3:] == "exe":
-            #     while True:
-            #         update_now = input("Do you want to update now? (Y/n): ")
-            #         if update_now.lower() == "n" or update_now.lower() == "no":
-            #             return
-            #         elif update_now.lower() == "y" or update_now.lower() == "yes" or update_now == "":
-            #             copy_run_update_script(link)
-            #             os._exit(1)
-            #         else:
-            #             print('Invalid input please response with "yes" or "no" ("y", "n") or press enter to update')
 
     @staticmethod
     def copy_run_update_script(link):

src/rpc.py

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 from pypresence import Presence
 from pypresence.exceptions import DiscordNotFound, InvalidID
 import nest_asyncio

src/server.py

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 import json
 import logging
 from websocket_server import WebsocketServer

src/states/coregame.py

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 import time
 
 

src/states/menu.py

@@ -1,4 +1,4 @@
-
+# -*- coding: utf-8 -*-
 
 class Menu:
     def __init__(self, Requests, log, presences):

src/states/pregame.py

@@ -1,4 +1,4 @@
-
+# -*- coding: utf-8 -*-
 
 class Pregame:
     def __init__(self, Requests, log):

src/stats.py

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 import os
 import time
 import json

src/table.py

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 from typing import Literal, get_args
 
 # from prettytable import PrettyTable

src/websocket.py

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 import re
 import websockets
 import websockets.client