Skip to content

Commit 88bc975

Browse files
committed
1.51
1 parent fd2735e commit 88bc975

File tree

4 files changed

+48
-26
lines changed

4 files changed

+48
-26
lines changed

changelog

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
1.51:
2+
- Redo first join
3+
- Redo last seen
14
1.50.6:
25
- Private messages are now included in chat lookups
36
- Fix typo in python version check

src/craftserversetup.py

Lines changed: 39 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
VERSION_MANIFEST = "https://piston-meta.mojang.com/mc/game/version_manifest_v2.json"
55
BUNGEECORD_DOWNLOAD_URL = "https://ci.md-5.net/job/BungeeCord/lastStableBuild/artifact/bootstrap/target/BungeeCord.jar"
66
APP_VERSION = 1#The API Version.
7-
APP_UF_VERSION = "1.50.6"
7+
APP_UF_VERSION = "1.51"
88
#The semver version
99
UPDATEINSTALLED = False
1010
DOCFILE = "https://github.com/Enderbyte-Programs/CraftServerSetup/raw/main/doc/craftserversetup.epdoc"
@@ -81,7 +81,6 @@
8181
from cursesplus import CheckBoxItem
8282
import requests #Networking Utilities
8383
import urllib.request
84-
import urllib.error
8584
import yaml #Parse YML Files
8685
from epadvertisements import * #Advertisements library (BY ME)
8786
import epdoc #Documentations library (BY ME)
@@ -3461,27 +3460,47 @@ def sanalytics(stdscr,serverdir):
34613460

34623461
cursesplus.bargraph(stdscr,gd,"Popularity Results",unit,False,False)
34633462
elif wtd == 10:
3464-
plcheck = crssinput(stdscr,"What player do you want to search for").lower()
3465-
lastseen:datetime.datetime = datetime.datetime(2000,1,1,1,1,1)#Placeholder
3463+
plf = 0
3464+
cursesplus.displaymsg(stdscr,["Analyzing data",f"{plf} players found"],False)
3465+
sortop = crss_custom_ad_menu(stdscr,["Alphabetically","Recent -> Old"],"Choose search option")
3466+
fjblock:dict[str,datetime.datetime] = {}
34663467
for line in reversed(list(workingdata.values())):
3467-
if plcheck in line.onlineplayers:
3468-
lastseen = get_datetime_from_minute_id(line.minuteid)
3469-
break
3470-
if lastseen.year == 2000:
3471-
cursesplus.messagebox.showinfo(stdscr,["This player could not be found"])
3472-
return
3473-
cursesplus.messagebox.showinfo(stdscr,[f"{plcheck} was last seen",str(lastseen)])
3468+
for pl in line.onlineplayers:
3469+
if not pl in fjblock.keys():
3470+
fjblock[pl] = get_datetime_from_minute_id(line.minuteid)
3471+
plf += 1
3472+
cursesplus.displaymsg(stdscr,["Analyzing data",f"{plf} players found"],False)
3473+
3474+
if sortop == 0:
3475+
fjblock = dict(sorted(fjblock))#Sort A-Z
3476+
3477+
#Assemble text
3478+
finals = "PLAYER NAME".ljust(16)+" "+"LAST SEEN"+"\n"
3479+
for blk in fjblock.items():
3480+
finals += blk[0].ljust(16) + " " + strip_datetime(blk[1]) + "\n"
3481+
3482+
cursesplus.textview(stdscr,text=finals,message="Results")
34743483
elif wtd == 11:
3475-
plcheck = crssinput(stdscr,"What player do you want to search for").lower()
3476-
lastseen:datetime.datetime = datetime.datetime(2000,1,1,1,1,1)#Placeholder
3484+
plf = 0
3485+
cursesplus.displaymsg(stdscr,["Analyzing data",f"{plf} players found"],False)
3486+
sortop = crss_custom_ad_menu(stdscr,["Alphabetically","Oldest to newest"],"Choose search option")
3487+
fjblock:dict[str,datetime.datetime] = {}
34773488
for line in list(workingdata.values()):
3478-
if plcheck in line.onlineplayers:
3479-
lastseen = get_datetime_from_minute_id(line.minuteid)
3480-
break
3481-
if lastseen.year == 2000:
3482-
cursesplus.messagebox.showinfo(stdscr,["This player could not be found"])
3483-
return
3484-
cursesplus.messagebox.showinfo(stdscr,[f"{plcheck} was first seen",str(lastseen)])
3489+
for pl in line.onlineplayers:
3490+
if not pl in fjblock.keys():
3491+
fjblock[pl] = get_datetime_from_minute_id(line.minuteid)
3492+
plf += 1
3493+
cursesplus.displaymsg(stdscr,["Analyzing data",f"{plf} players found"],False)
3494+
3495+
if sortop == 0:
3496+
fjblock = dict(sorted(fjblock))#Sort A-Z
3497+
3498+
#Assemble text
3499+
finals = "PLAYER NAME".ljust(16)+" "+"JOIN DATE"+"\n"
3500+
for blk in fjblock.items():
3501+
finals += blk[0].ljust(16) + " " + strip_datetime(blk[1]) + "\n"
3502+
3503+
cursesplus.textview(stdscr,text=finals,message="Results")
34853504

34863505
elif wtd == 12:
34873506
os.remove(analytics_file_path)

src/crss-wine.iss

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33

44

5-
#define MyAppVersion "1.50.5"
5+
#define MyAppVersion "1.50.6"
66
;The above line must be on line 5!
77

88

@@ -39,7 +39,7 @@ OutputDir=C:\python\crss\installer
3939

4040

4141

42-
OutputBaseFilename=CraftServerSetup-1.50.5-installer
42+
OutputBaseFilename=CraftServerSetup-1.50.6-installer
4343
;The above line MUST be on line 42
4444

4545

src/vf.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ VSVersionInfo(
77
ffi=FixedFileInfo(
88
# filevers and prodvers should be always a tuple with four items: (1, 2, 3, 4)
99
# Set not needed items to zero 0. Must always contain 4 elements.
10-
filevers=(1,50,5,0),
11-
prodvers=(1,50,5,0),
10+
filevers=(1,50,6,0),
11+
prodvers=(1,50,6,0),
1212
# Contains a bitmask that specifies the valid bits 'flags'r
1313
mask=0x3f,
1414
# Contains a bitmask that specifies the Boolean attributes of the file.
@@ -32,12 +32,12 @@ VSVersionInfo(
3232
u'040904B0',
3333
[StringStruct(u'CompanyName', u'Enderbyte Programs'),
3434
StringStruct(u'FileDescription', u'Minecraft Server Maker'),
35-
StringStruct(u'FileVersion', u'1.50.5'),
35+
StringStruct(u'FileVersion', u'1.50.6'),
3636
StringStruct(u'InternalName', u'craftserversetup'),
3737
StringStruct(u'LegalCopyright', u'© 2023-2024 Enderbyte Programs. Some rights reserved.'),
3838
StringStruct(u'OriginalFilename', u'craftserversetup.exe'),
3939
StringStruct(u'ProductName', u'CraftServerSetup'),
40-
StringStruct(u'ProductVersion', u'1.50.5')])
40+
StringStruct(u'ProductVersion', u'1.50.6')])
4141
]),
4242
VarFileInfo([VarStruct(u'Translation', [1033, 1200])])
4343
]

0 commit comments

Comments
 (0)