Skip to content

Commit

Permalink
Fixed a bug in the server that would cause the image handling loop to…
Browse files Browse the repository at this point in the history
… 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.
  • Loading branch information
colbertb committed Mar 16, 2024
1 parent 59d0f51 commit 52d28ed
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 4 deletions.
12 changes: 9 additions & 3 deletions Makefile.mak
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Binary file modified YAIL.XEX
Binary file not shown.
Binary file modified atr/DOS.SYS
Binary file not shown.
4 changes: 4 additions & 0 deletions server/yailsrv.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down Expand Up @@ -358,14 +359,17 @@ 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]))
client_handler = threading.Thread(
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()
2 changes: 1 addition & 1 deletion src/version.h
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@

#define MAJOR_VERSION 1
#define MINOR_VERSION 2
#define BUILD_VERSION 14
#define BUILD_VERSION 15

#endif // YAIL_VERSION_H

0 comments on commit 52d28ed

Please sign in to comment.