Skip to content

Fix recursive load #60

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jeremyfowers merged 3 commits into from
Oct 10, 2025
Merged

Fix recursive load #60

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4f998b8
Change the default port
jeremyfowers Oct 10, 2025
8204b4d
cleanup
jeremyfowers Oct 10, 2025
af851dc
dont use sys.executable in pyinstaler
jeremyfowers Oct 10, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/infinity_arcade/main.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -539,7 +539,7 @@ def main():
print("Starting Infinity Arcade...")
print("Press Ctrl+C to quit")

port = 8080
port = 8081

# Start the server in a separate thread
def run_server():
Expand Down
16 changes: 12 additions & 4 deletions src/lemonade_client/lemonade_client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -243,11 +243,19 @@ async def execute_lemonade_server_command(
)

# Python module fallback (most reliable after pip install)
commands_to_try.append([sys.executable, "-m", "lemonade_server"] + args)
# Only use sys.executable with -m flag in non-frozen environments
if not self.is_pyinstaller_environment():
commands_to_try.append(
[sys.executable, "-m", "lemonade_server"] + args
)
else:
# Linux/Unix: Try lemonade-server-dev first, then Python module fallback
commands_to_try.append(["lemonade-server-dev"] + args)
commands_to_try.append([sys.executable, "-m", "lemonade_server"] + args)
# Only use sys.executable with -m flag in non-frozen environments
if not self.is_pyinstaller_environment():
commands_to_try.append(
[sys.executable, "-m", "lemonade_server"] + args
)

for i, cmd in enumerate(commands_to_try):
try:
Expand Down Expand Up @@ -695,7 +703,7 @@ async def download_and_install_lemonade_server(self):
)
return {
"success": True,
"message": "Installer launched. Please complete the installation and then restart Infinity Arcade.",
"message": "Installer launched. Please complete the installation.",
"interactive": True,
}
else:
Expand Down Expand Up @@ -984,7 +992,7 @@ async def get_system_info(
unless cache_duration_hours is explicitly set.

Args:
cache_dir: Directory to store cache file (defaults to ~/.infinity-arcade)
cache_dir: Directory to store cache file (defaults to ~/.cache/lemonade)
cache_duration_hours: Hours to keep cached data (None = never expire, default)

Returns:
Expand Down
Loading