1.55.2

Author: Enderbyte09

assets/control

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

changelog

@@ -1,3 +1,9 @@
+1.55.2:
+- Make log loader use datetimes again instead of dates, fixing a bug in server analytics (nasty nasty bug...)
+- Fix serveral bugs in the analytics loader that occur if your cache has 100% coverage
+- Split out analytics system
+- Fix bug where program would crash if started with no internet connection
+- Fix bug where cancelling a package server operation would cause a crash
 1.55.1:
 - Fix OOBE order
 1.55:

scripts/crss-wine.iss

@@ -2,7 +2,7 @@
 
 
 
-#define MyAppVersion "1.55"
+#define MyAppVersion "1.55.2"
 ;The above line must be on line 5!
 
 
@@ -39,7 +39,7 @@ OutputDir=C:\python\crss\installer
 
 
 
-OutputBaseFilename=CraftServerSetup-1.55-installer
+OutputBaseFilename=CraftServerSetup-1.55.2-installer
 ;The above line MUST be on line 42
 
 

scripts/vf.txt

@@ -7,8 +7,8 @@ VSVersionInfo(
   ffi=FixedFileInfo(
     # filevers and prodvers should be always a tuple with four items: (1, 2, 3, 4)
     # Set not needed items to zero 0. Must always contain 4 elements.
-    filevers=(1,55,0,0),
-    prodvers=(1,55,0,0),
+    filevers=(1,55,2,0),
+    prodvers=(1,55,2,0),
     # Contains a bitmask that specifies the valid bits 'flags'r
     mask=0x3f,
     # Contains a bitmask that specifies the Boolean attributes of the file.
@@ -32,12 +32,12 @@ VSVersionInfo(
         u'040904B0',
         [StringStruct(u'CompanyName', u'Enderbyte Programs'),
         StringStruct(u'FileDescription', u'Minecraft Server Maker'),
-        StringStruct(u'FileVersion', u'1.55'),
+        StringStruct(u'FileVersion', u'1.55.2'),
         StringStruct(u'InternalName', u'craftserversetup'),
         StringStruct(u'LegalCopyright', u'© 2023-2024 Enderbyte Programs. Some rights reserved.'),
         StringStruct(u'OriginalFilename', u'craftserversetup.exe'),
         StringStruct(u'ProductName', u'CraftServerSetup'),
-        StringStruct(u'ProductVersion', u'1.55')])
+        StringStruct(u'ProductVersion', u'1.55.2')])
       ]), 
     VarFileInfo([VarStruct(u'Translation', [1033, 1200])])
   ]

src/analytics.py

@@ -0,0 +1,170 @@
+"""The analytics explorer, a subset of server analytics that was taken out because the file was still too big"""
+
+import curses
+import cursesplus
+import tempdir
+import jsongz
+import uicomponents
+import analyticsstructures
+import utils
+import enum
+import datetime
+
+def server_analytics_explorer(stdscr,data:dict[int,analyticsstructures.ServerMinuteFrame]):
+    cursesplus.displaymsg(stdscr,["Analytics Explorer","Initializing..."],False)
+    #This function allows users to explore their analytics
+    offset = 0
+    datasize = len(data)-1
+    currentzoomlevel = analyticsstructures.AnalyticsExplorerZoomLevels.MINUTE#Also passively the list chunk size
+    currentdatatype = analyticsstructures.AnalyticsExplorerDataTypes.PLAYERCOUNT
+    zoomlevels = {
+        analyticsstructures.AnalyticsExplorerZoomLevels.MINUTE: "Minute (default)",
+        analyticsstructures.AnalyticsExplorerZoomLevels.HOUR: "Hour",
+        analyticsstructures.AnalyticsExplorerZoomLevels.DAY: "Day",
+        analyticsstructures.AnalyticsExplorerZoomLevels.WEEK: "Week"
+    }
+    datatypes = {
+        analyticsstructures.AnalyticsExplorerDataTypes.TOTALPLAYERMINUTES: "Player Minutes Spent",
+        analyticsstructures.AnalyticsExplorerDataTypes.PLAYERCOUNT: "Online Players (default)"
+    }
+    ldata = list(data.values())#List representation of data to prevent performance issues?
+
+    td = tempdir.generate_temp_dir()
+
+    #ogdata = copy.deepcopy(data)
+    #ogldata = copy.deepcopy(ldata)#For use later
+    jsongz.write(td+"/data.json.gz",{k:analyticsstructures.serialize_smf(v) for k,v in list(data.items())})
+    maxval = max([len(p.onlineplayers) for p in ldata])
+    while True:
+        my,mx = stdscr.getmaxyx()
+        xspace = mx-1
+        yspace = my-4#Top Bottom, and weird bug
+        stdscr.erase()
+        cursesplus.utils.fill_line(stdscr,0,cursesplus.set_colour(cursesplus.BLUE,cursesplus.BLUE))
+        stdscr.addstr(0,0,"Analytics Explorer - Press Q to quit and H for help",cursesplus.set_colour(cursesplus.BLUE,cursesplus.WHITE))
+        
+        
+        ti = 0
+        for i in range(offset-xspace//2,offset+xspace//2):
+            if i < 0 or i > datasize:
+                #Write red bar
+                #print("w")
+                for dy in range(1,yspace+1):
+                    stdscr.addstr(dy,ti,"█",cursesplus.set_colour(cursesplus.RED,cursesplus.RED))
+            else:
+                seldata = ldata[i]
+                if currentdatatype == analyticsstructures.AnalyticsExplorerDataTypes.PLAYERCOUNT:
+                    scale = int(seldata.howmanyonline()/maxval*yspace)
+                else:
+                    scale = int(seldata.getplayerminutes()/maxval*yspace)
+                
+                if i == offset:
+                    for p in range(1,yspace+2):
+                        stdscr.addstr(p,ti,"█",cursesplus.set_colour(cursesplus.GREEN,cursesplus.GREEN))#Central marker
+                    for p in range(yspace+1,yspace+1-scale,-1):
+                        stdscr.addstr(p,ti,"█",cursesplus.set_colour(cursesplus.CYAN,cursesplus.CYAN))
+                else:
+                    for p in range(yspace+1,yspace+1-scale,-1):
+                        stdscr.addstr(p,ti,"█",cursesplus.set_colour(cursesplus.WHITE,cursesplus.WHITE))
+            
+            ti += 1
+            
+        seldata = ldata[offset]
+        if currentdatatype == analyticsstructures.AnalyticsExplorerDataTypes.TOTALPLAYERMINUTES:
+            stdscr.addstr(my-2,0,f"{utils.strip_datetime(analyticsstructures.get_datetime_from_minute_id(seldata.minuteid))} || {seldata.getplayerminutes()} player-minutes")
+        else:
+            try:
+                stdscr.addstr(my-2,0,f"{utils.strip_datetime(analyticsstructures.get_datetime_from_minute_id(seldata.minuteid))} || {seldata.howmanyonline()} players online - {seldata.onlineplayers}")
+            except:
+                stdscr.addstr(my-2,0,f"{utils.strip_datetime(analyticsstructures.get_datetime_from_minute_id(seldata.minuteid))} || {seldata.howmanyonline()} players online")#Too long for list
+        
+        ch = curses.keyname(stdscr.getch()).decode()
+        if ch == "q":
+            break
+        elif ch == "h":
+            cursesplus.displaymsg(stdscr,["KEYBINDS","q - Quit","h - Help","<- -> Scroll","END - Go to end","HOME - Go to beginning","j - Jump to time","SHIFT <-- --> - Jump hour","Ctrl <-- --> - Jump day","T - Select time unit","D - Select data type"])
+        elif ch == "KEY_LEFT":
+            if offset > 0:
+                offset -= 1
+        elif ch == "KEY_RIGHT":
+            offset += 1
+        elif ch == "KEY_SLEFT":
+            if offset > 60:
+                offset -= 60
+            else:
+                offset = 0
+        elif ch == "KEY_SRIGHT":#Jump around by an hour
+            offset += 60 
+        elif ch == "kRIT5":#ctrl left
+            offset += 1440
+        elif ch == "kLFT5":#ctrl right
+            if offset > 1440:
+                offset -= 1440
+            else:
+                offset = 0
+        elif ch == "KEY_END":
+            offset = datasize - 1
+        elif ch == "KEY_HOME":
+            offset = 0
+        elif ch == "j":
+            stdscr.clear()
+            ndate:datetime.datetime = cursesplus.date_time_selector(stdscr,cursesplus.DateTimeSelectorTypes.DATEANDTIME,"Choose a date and time to jump to",True,False,analyticsstructures.get_datetime_from_minute_id(ldata[offset].minuteid)) # type: ignore
+            if currentzoomlevel == analyticsstructures.AnalyticsExplorerZoomLevels.HOUR:
+                ndate = ndate.replace(second=0,minute=0)
+            if currentzoomlevel == analyticsstructures.AnalyticsExplorerZoomLevels.DAY or currentzoomlevel == analyticsstructures.AnalyticsExplorerZoomLevels.WEEK:
+                ndate = ndate.replace(hour=0)
+            nmid = analyticsstructures.get_minute_id_from_datetime(ndate)
+            if not nmid in data:
+                cursesplus.messagebox.showerror(stdscr,["Records do not exist for the selected date."])
+            else:
+                offset = list(data.keys()).index(nmid)
+        elif ch == "t":
+            currentzoomlevel = list(zoomlevels.keys())[uicomponents.menu(stdscr,list(zoomlevels.values()),"Choose a zoom level")]
+            cursesplus.displaymsg(stdscr,["Generating Data"],False)
+            #This will use ogdat because data may have been used for hour or day, which will screw it up
+            offset = 0
+            if currentzoomlevel == analyticsstructures.AnalyticsExplorerZoomLevels.MINUTE:
+                data = {k:analyticsstructures.deserialize_smf(v) for k,v in list(jsongz.read(td+"/data.json.gz").items())}
+                ldata = list(data.values())
+            else:
+                chunked_data:list[list[analyticsstructures.ServerMinuteFrame]] = list(utils.split_list_into_chunks(list({k:analyticsstructures.deserialize_smf(v) for k,v in list(jsongz.read(td+"/data.json.gz").items())}.values()),get_chunk_size_from_aezl(currentzoomlevel)))
+                final_data:dict[int,analyticsstructures.ServerMinuteFrame] = {}
+                for chunk in chunked_data:
+                    s:analyticsstructures.ServerMinuteFrame = analyticsstructures.ServerMinuteFrame(chunk[0].minuteid)
+                    #Append all unique players, and set playerminutes
+                    total_playerminutes = 0
+                    unique_players = []
+                    for minute in chunk:
+                        total_playerminutes += minute.howmanyonline()
+                        for onlineplayer in minute.onlineplayers:
+                            if onlineplayer not in unique_players:
+                                unique_players.append(onlineplayer)
+                    s.playerminutes = total_playerminutes
+                    s.onlineplayers = unique_players
+                    final_data[s.minuteid] = s
+                data = final_data
+                del chunked_data
+                del final_data
+                ldata = list(data.values())
+            maxval = max([p.get_data(currentdatatype) for p in list(data.values())])
+            #if currentdatatype == analyticsstructures.AnalyticsExplorerDataTypes.TOTALPLAYERMINUTES:
+            #    maxval = maxval*get_chunk_size_from_aezl(currentzoomlevel)
+            datasize = len(data)-1
+                
+        elif ch == "d":
+            currentdatatype = list(datatypes.keys())[uicomponents.menu(stdscr,list(datatypes.values()),"Choose a data type")]
+            maxval = max([p.get_data(currentdatatype) for p in ldata])
+            #if currentdatatype == analyticsstructures.AnalyticsExplorerDataTypes.TOTALPLAYERMINUTES:
+            #    maxval = maxval*get_chunk_size_from_aezl(currentzoomlevel)
+        if offset > datasize:
+            offset = datasize - 1
+
+
+
+def get_chunk_size_from_aezl(s:analyticsstructures.AnalyticsExplorerZoomLevels):
+    return {
+        analyticsstructures.AnalyticsExplorerZoomLevels.MINUTE:1,
+        analyticsstructures.AnalyticsExplorerZoomLevels.HOUR:60,
+        analyticsstructures.AnalyticsExplorerZoomLevels.DAY:1440,
+        analyticsstructures.AnalyticsExplorerZoomLevels.WEEK:1440*7
+        }[s]

src/analyticsexplorer.py

@@ -0,0 +1,71 @@
+"""Structures and utility functions for analytics"""
+
+import datetime
+import logutils
+import enum
+
+def get_minute_id_from_datetime(d:datetime.datetime) -> int:
+    return int(d.timestamp()/60//1)
+
+def get_datetime_from_minute_id(t:int) -> datetime.datetime:
+    return datetime.datetime.fromtimestamp(t*60)
+
+class JLLogFrame:
+    data:str
+    ext:datetime.datetime
+    def __init__(self,lowerdata:logutils.LogEntry):
+        rtime = lowerdata.data.split(" ")[0].strip()
+        rdate = lowerdata.logdate
+        
+        self.ext = datetime.datetime.strptime(f"{rdate.year}-{rdate.month}-{rdate.day} {rtime[1:-1]}","%Y-%m-%d %H:%M:%S")
+        self.data = lowerdata.data
+
+class ServerMinuteFrame:
+    minuteid:int
+    onlineplayers:list[str] = []
+    playerminutes:int = None#type: ignore
+    
+    def __init__(self,minuteid):
+        self.minuteid = minuteid
+    def wasonline(self,name) -> bool:
+        return name in self.onlineplayers
+    def todatetime(self) -> datetime.datetime:
+        return datetime.datetime.fromtimestamp(self.minuteid*60)
+    def howmanyonline(self) -> int:
+        return len(self.onlineplayers)
+    def getplayerminutes(self) -> int:
+        if self.playerminutes is None:
+            return self.howmanyonline()
+        else:
+            return self.playerminutes
+    def get_data(self,setting):
+        if setting == AnalyticsExplorerDataTypes.PLAYERCOUNT:
+            return self.howmanyonline()
+        else:
+            return self.getplayerminutes()
+
+def serverminuteframe_uf(smf:ServerMinuteFrame):
+    return f"{smf.minuteid} ({smf.todatetime()}) - {smf.onlineplayers}"
+
+def serialize_smf(s:ServerMinuteFrame) -> dict:
+    return {
+        "id" : s.minuteid,
+        "playerminutes" : s.playerminutes,
+        "onlineplayers" : s.onlineplayers
+    }
+
+def deserialize_smf(s:dict) -> ServerMinuteFrame:
+    d = ServerMinuteFrame(s["id"])
+    d.onlineplayers = s["onlineplayers"]
+    d.playerminutes = s["playerminutes"]
+    return d
+
+class AnalyticsExplorerZoomLevels(enum.Enum):
+    MINUTE = 1
+    HOUR = 60
+    DAY = 1440
+    WEEK = 1440*7
+    
+class AnalyticsExplorerDataTypes(enum.Enum):
+    TOTALPLAYERMINUTES = 0
+    PLAYERCOUNT = 1

src/analyticsstructures.py

@@ -33,6 +33,10 @@ def package_server(stdscr,serverdir:str,chosenserver:int):
         f.write(json.dumps(sdata))
         #Write server data into a temporary file
     wdir=cursesplus.filedialog.openfolderdialog(stdscr,"Please choose a folder for the output server file")
+
+    if wdir is None:
+        return
+
     if os.path.isdir(wdir):
         wxfileout=wdir+"/"+sdata["name"]+".amc"
         nwait = cursesplus.PleaseWaitScreen(stdscr,["Packaging Server"])

src/archiveutils.py

@@ -0,0 +1,12 @@
+"""A library for checking if an internet connection exists"""
+
+import socket
+
+def is_computer_connected_to_internet() -> bool:
+    try:
+        socket.create_connection(("google.com",80))
+
+    except:
+        return False
+    else:
+        return True

src/internetcheck.py

@@ -0,0 +1,12 @@
+"""Json-gzip reader and writer."""
+
+import json
+import gzip
+
+def read(path:str) -> dict:
+    with open(path,'rb') as f:
+        rd = f.read()
+    return json.loads(gzip.decompress(rd).decode())
+def write(path:str,data:dict) -> None:
+    with open(path,'wb+') as f:
+        f.write(gzip.compress(json.dumps(data).encode()))