Skip to content
Merged
Show file tree
Hide file tree
Changes from 7 commits
Commits
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
33 changes: 30 additions & 3 deletions P2PP.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,34 @@
__email__ = 'P2PP@pandora.be'
__status__ = 'Beta'

from p2pp.main import main
import sys

if __name__ == "__main__":
main()
if "--cli" in sys.argv:
sys.argv.remove("--cli")
# Signal to all modules that we're in headless mode
import os
os.environ["P2PP_HEADLESS"] = "1"
# Install headless shim BEFORE any p2pp submodule import.
# All modules that do `import p2pp.gui as gui` will get this Qt-free
# version — no QApplication, no event loop, no image_rc.
import p2pp.headless
sys.modules["p2pp.gui"] = p2pp.headless

from p2pp.mcf import p2pp_process_file_cli

if len(sys.argv) < 2:
print("Usage: P2PP.py --cli input.gcode [output.gcode]")
sys.exit(1)

input_file = sys.argv[1]
output_file = sys.argv[2] if len(sys.argv) > 2 else None

try:
p2pp_process_file_cli(input_file, output_file)
sys.exit(0)
except Exception as e:
print(f"Error: {e}", file=sys.stderr)
sys.exit(1)
else:
from p2pp.main import main
main()
77 changes: 77 additions & 0 deletions p2pp/headless.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,77 @@
"""Headless shim for p2pp.gui — routes GUI logging to stdout, never blocks.

Installed as sys.modules['p2pp.gui'] in CLI mode so that modules which do
`import p2pp.gui as gui` at module level get a Qt-free implementation
and never start a QApplication / event loop.
"""
import re
import sys
import traceback
from unittest import mock

form = mock.MagicMock()
window = mock.MagicMock()


class _App:
def sync(self): pass
def exec_(self): return 0
def exec(self): return 0
def quit(self): pass
def exit(self, *_a, **_k): pass
def processEvents(self): pass


app = _App()


def _strip_html(text):
return re.sub(r"<[^>]+>", "", str(text))


def create_logitem(text, color=None, force_update=True, position=0):
line = _strip_html(text)
if line.strip():
print(line)


def create_emptyline():
print("")


def create_colordefinition(reporttype, p2_input, filament_type, color_code, filamentused):
print(f" Input {p2_input} {filamentused:8.2f}mm - {filament_type} [{color_code}]")


def log_warning(text):
print(f"WARNING: {_strip_html(text)}", file=sys.stderr)


def progress_string(pct):
pass


def print_summary(summary):
import p2pp.variables as v
print("-" * 40)
print("Print Summary")
print("-" * 40)
print(f"Number of splices: {len(v.splice_extruder_position):5}")
print(f"Number of pings: {len(v.ping_extruder_position):5}")
print(f"Total print length {v.total_material_extruded:8.2f}mm")
for line in summary:
print(line[1:].strip())


def setfilename(text):
if text:
print(f"Input: {text}")


def close_button_enable():
return


def logexception(e):
print(f"Error: {e}", file=sys.stderr)
traceback.print_exc()
16 changes: 16 additions & 0 deletions p2pp/main.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,22 @@


def main():
import sys

if "--cli" in sys.argv:
sys.argv.remove("--cli")
from p2pp.mcf import p2pp_process_file_cli
if len(sys.argv) < 2:
print("Usage: P2PP.py --cli input.gcode [output.gcode]")
sys.exit(1)
input_file = sys.argv[1]
output_file = sys.argv[2] if len(sys.argv) > 2 else None
try:
p2pp_process_file_cli(input_file, output_file)
sys.exit(0)
except Exception as e:
print(f"Error: {e}", file=sys.stderr)
sys.exit(1)

if len(sys.argv) == 2 and sys.argv[1].lower() == "-config":
import config.config_gui as gui
Expand Down
Loading
Loading