1.55 hopefully final

Author: Enderbyte09

.gitignore

@@ -9,4 +9,5 @@ dist/
 installer
 lib/__pycache__/
 output/
-src/__pycache__/
+src/__pycache__/
+tach.toml

README.md

@@ -68,6 +68,10 @@ echo "Installation finished with no errors."
 
 ATTENTION - If you use an old version of this software, it might ask you for a "product key." This system has been retired, so it may confuse you. Please paste the code `4p6jgtnatqj5svb4` if it asks you for one.
 
+### Telemetry and Data sharing
+
+In order to catch more bugs, v1.55 introduces opt-in telemetry that will transmit crash logs to Enderbyte Programs. This is in an effort to find more bugs and issues. You will be prompted to select a telemetry level on your first startup after updating. To opt in to sending crash reports, please select level 2 or 3 for telemetry. If you would not like to, please select level 1 or 0. You may change the telemetry level at any time by going to Settings -> Telemetry level.
+
 ## Integrating Third Party Software
 
 If you would like to make your application work with CRSS, here is how to do so

assets/control

@@ -1,5 +1,5 @@
 Package: craftserversetup
-Version: 1.54.9
+Version: 1.55
 Maintainer: Enderbyte Programs <enderbyte09@gmail.com>
 Homepage: https://github.com/Enderbyte-Programs/CraftServerSetup
 Architecture: all

src/chatutils.py

@@ -10,8 +10,10 @@
 import logutils
 import dirstack
 import utils
+import telemetry
 
 def who_said_what(stdscr,serverdir):
+    telemetry.telemetric_action("chatutils")
     if uicomponents.resource_warning(stdscr):
         return
     renaminghandler.autoupdate_cache(stdscr,serverdir)

src/eptel.py

@@ -46,10 +46,10 @@ def send_action(actionname:str) -> None:
 def send_crash(ex:Exception) -> None:
 
     #Process exception
-    tb = traceback.format_exception(ex)
+    tb = "\n".join(traceback.format_exception(ex))
 
     try:
-        threading.Thread(target=_send,args=[Constants.ACTION_REPORT_ENDPOINT,{
+        threading.Thread(target=_send,args=[Constants.CRASH_REPORT_ENDPOINT,{
             "version" : 1,#EPTEL request format v1
             "payload" : {
                 "productname" : Constants.product_name,

src/main.py

@@ -25,7 +25,6 @@
 import random                   #Random number generation
 import traceback                #Error management
 import webbrowser               #Open links like the bug link
-import tarfile                  #Create archives
 import gzip                     #Compression utilities
 import time                     #Timezone data
 import copy                     #Object copies
@@ -241,13 +240,11 @@ def error_handling(e:Exception,message="A serious error has occured"):
     _SCREEN.clear()
     _SCREEN.nodelay(0)
     _SCREEN.bkgd(cursesplus.set_colour(cursesplus.BLUE,cursesplus.WHITE))
-    #cursesplus.messagebox.showerror(_SCREEN,[
-    #    "o3   /      We are sorry, but a serious error occured     ",
-    #    "   - |      In the next menu, you will choose some options",
-    #    "o3   \\     You should probably report this as a bug       "
-    #])
+
+    telemetry.crash_report(e)
+
     while True:
-        erz = cursesplus.optionmenu(_SCREEN,["Exit Program","View Error info","Return to main menu","Advanced options","Report bug on GitHub"],f"{message}. What do you want to do?")
+        erz = cursesplus.optionmenu(_SCREEN,["Exit Program","View Error info","Return to main menu","Advanced options","Report bug on GitHub"],f":( {message}. What do you want to do?")
         if erz == 0:
             safe_exit(1)
         elif erz == 1:
@@ -302,16 +299,16 @@ def safe_error_handling(e:Exception):
     raw =  f"TYPE: {type(e)}"+"\n"+f"MESSAGE: {str(e)[0:os.get_terminal_size()[0]-1]}"+"\n"+traceback.format_exc()
     #splitext = textwrap.wrap(raw,_SCREEN.getmaxyx()[1]-1)
     splitext = raw.splitlines()
+
+    telemetry.crash_report(e)
+
     while True:
         _SCREEN.clear()
         my,mx = _SCREEN.getmaxyx()
-        cursesplus.utils.fill_line(_SCREEN,0,cursesplus.set_colour(cursesplus.RED,cursesplus.WHITE))
-        cursesplus.utils.fill_line(_SCREEN,1,cursesplus.set_colour(cursesplus.RED,cursesplus.WHITE))
-        cursesplus.utils.fill_line(_SCREEN,2,cursesplus.set_colour(cursesplus.RED,cursesplus.WHITE))
         _SCREEN.addstr(3,0,"─"*(mx-1))
-        _SCREEN.addstr(0,0,"A fatal error has occured in CraftServerSetup. Info is listed below.",cursesplus.set_colour(cursesplus.RED,cursesplus.WHITE))
-        _SCREEN.addstr(1,0,"Press C to return to the main menu.",cursesplus.set_colour(cursesplus.RED,cursesplus.WHITE))
-        _SCREEN.addstr(2,0,"Press R to open a bug report on Github. Include information listed below.",cursesplus.set_colour(cursesplus.RED,cursesplus.WHITE))
+        _SCREEN.addstr(0,0,":( A fatal error has occured in CraftServerSetup. Info is listed below.",cursesplus.set_colour(cursesplus.BLUE,cursesplus.WHITE))
+        _SCREEN.addstr(1,0,">>> Press C to return to the main menu.",cursesplus.set_colour(cursesplus.BLUE,cursesplus.WHITE))
+        _SCREEN.addstr(2,0,">>> Press R to open a bug report on Github. Include information listed below.",cursesplus.set_colour(cursesplus.BLUE,cursesplus.WHITE))
         ey = 3
         for eline in splitext:
             ey += 1
@@ -2068,6 +2065,7 @@ def formattediplist_getindexbyip(search:str,haystack:list[FormattedIP]):
     return None
 
 def ip_lookup(stdscr,serverdir):
+    telemetry.telemetric_action("iplookup")
     if uicomponents.resource_warning(stdscr):
         return
     renaminghandler.autoupdate_cache(stdscr,serverdir)
@@ -2508,7 +2506,7 @@ def write(path:str,data:dict) -> None:
             f.write(gzip.compress(json.dumps(data).encode()))
 
 def sanalytics(stdscr,serverdir):
-    
+    telemetry.telemetric_action("analytics")
     if uicomponents.resource_warning(stdscr):
         return
     renaminghandler.autoupdate_cache(stdscr,serverdir)
@@ -3287,6 +3285,7 @@ def create_uuid_index(stdscr) -> None:
     appdata.updateappdata() 
 
 def playerstat(stdscr,serverdir):
+    telemetry.telemetric_action("playerstat")
     worlds = find_world_folders(serverdir)
     selworld = uicomponents.menu(stdscr,["Cancel"]+worlds,"Choose a world to search statistics for")
     if selworld == 0:
@@ -4120,6 +4119,11 @@ def main(stdscr):
         threading.Thread(target=internet_thread,args=(stdscr,)).start()
         appdata.setup_appdata()
         #Telemetry demands special startup
+
+        if appdata.APPDATA["telemetry"]["level"] == -1:
+            cursesplus.messagebox.showinfo(stdscr,["On the next screen, you will be prompted to","choose a telemetry level ","(how much data is sent to Enderbyte Programs)"])
+            telemetry.set_telemetry_level(stdscr,False)
+
         eptel.startup(appdata.APPDATA["telemetry"]["telkey"],"CraftServerSetup",APP_UF_VERSION)
         telemetry.telemetric_action("startup")
 

src/renaminghandler.py

@@ -1,3 +1,5 @@
+"""Handle players renaming themselves"""
+
 import appdata
 import os
 import datetime
@@ -8,6 +10,7 @@
 import re
 import cursesplus
 import uicomponents
+import telemetry
 
 NAMECHANGETRACKFILE = appdata.APPDATADIR + os.sep + "playeraliases.json"
 nctf_template = {
@@ -90,6 +93,7 @@ def autoupdate_cache(stdscr,serverdir):
     update_cache_custom(stdscr,logloader.load_logs(stdscr,serverdir,logfilters.player_rename,lastupdatetime))
 
 def player_naming_history(stdscr):
+    telemetry.telemetric_action("renhan")
     srch = uicomponents.crssinput(stdscr,"What player do you want to learn about?").lower()
     if not has_known_aliases(srch):
         cursesplus.messagebox.askyesno(stdscr,["This player has no known former names"])

src/telemetry.py

@@ -16,7 +16,10 @@ class TelemetryLevels(enum.Enum):
 
 
 def get_telemetry_level() -> int:
-    return appdata.APPDATA["telemetry"]["level"]
+    try:
+        return appdata.APPDATA["telemetry"]["level"]
+    except:
+        return 2#It's got to be contingent
 
 def telemetric_action(actionname:str):
 
@@ -29,23 +32,40 @@ def telemetric_action(actionname:str):
         #Send everything with COMPREHENSIVE
 
 def crash_report(ex:Exception):
+
     if get_telemetry_level() >= 2:
         eptel.send_crash(ex)
 
-def set_telemetry_level(stdscr) -> None:
+def set_telemetry_level(stdscr,cancellable = True) -> None:
     """Show the user a screen to select their telemetry level, and set this telemetry level"""
-    op = uicomponents.menu(stdscr,["Cancel","0 - Nothing","1 - Basic Only","2 - Crash reports","3 - Comprehensive"],f"Please choose a telemetry level. Current level is: {get_telemetry_level()}",peroptionfooters=[
-        "Do not change the telemetry level",
-        "Send no telemetry whatsoever",
-        "Send only a single 'installation exists' telemetry event",
-        "Basic + send error details if a crash occurs",
-        "Send comprehensive usage statistics"
-    ],preselected=3)
-
-    if op == 0:
-        return
-    
-    appdata.APPDATA["telemetry"]["level"] = op - 1
+
+    if cancellable:
+        op = uicomponents.menu(stdscr,["Cancel","0 - Nothing","1 - Basic Only","2 - Crash reports","3 - Comprehensive"],f"Please choose a telemetry level. Current level is: {get_telemetry_level()}",peroptionfooters=[
+            "Do not change the telemetry level",
+            "Send no telemetry whatsoever",
+            "Send only a single 'installation exists' telemetry event",
+            "Basic + send error details if a crash occurs",
+            "Send comprehensive usage statistics"
+        ],preselected=3)
+
+        if op == 0:
+            return
+        
+        appdata.APPDATA["telemetry"]["level"] = op - 1
+
+    else:
+        op = uicomponents.menu(stdscr,["0 - Nothing","1 - Basic Only","2 - Crash reports","3 - Comprehensive"],f"Please choose a telemetry level.",peroptionfooters=[
+            "Send no telemetry whatsoever",
+            "Send only a single 'installation exists' telemetry event",
+            "Basic + send error details if a crash occurs",
+            "Send comprehensive usage statistics"
+        ],preselected=2)
+
+        if op == 0:
+            return
+        
+        appdata.APPDATA["telemetry"]["level"] = op
+
     appdata.updateappdata()
 
     cursesplus.messagebox.showinfo(stdscr,["Telemetry level updated successfully."])

src/usersettings.py

@@ -11,11 +11,13 @@
 import staticflags
 import backups
 import javamanager
+import telemetry
 
 def manage_user_settings(stdscr):
+    telemetry.telemetric_action("settings")
 
     while True:
-        m = uicomponents.menu(stdscr,["BACK","ADVANCED OPTIONS","MANAGE JAVA INSTALLATIONS","CHANGE LANGUAGE","BACKUP PROFILES"]+[d["display"] + " : " + str(d["value"]) for d in list(appdata.APPDATA["settings"].values())],"Please choose a setting to modify")
+        m = uicomponents.menu(stdscr,["BACK","ADVANCED OPTIONS","Java Installations","Change Language","Manage Backup Profiles","Telemetry Level"]+[d["display"] + " : " + str(d["value"]) for d in list(appdata.APPDATA["settings"].values())],"Please choose a setting to modify")
         if m == 0:
             appdata.updateappdata()
             return
@@ -47,9 +49,11 @@ def manage_user_settings(stdscr):
             cursesplus.displaymsg(stdscr,["Craft Server Setup"],False)
         elif m == 4:
             backups.backup_manager(stdscr)
+        elif m == 5:
+            telemetry.set_telemetry_level(stdscr)
         else:
-            selm = list(appdata.APPDATA["settings"].values())[m-5]
-            selk = list(appdata.APPDATA["settings"].keys())[m-5]
+            selm = list(appdata.APPDATA["settings"].values())[m-6]
+            selk = list(appdata.APPDATA["settings"].keys())[m-6]
             if selm["type"] == "bool":
                 selm["value"] = uicomponents.menu(stdscr,["True (Yes)","False (No)"],f"New value for {selm['display']}") == 0
             elif selm["type"] == "int":