tinyprint 0.2.2__tar.gz → 0.2.4__tar.gz

{tinyprint-0.2.2 → tinyprint-0.2.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: tinyprint
-Version: 0.2.2
+Version: 0.2.4
 Summary: ui & cli to print zines with esc/pos printer
 Author-email: Levin Eric Zimmermann <levin.eric.zimmermann@posteo.com>
 License: GPL
@@ -23,3 +23,31 @@ Dynamic: license-file
 # tinyprint
 
 Software for printing tiny zines with ESC/POS printer.
+
+![gui screenshot](screenshot.jpg)
+
+## Installation
+
+### MacOS
+
+Open a console and type:
+
+```bash
+/bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)
+brew install python
+brew install python-tk
+brew install pipx
+pipx install tinyprint
+```
+
+## Linux
+
+Install python, and then just use pip:
+
+```bash
+pip3 install tinyprint
+```
+
+## Windows
+
+I don't know, but if someone manages, please let us know.

tinyprint-0.2.4/README.md

@@ -0,0 +1,31 @@
+# tinyprint
+
+Software for printing tiny zines with ESC/POS printer.
+
+![gui screenshot](screenshot.jpg)
+
+## Installation
+
+### MacOS
+
+Open a console and type:
+
+```bash
+/bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)
+brew install python
+brew install python-tk
+brew install pipx
+pipx install tinyprint
+```
+
+## Linux
+
+Install python, and then just use pip:
+
+```bash
+pip3 install tinyprint
+```
+
+## Windows
+
+I don't know, but if someone manages, please let us know.

{tinyprint-0.2.2 → tinyprint-0.2.4}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "tinyprint"
-version = "0.2.2"
+version = "0.2.4"
 authors = [
     {name = "Levin Eric Zimmermann", email = "levin.eric.zimmermann@posteo.com"},
 ]

tinyprint-0.2.4/tests/test_gui.py

@@ -0,0 +1,312 @@
+"""Tests for the TinyPrint GUI."""
+
+import json
+import pytest
+from pathlib import Path
+from unittest.mock import MagicMock, patch
+import tempfile
+import shutil
+
+# Import the GUI components
+from tinyprint.gui import GUI, JobConfigManager
+from tinyprint.jobconfig import JobConfig, Resource
+
+
+@pytest.fixture
+def temp_dir():
+    """Create and cleanup a temporary directory for test files."""
+    temp_dir = tempfile.mkdtemp(prefix="tinyprint-test-")
+    yield temp_dir
+    shutil.rmtree(temp_dir, ignore_errors=True)
+
+
+@pytest.fixture
+def gui_app(temp_dir):
+    """Create a GUI instance for testing with a temporary directory."""
+    with GUI() as gui:
+        yield gui
+
+
+@pytest.fixture
+def job_controller(gui_app):
+    """Return the JobController instance from the GUI."""
+    return gui_app.blk.job_controller
+
+
+def test_print_button_starts_job(job_controller):
+    """Test that clicking the print button starts a print job."""
+    # Setup - mock the Job class
+    mock_job = MagicMock()
+    mock_job.is_running = False
+
+    with patch("tinyprint.gui.Job", return_value=mock_job) as mock_job_class:
+        # Simulate clicking the print button
+        job_controller.btn.print.invoke()
+
+        # Verify a job was created with the correct config
+        mock_job_class.assert_called_once()
+        assert isinstance(mock_job_class.call_args[0][0], JobConfig)
+
+        # Verify the job was started
+        mock_job.start.assert_called_once()
+        assert job_controller.job == mock_job
+
+
+def test_stop_button_stops_job(job_controller):
+    """Test that clicking the stop button stops a running print job."""
+    # Setup - create a mock job
+    mock_job = MagicMock()
+    mock_job.is_running = True
+    job_controller.job = mock_job
+
+    # Simulate clicking the stop button
+    job_controller.btn.stop.invoke()
+
+    # Verify the job was stopped and cleaned up
+    mock_job.stop.assert_called_once()
+    mock_job.close.assert_called_once()
+    assert job_controller.job is None
+
+
+@pytest.fixture
+def job_config_manager(gui_app):
+    """Create a JobConfigManager instance for testing."""
+    gui_app.blk = MagicMock()
+    gui_app.blk.job_config_editor = MagicMock()
+    gui_app.blk.job_config_editor.sync_from_model = MagicMock()
+    gui_app.tempdir = tempfile.mkdtemp()
+    return JobConfigManager(gui_app)
+
+
+def test_job_config_manager_initialization(job_config_manager):
+    """Test that JobConfigManager initializes correctly."""
+    assert job_config_manager.job_config is not None
+    assert isinstance(job_config_manager.job_config, JobConfig)
+    assert len(job_config_manager.job_config.resource_list) == 1
+    assert "tmp-resource.md" in job_config_manager.job_config.resource_list[0].path
+    assert job_config_manager.filename is not None
+    assert job_config_manager.filename.endswith("tmp-print-job.json")
+
+
+def test_job_config_manager_new_config(job_config_manager, tmp_path):
+    """Test creating a new configuration."""
+    test_file = tmp_path / "test_config.json"
+
+    # Set up the save_as dialog to return our test file
+    with patch(
+        "tkinter.filedialog.asksaveasfilename", return_value=str(test_file)
+    ) as mock_save_as:
+        # Simulate clicking the new button
+        job_config_manager.btn.new.invoke()
+
+    assert job_config_manager.filename == str(test_file)
+    assert test_file.exists()
+
+    # Verify the file contains valid JSON with expected structure
+    with open(test_file, "r") as f:
+        config_data = json.load(f)
+    assert "resource_list" in config_data
+    assert isinstance(config_data["resource_list"], list)
+    assert len(config_data["resource_list"]) == 1
+
+
+@patch("tkinter.filedialog.asksaveasfilename")
+def test_job_config_manager_save_as(mock_save_as, job_config_manager, tmp_path):
+    """Test saving configuration to a new file."""
+    test_file = tmp_path / "test_save_as.json"
+    mock_save_as.return_value = str(test_file)
+
+    # Simulate clicking the save_as button
+    job_config_manager.btn.save_as.invoke()
+
+    mock_save_as.assert_called_once()
+    assert job_config_manager.filename == str(test_file)
+    assert test_file.exists()
+    # Verify the filename label is updated
+    assert (
+        job_config_manager.lbl.filename["textvariable"]
+        == job_config_manager.var.filename_indicator._name
+    )
+    assert job_config_manager.var.filename_indicator.get() == "test_save_as.json"
+
+
+@patch("tkinter.filedialog.askopenfilename")
+def test_job_config_manager_open_config(mock_open_file, job_config_manager, tmp_path):
+    """Test opening an existing configuration file."""
+    # Create a test config file
+    test_file = tmp_path / "test_open.json"
+    test_config = {
+        "resource_list": [{"path": "test.txt"}],
+        "printer_config": None,
+        "copy_count": 1,
+        "cut": True,
+        "orientation": 0,  # 0 = Orientation.HORIZONTAL
+        "page_size": None,
+        "sleep_time": 0.5,
+    }
+    with open(test_file, "w") as f:
+        json.dump(test_config, f)
+
+    mock_open_file.return_value = str(test_file)
+
+    # Simulate clicking the open button
+    job_config_manager.btn.open.invoke()
+
+    mock_open_file.assert_called_once()
+    assert job_config_manager.filename == str(test_file)
+    assert job_config_manager.job_config is not None
+    assert len(job_config_manager.job_config.resource_list) == 1
+    assert job_config_manager.job_config.resource_list[0].path == "test.txt"
+    assert job_config_manager.job_config.sleep_time == 0.5
+    # Verify the filename label is updated
+    assert (
+        job_config_manager.lbl.filename["textvariable"]
+        == job_config_manager.var.filename_indicator._name
+    )
+    assert job_config_manager.var.filename_indicator.get() == "test_open.json"
+
+
+def test_job_config_manager_reload_config(job_config_manager, tmp_path):
+    """Test reloading the current configuration from disk."""
+    # Create a test config file
+    test_file = tmp_path / "test_reload.json"
+    test_config = {
+        "resource_list": [{"path": "reload.txt"}],
+        "orientation": 0,  # 0 = Orientation.HORIZONTAL
+        "sleep_time": 0.3,
+    }
+    with open(test_file, "w") as f:
+        json.dump(test_config, f)
+
+    # Set the filename and reload
+    job_config_manager.set_filename(str(test_file))
+    # Simulate clicking the reload button
+    job_config_manager.btn.reload.invoke()
+
+    # Verify the config was loaded correctly
+    assert job_config_manager.job_config is not None
+    assert len(job_config_manager.job_config.resource_list) == 1
+    assert job_config_manager.job_config.resource_list[0].path == "reload.txt"
+    assert job_config_manager.job_config.sleep_time == 0.3
+
+    # Verify the editor was synced
+    job_config_manager.gui.blk.job_config_editor.sync_from_model.assert_called_once()
+
+
+def test_job_config_manager_set_filename(job_config_manager):
+    """Test updating the filename and UI indicator."""
+    test_path = "/path/to/test_config.json"
+    job_config_manager.set_filename(test_path)
+
+    assert job_config_manager.filename == test_path
+
+
+def test_job_config_editor_initialization(gui_app):
+    """Test that JobConfigEditor initializes correctly."""
+    editor = gui_app.blk.job_config_editor
+    assert editor is not None
+    # Verify all expected variables are created
+    assert hasattr(editor.var, "resource_list")
+    assert hasattr(editor.var, "printer_config")
+    assert hasattr(editor.var, "sleep_time")
+    # Verify widgets are created
+    assert hasattr(editor.lbl, "resource_list")
+    assert hasattr(editor.lbl, "printer_value")
+    assert hasattr(editor.lbl, "sleep_value")
+    assert hasattr(editor.btn, "select_resource")
+    assert hasattr(editor.btn, "select_printer")
+    assert hasattr(editor.cbx, "cut")
+
+
+@patch("tkinter.filedialog.askopenfilenames")
+def test_select_resource(mock_file_dialog, gui_app):
+    """Test selecting resources updates the job config and UI."""
+    editor = gui_app.blk.job_config_editor
+    test_files = ["/path/to/file1.pdf", "/path/to/file2.jpg"]
+    mock_file_dialog.return_value = test_files
+    editor.btn.select_resource.invoke()
+    mock_file_dialog.assert_called_once()
+    assert len(editor.job_config.resource_list) == 2
+    assert editor.job_config.resource_list[0].path == test_files[0]
+    assert editor.job_config.resource_list[1].path == test_files[1]
+    assert test_files[0].split("/")[-1] in editor.var.resource_list.get()
+
+
+@patch("tkinter.filedialog.askopenfilename")
+def test_select_printer_config(mock_file_dialog, gui_app):
+    """Test selecting a printer config updates the job config and UI."""
+    editor = gui_app.blk.job_config_editor
+    test_file = "/path/to/printer.yml"
+    mock_file_dialog.return_value = test_file
+
+    # Simulate clicking the select printer button
+    editor.btn.select_printer.invoke()
+
+    # Get the actual call arguments
+    args, kwargs = mock_file_dialog.call_args
+    assert kwargs.get("title") == "Open a file"
+    assert kwargs.get("filetypes") == (
+        ("printer config", "*.yml"),
+        ("all files", "*.*"),
+    )
+    assert str(kwargs.get("initialdir")) == str(Path.home())
+
+    # Verify the printer config was updated
+    assert editor.job_config.printer_config == test_file
+    assert editor.var.printer_config.get() == test_file
+
+
+def test_toggle_cut(gui_app):
+    """Test toggling the cut option updates the job config."""
+    editor = gui_app.blk.job_config_editor
+    initial_cut = editor.job_config.cut
+
+    # Set the combobox to the opposite of current cut state
+    new_value = "no" if initial_cut else "yes"
+    editor.cbx.cut.set(new_value)
+
+    # Trigger the combobox selection event
+    editor.cbx.cut.event_generate("<<ComboboxSelected>>")
+
+    # Verify the cut value has been toggled
+    assert editor.job_config.cut != initial_cut
+    assert editor.job_config.cut == (new_value == "yes")
+
+
+def test_change_sleep_time(gui_app):
+    """Test changing the sleep time updates the job config and UI."""
+    editor = gui_app.blk.job_config_editor
+    new_sleep_time = 1.5
+    editor.scl.sleep_time.set(new_sleep_time)
+    assert editor.job_config.sleep_time == new_sleep_time
+    assert editor.var.sleep_time.get() == new_sleep_time
+    assert float(editor.lbl.sleep_value["text"]) == new_sleep_time
+
+
+def test_sync_from_model(gui_app):
+    """Test that sync_from_model updates the UI correctly."""
+    editor = gui_app.blk.job_config_editor
+    job_config_manager = editor.gui.blk.job_config_manager
+
+    # Create a test config
+    test_config = JobConfig(
+        resource_list=[Resource("test.txt")],
+        printer_config="test_printer.yml",
+        cut=True,
+        sleep_time=1.0,
+    )
+
+    # Set the job config and sync
+    job_config_manager.job_config = test_config
+    editor.sync_from_model()
+
+    # Verify UI is in sync with the model
+    assert "test.txt" in editor.var.resource_list.get()
+    assert editor.var.printer_config.get() == "test_printer.yml"
+    assert editor.cbx.cut.get() == "yes"
+    assert editor.var.sleep_time.get() == 1.0
+
+    # Verify filename indicator if it exists
+    if hasattr(job_config_manager.var, "filename_indicator"):
+        # The filename should be the default one set in JobConfigManager.__init__
+        assert job_config_manager.var.filename_indicator.get() == "tmp-print-job.json"

{tinyprint-0.2.2 → tinyprint-0.2.4}/tests/test_integration.py

@@ -13,7 +13,7 @@ from tinyprint.job import Job
 from tinyprint.jobconfig import JobConfig, Resource, Orientation
 
 # Test data directory
-TEST_DATA = Path(__file__).parent / "data"
+TEST_DATA = Path(__file__).absolute().parent / "data"
 
 # Test configurations
 RESOURCES = {
@@ -69,4 +69,4 @@ def test_print(snapshot, resource_path_list, config_kwargs):
     job.start()
     job.wait()
 
-    assert snapshot == job.manager.printer.output
+    assert snapshot == job.manager.printer.output, resource_path_list

{tinyprint-0.2.2 → tinyprint-0.2.4}/tinyprint/gui.py

@@ -224,7 +224,10 @@ class JobConfigEditor(Block):
         )
 
     def select_file(self, attr, filetypes, multiple=False):
-        if file_list := super().select_file(filetypes, multiple):
+        file_list = super().select_file(filetypes, multiple)
+        if multiple is False:
+            file_list = [file_list] if file_list else []
+        if file_list:
             setattr(
                 self.job_config,
                 attr,

{tinyprint-0.2.2 → tinyprint-0.2.4}/tinyprint/preprocessor.py

@@ -4,6 +4,7 @@ import abc
 from functools import cached_property
 import mimetypes
 import os
+from pathlib import Path
 from tempfile import TemporaryDirectory
 from typing import Callable, TypeAlias, Optional
 
@@ -31,26 +32,26 @@ def create_pages_from_resources(config, printer_profile) -> tuple[Page, ...]:
 def get_preprocessor_for_resource(resource: Resource) -> type[Preprocessor]:
     """Return the appropriate preprocessor class for the given resource."""
     path = resource.path
-    if _is_binary_file(path):
+    if _is_text_file(path):
+        return MarkdownPreprocessor
+    else:
         m = mimetypes.guess_type(path)
         if m[0]:
             if m[0].startswith("image"):
                 return ImagePreprocessor
             elif m[0] == "application/pdf":
                 return PdfPreprocessor
-    else:
-        return MarkdownPreprocessor
     raise NotImplementedError(f"can't guess type of {path}")
 
 
 # helper
-def _is_binary_file(path):
-    with open(path, "rb") as f:
-        header = f.read(1024)
-    textchars = bytearray(
-        {7, 8, 9, 10, 12, 13, 27} | set(range(0x20, 0x100)) - {0x7F},
-    )
-    return bool(header.translate(None, textchars))
+def _is_text_file(path, blocksize=4096):
+    try:
+        with open(path, "rb") as f:
+            f.read(blocksize).decode("utf-8")
+        return True
+    except UnicodeDecodeError:
+        return False
 
 
 class Preprocessor(abc.ABC):
@@ -144,6 +145,7 @@ class MarkdownPreprocessor(Preprocessor):
             md = f.read()
 
         def _(printer):
+            self.markdown.renderer.set_markdown_path(resource.path)
             self.markdown.renderer.set_printer(printer)
             self.markdown.renderer.set_config(self.config)
             self.markdown.renderer.set_printer_profile(self.printer_profile)
@@ -192,7 +194,8 @@ class _EscposRenderer(marko.renderer.Renderer):
         return ""
 
     def render_image(self, element) -> str:
-        resource = Resource(path=element.dest)
+        path = _resolve_path(element.dest, self._markdown_path)
+        resource = Resource(path=path)
         get_image_page(resource, self._config, self._printer_profile)(self._printer)
         return ""
 
@@ -241,6 +244,9 @@ class _EscposRenderer(marko.renderer.Renderer):
     def set_printer_profile(self, printer_profile):
         self._printer_profile = printer_profile
 
+    def set_markdown_path(self, markdown_path):
+        self._markdown_path = markdown_path
+
     def _set(self, *args, **kwargs):
         if self._printer:
             self._printer.set(*args, **kwargs)
@@ -273,3 +279,13 @@ class _EscposRenderer(marko.renderer.Renderer):
     @max_char_count.setter
     def max_char_count(self, max_char_count: int):
         self._max_char_count = max_char_count
+
+
+def _resolve_path(path: str, markdown_path: str) -> str:
+    p = Path(path)
+
+    if p.is_absolute():
+        return path
+
+    markdown_dir = Path(markdown_path).parent
+    return str((markdown_dir / p).resolve())

{tinyprint-0.2.2 → tinyprint-0.2.4}/tinyprint.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: tinyprint
-Version: 0.2.2
+Version: 0.2.4
 Summary: ui & cli to print zines with esc/pos printer
 Author-email: Levin Eric Zimmermann <levin.eric.zimmermann@posteo.com>
 License: GPL
@@ -23,3 +23,31 @@ Dynamic: license-file
 # tinyprint
 
 Software for printing tiny zines with ESC/POS printer.
+
+![gui screenshot](screenshot.jpg)
+
+## Installation
+
+### MacOS
+
+Open a console and type:
+
+```bash
+/bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)
+brew install python
+brew install python-tk
+brew install pipx
+pipx install tinyprint
+```
+
+## Linux
+
+Install python, and then just use pip:
+
+```bash
+pip3 install tinyprint
+```
+
+## Windows
+
+I don't know, but if someone manages, please let us know.

{tinyprint-0.2.2 → tinyprint-0.2.4}/tinyprint.egg-info/SOURCES.txt

@@ -1,6 +1,7 @@
 LICENSE
 README.md
 pyproject.toml
+tests/test_gui.py
 tests/test_integration.py
 tests/test_job.py
 tests/test_jobconfig.py

tinyprint-0.2.2/README.md

@@ -1,3 +0,0 @@
-# tinyprint
-
-Software for printing tiny zines with ESC/POS printer.