From 52d28edd9f10d400fdf1a43c6bd230d4f9e5a8ad Mon Sep 17 00:00:00 2001 From: Brad Colbert Date: Fri, 15 Mar 2024 18:23:53 -0700 Subject: [PATCH] Fixed a bug in the server that would cause the image handling loop to fall out way to far because I was accessing an undefined variable in an exception. Fixed the ATR build on windows. Now creates a bootable disk. --- Makefile.mak | 12 +++++++++--- YAIL.XEX | Bin 21452 -> 21452 bytes atr/DOS.SYS | Bin 6578 -> 4625 bytes server/yailsrv.py | 4 ++++ src/version.h | 2 +- 5 files changed, 14 insertions(+), 4 deletions(-) diff --git a/Makefile.mak b/Makefile.mak index c74b5b7..b29ac9e 100644 --- a/Makefile.mak +++ b/Makefile.mak @@ -6,7 +6,7 @@ CL65=$(CC65_HOME)\\cl65.exe PRODUCT=YAIL TARGET=atari SRC_DIR=src -CFLAGS=-Or +CFLAGS=-Osri LINKFLAGS= #LINKFLAGS=--debug-info -Wl --dbgfile,"myapp.dbg" # -D__SYSTEM_CHECK__=1 @@ -48,6 +48,12 @@ s_products: $(SRC_DIR)\*.s del $(**:.s=.o) atr: $(PRODUCT).XEX - copy $(PRODUCT).XEX atr - dir2atr -D $(PRODUCT).ATR atr + copy DOS.SYS atr\\ + copy $(PRODUCT).XEX atr\AUTORUN.SYS +disk: atr + @echo Building bootable disk + dir2atr -E -b Dos25 -P $(PRODUCT).ATR atr + +debug: disk + Altirra64 /defprofile:xl /ntsc /burstio /fastboot /debug /debugbrkrun /debugcmd: ".loadsym $(PRODUCT).lbl" /disk $(PRODUCT).ATR diff --git a/YAIL.XEX b/YAIL.XEX index 0e2cd3235fe72f5f23873c59709cd7234e2058df..3ad8f51472f056602fd4628fd47db4dbcafc8660 100644 GIT binary patch literal 21452 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 C6grUr literal 21452 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 O_$wlChW#yTu>2occv1TR diff --git a/atr/DOS.SYS b/atr/DOS.SYS index e02bcf67010f0a69ba594dc71af14b71496b7c21..4ed443f63eeb99a3ba254a7f7da977b1f1ff9339 100644 GIT binary patch literal 4625 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 JZyv5p_Frg2?L`0p diff --git a/server/yailsrv.py b/server/yailsrv.py index 7509149..dc9ace3 100644 --- a/server/yailsrv.py +++ b/server/yailsrv.py @@ -242,6 +242,7 @@ def stream_YAI(url, client, gfx_mode): # download the body of response by chunk, not immediately try: print('Loading', url, url.encode()) + file_size = 0 response = requests.get(url, stream=True) @@ -358,6 +359,7 @@ def handle_client_connection(client_socket): #loop.close() # Close the loop when done def main(): + connections = 0 while True: client_sock, address = server.accept() print('Accepted connection from {}:{}'.format(address[0], address[1])) @@ -365,7 +367,9 @@ def main(): target=handle_client_connection, args=(client_sock,) # without comma you'd get a... TypeError: handle_client_connection() argument after * must be a sequence, not _socketobject ) + connections += 1 client_handler.start() + print('Connections:', connections) if __name__ == "__main__": main() diff --git a/src/version.h b/src/version.h index 751d692..eb1aed0 100644 --- a/src/version.h +++ b/src/version.h @@ -5,6 +5,6 @@ #define MAJOR_VERSION 1 #define MINOR_VERSION 2 -#define BUILD_VERSION 14 +#define BUILD_VERSION 15 #endif // YAIL_VERSION_H