Allow editor switch entities #3236

.github/workflows/build.yaml

@@ -1,11 +1,12 @@
 name: Build
 
-on: [push, pull_request]
+on: [push, pull_request, merge_group]
 
 jobs:
   build-cmake:
     runs-on: ${{ matrix.os }}
     strategy:
+      fail-fast: false
       matrix:
         os: [ubuntu-latest, macOS-latest, windows-latest, ubuntu-20.04]
         include:
@@ -53,7 +54,7 @@ jobs:
         brew update || true
         brew install pkg-config sdl2 python3 ninja || true
         # --overwrite for:  Target /usr/local/bin/2to3 already exists.
-        brew link --overwrite python@3.10
+        brew link --overwrite python@3.12
         brew upgrade freetype
         sudo rm -rf /Library/Developer/CommandLineTools
 
@@ -108,6 +109,7 @@ jobs:
   build-bam:
     runs-on: ${{ matrix.os }}
     strategy:
+      fail-fast: false
       matrix:
         os: [ubuntu-latest, macOS-latest, windows-latest]
 

.github/workflows/style.yml

@@ -8,6 +8,7 @@ on:
       - trying.tmp
       - staging-squash-merge.tmp
   pull_request:
+  merge_group:
 
 jobs:
   check-style:
@@ -28,4 +29,3 @@ jobs:
         do
           jq '.' "$json" || { echo "$json"; exit 1; };
         done < <(find . -name "*.json");
-

CMakeLists.txt

@@ -1318,6 +1318,8 @@ set_src(ENGINE_SHARED GLOB src/engine/shared
   huffman.h
   jobs.cpp
   jobs.h
+  jsonparser.cpp
+  jsonparser.h
   jsonwriter.cpp
   jsonwriter.h
   kernel.cpp
@@ -1723,6 +1725,7 @@ if(GTEST_FOUND OR DOWNLOAD_GTEST)
     git_revision.cpp
     hash.cpp
     io.cpp
+    jsonparser.cpp
     jsonwriter.cpp
     packer.cpp
     sorted_array.cpp

bam.lua

@@ -368,24 +368,24 @@ function BuildServer(settings, family, platform)
 
 	local game_server = Compile(settings, CollectRecursive("src/game/server/*.cpp"), SharedServerFiles())
 
-	return Link(settings, "teeworlds_srv", libs["zlib"], libs["md5"], server, game_server)
+	return Link(settings, "teeworlds_srv", libs["zlib"], libs["md5"], libs["json"], server, game_server)
 end
 
 function BuildTools(settings)
 	local tools = {}
 	for i,v in ipairs(Collect("src/tools/*.cpp", "src/tools/*.c")) do
 		local toolname = PathFilename(PathBase(v))
-		tools[i] = Link(settings, toolname, Compile(settings, v), libs["zlib"], libs["md5"], libs["wavpack"], libs["png"])
+		tools[i] = Link(settings, toolname, Compile(settings, v), libs["zlib"], libs["md5"], libs["wavpack"], libs["png"], libs["json"])
 	end
 	PseudoTarget(settings.link.Output(settings, "pseudo_tools") .. settings.link.extension, tools)
 end
 
 function BuildMasterserver(settings)
-	return Link(settings, "mastersrv", Compile(settings, Collect("src/mastersrv/*.cpp")), libs["zlib"], libs["md5"])
+	return Link(settings, "mastersrv", Compile(settings, Collect("src/mastersrv/*.cpp")), libs["zlib"], libs["md5"], libs["json"])
 end
 
 function BuildVersionserver(settings)
-	return Link(settings, "versionsrv", Compile(settings, Collect("src/versionsrv/*.cpp")), libs["zlib"], libs["md5"])
+	return Link(settings, "versionsrv", Compile(settings, Collect("src/versionsrv/*.cpp")), libs["zlib"], libs["md5"], libs["json"])
 end
 
 function BuildContent(settings, arch, conf)

license.txt

@@ -1,4 +1,4 @@
-Copyright (C) 2007-2022 Magnus Auvinen
+Copyright (C) 2007-2024 Magnus Auvinen
 
 This software is provided 'as-is', without any express or implied
 warranty.  In no event will the authors be held liable for any damages

scripts/cmd5.py

@@ -8,7 +8,7 @@ def cstrip(lines):
 		l = re.sub("#.*".encode(), "".encode(), l)
 		l = re.sub("//.*".encode(), "".encode(), l)
 		d += l + " ".encode()
-	d = re.sub("\/\*.*?\*/".encode(), "".encode(), d) # remove /* */ comments
+	d = re.sub(r"\/\*.*?\*/".encode(), "".encode(), d) # remove /* */ comments
 	d = d.replace("\t".encode(), " ".encode()) # tab to space
 	d = re.sub("  *".encode(), " ".encode(), d) # remove double spaces
 	d = re.sub("".encode(), "".encode(), d) # remove /* */ comments

scripts/download.py

@@ -1,7 +1,7 @@
 import shutil, os, re, sys, zipfile
-from distutils.dir_util import copy_tree
 os.chdir(os.path.dirname(os.path.realpath(sys.argv[0])) + "/..")
 import twlib
+from twlib import copy_tree
 
 def unzip(filename, where):
 	try:

scripts/make_release.py

@@ -1,7 +1,7 @@
 import shutil, optparse, os, re, sys, zipfile
-from distutils.dir_util import copy_tree
 os.chdir(os.path.dirname(os.path.realpath(sys.argv[0])) + "/..")
 import twlib
+from twlib import copy_tree
 
 arguments = optparse.OptionParser(usage="usage: %prog VERSION PLATFORM [options]\n\nVERSION  - Version number\nPLATFORM - Target platform (f.e. linux_x86, linux_x86_64, macos, src, win32, win64)")
 arguments.add_option("-l", "--url-languages", default = "http://github.com/teeworlds/teeworlds-translation/archive/master.zip", help = "URL from which the teeworlds language files will be downloaded")

scripts/twlib.py

@@ -1,3 +1,4 @@
+import shutil
 import sys
 if sys.version_info[0] == 2:
 	import urllib
@@ -6,6 +7,14 @@
 	import urllib.request
 	url_lib = urllib.request
 
+try:
+	from distutils.dir_util import copy_tree
+except ModuleNotFoundError:
+	# distutils was removed in python 3.12
+	# https://peps.python.org/pep-0632/
+	def copy_tree(src, dst):
+		shutil.copytree(src, dst, dirs_exist_ok=True)
+
 def fetch_file(url):
 	print("trying %s" % url)
 	try:

src/base/system.c

@@ -388,28 +388,30 @@ unsigned io_read(IOHANDLE io, void *buffer, unsigned size)
 
 void io_read_all(IOHANDLE io, void **result, unsigned *result_len)
 {
-	unsigned char *buffer = malloc(1024);
-	unsigned len = 0;
-	unsigned cap = 1024;
-	unsigned read;
-
-	*result = 0;
-	*result_len = 0;
-
-	while((read = io_read(io, buffer + len, cap - len)) != 0)
+	unsigned len = (unsigned)io_length(io);
+	char *buffer = mem_alloc(len + 1);
+	unsigned read = io_read(io, buffer, len + 1); // +1 to check if the file size is larger than expected
+	if(read < len)
 	{
-		len += read;
-		if(len == cap)
-		{
-			cap *= 2;
-			buffer = realloc(buffer, cap);
-		}
+		buffer = realloc(buffer, read + 1);
+		len = read;
 	}
-	if(len == cap)
+	else if(read > len)
 	{
-		buffer = realloc(buffer, cap + 1);
+		unsigned cap = 2 * read;
+		len = read;
+		buffer = realloc(buffer, cap);
+		while((read = io_read(io, buffer + len, cap - len)) != 0)
+		{
+			len += read;
+			if(len == cap)
+			{
+				cap *= 2;
+				buffer = realloc(buffer, cap);
+			}
+		}
+		buffer = realloc(buffer, len + 1);
 	}
-	// ensure null termination
 	buffer[len] = 0;
 	*result = buffer;
 	*result_len = len;
@@ -419,12 +421,11 @@ char *io_read_all_str(IOHANDLE io)
 {
 	void *buffer;
 	unsigned len;
-
 	io_read_all(io, &buffer, &len);
 	if(mem_has_null(buffer, len))
 	{
-		free(buffer);
-		return 0;
+		mem_free(buffer);
+		return 0x0;
 	}
 	return buffer;
 }
@@ -749,7 +750,7 @@ static void netaddr_to_sockaddr_in6(const NETADDR *src, struct sockaddr_in6 *des
 	mem_zero(dest, sizeof(struct sockaddr_in6));
 	if(src->type != NETTYPE_IPV6)
 	{
-		dbg_msg("system", "couldn't not convert NETADDR of type %d to ipv6", src->type);
+		dbg_msg("system", "couldn't convert NETADDR of type %d to ipv6", src->type);
 		return;
 	}
 
@@ -2375,22 +2376,23 @@ int str_comp_filenames(const char *a, const char *b)
 			{
 				if(!result)
 					result = *a - *b;
-				++a; ++b;
-			}
-			while(*a >= '0' && *a <= '9' && *b >= '0' && *b <= '9');
+				++a;
+				++b;
+			} while(*a >= '0' && *a <= '9' && *b >= '0' && *b <= '9');
 
 			if(*a >= '0' && *a <= '9')
 				return 1;
 			else if(*b >= '0' && *b <= '9')
 				return -1;
-			else if(result)
+			else if(result || *a == '\0' || *b == '\0')
 				return result;
 		}
 
-		if(tolower(*a) != tolower(*b))
-			break;
+		result = tolower(*a) - tolower(*b);
+		if(result)
+			return result;
 	}
-	return tolower(*a) - tolower(*b);
+	return *a - *b;
 }
 
 const char *str_startswith_nocase(const char *str, const char *prefix)
@@ -2563,7 +2565,7 @@ int mem_comp(const void *a, const void *b, int size)
 int mem_has_null(const void *block, unsigned size)
 {
 	const unsigned char *bytes = block;
-	unsigned i;        
+	unsigned i;
 	for(i = 0; i < size; i++)
 	{
 		if(bytes[i] == 0)

src/base/system.h

@@ -231,7 +231,6 @@ unsigned io_read(IOHANDLE io, void *buffer, unsigned size);
 
 	Remarks:
 		- Does NOT guarantee that there are no internal null bytes.
-		- Guarantees that result will contain zero-termination.
 		- The result must be freed after it has been used.
 */
 void io_read_all(IOHANDLE io, void **result, unsigned *result_len);

src/engine/client/serverbrowser.cpp

@@ -3,12 +3,11 @@
 #include <base/math.h>
 #include <base/system.h>
 
-#include <engine/external/json-parser/json.h>
-
 #include <engine/shared/config.h>
 #include <engine/shared/memheap.h>
 #include <engine/shared/network.h>
 #include <engine/shared/packer.h>
+#include <engine/shared/jsonparser.h>
 #include <engine/shared/jsonwriter.h>
 #include <engine/shared/mapchecker.h>
 
@@ -610,25 +609,11 @@ void CServerBrowser::SetInfo(int ServerlistType, CServerEntry *pEntry, const CSe
 
 void CServerBrowser::LoadServerlist()
 {
-	// read file data into buffer
-	IOHANDLE File = Storage()->OpenFile(s_pFilename, IOFLAG_READ, IStorage::TYPE_ALL);
-	if(!File)
-		return;
-	int FileSize = (int)io_length(File);
-	char *pFileData = (char *)mem_alloc(FileSize);
-	io_read(File, pFileData, FileSize);
-	io_close(File);
-
-	// parse json data
-	json_settings JsonSettings;
-	mem_zero(&JsonSettings, sizeof(JsonSettings));
-	char aError[256];
-	json_value *pJsonData = json_parse_ex(&JsonSettings, pFileData, FileSize, aError);
-	mem_free(pFileData);
-
+	CJsonParser JsonParser;
+	const json_value *pJsonData = JsonParser.ParseFile(s_pFilename, Storage());
 	if(pJsonData == 0)
 	{
-		Console()->Print(IConsole::OUTPUT_LEVEL_ADDINFO, s_pFilename, aError);
+		Console()->Print(IConsole::OUTPUT_LEVEL_ADDINFO, "client_srvbrowse", JsonParser.Error());
 		return;
 	}
 
@@ -643,9 +628,6 @@ void CServerBrowser::LoadServerlist()
 				Set(Addr, SET_MASTER_ADD, -1, 0);
 		}
 	}
-
-	// clean up
-	json_value_free(pJsonData);
 }
 
 void CServerBrowser::SaveServerlist()