Skip to content

Commit c251aa5

Browse files
authored
Fix recursive load (#60)
* Change the default port * cleanup * dont use sys.executable in pyinstaler
1 parent 1437d69 commit c251aa5

File tree

2 files changed

+13
-5
lines changed

2 files changed

+13
-5
lines changed

src/infinity_arcade/main.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -539,7 +539,7 @@ def main():
539539
print("Starting Infinity Arcade...")
540540
print("Press Ctrl+C to quit")
541541

542-
port = 8080
542+
port = 8081
543543

544544
# Start the server in a separate thread
545545
def run_server():

src/lemonade_client/lemonade_client.py

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -243,11 +243,19 @@ async def execute_lemonade_server_command(
243243
)
244244

245245
# Python module fallback (most reliable after pip install)
246-
commands_to_try.append([sys.executable, "-m", "lemonade_server"] + args)
246+
# Only use sys.executable with -m flag in non-frozen environments
247+
if not self.is_pyinstaller_environment():
248+
commands_to_try.append(
249+
[sys.executable, "-m", "lemonade_server"] + args
250+
)
247251
else:
248252
# Linux/Unix: Try lemonade-server-dev first, then Python module fallback
249253
commands_to_try.append(["lemonade-server-dev"] + args)
250-
commands_to_try.append([sys.executable, "-m", "lemonade_server"] + args)
254+
# Only use sys.executable with -m flag in non-frozen environments
255+
if not self.is_pyinstaller_environment():
256+
commands_to_try.append(
257+
[sys.executable, "-m", "lemonade_server"] + args
258+
)
251259

252260
for i, cmd in enumerate(commands_to_try):
253261
try:
@@ -695,7 +703,7 @@ async def download_and_install_lemonade_server(self):
695703
)
696704
return {
697705
"success": True,
698-
"message": "Installer launched. Please complete the installation and then restart Infinity Arcade.",
706+
"message": "Installer launched. Please complete the installation.",
699707
"interactive": True,
700708
}
701709
else:
@@ -984,7 +992,7 @@ async def get_system_info(
984992
unless cache_duration_hours is explicitly set.
985993
986994
Args:
987-
cache_dir: Directory to store cache file (defaults to ~/.infinity-arcade)
995+
cache_dir: Directory to store cache file (defaults to ~/.cache/lemonade)
988996
cache_duration_hours: Hours to keep cached data (None = never expire, default)
989997
990998
Returns:

0 commit comments

Comments
 (0)