pushraker 0.2.0__tar.gz → 0.2.2__tar.gz

{pushraker-0.2.0/src/pushraker.egg-info → pushraker-0.2.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pushraker
-Version: 0.2.0
+Version: 0.2.2
 Summary: Push notifications for Klipper printers: a Moonraker component with pictures, sent through Apprise (ntfy, Pushover, Telegram, Discord, webhooks, email)
 Author: noon92
 License-Expression: GPL-3.0-or-later
@@ -30,8 +30,8 @@ own web page, live, with no Moonraker or Klipper restart.
 
 It grew out of the Push Notifications feature of the
 [Snapmaker U1 Extended Firmware](https://github.com/paxx12-snapmaker-u1/SnapmakerU1-Extended-Firmware),
-where it is built in; the user documentation lives there
-for now: [notifications](https://snapmakeru1-extended-firmware.pages.dev/notifications).
+where it is built in. User documentation: the
+[Push Notifications guide](docs/guide.md).
 
 **Status: 0.2.** The component has been in
 use on the Snapmaker U1 for a while; the page, the settings file and the
@@ -107,6 +107,7 @@ it out again; `--purge` also removes the settings and secrets.
 - `src/pushraker/web/index.html` — the settings page
 - `src/pushraker/klipper/pushraker.cfg` — the Klipper macro file
 - `src/pushraker/__main__.py` — `python -m pushraker install|uninstall|status`
+- `docs/guide.md` — the user guide
 - `tests/` — `python tests/test_pushraker.py` (the component against a
   stand-in Moonraker; also runs `test_settings.py`)
 

{pushraker-0.2.0 → pushraker-0.2.2}/README.md

@@ -10,8 +10,8 @@ own web page, live, with no Moonraker or Klipper restart.
 
 It grew out of the Push Notifications feature of the
 [Snapmaker U1 Extended Firmware](https://github.com/paxx12-snapmaker-u1/SnapmakerU1-Extended-Firmware),
-where it is built in; the user documentation lives there
-for now: [notifications](https://snapmakeru1-extended-firmware.pages.dev/notifications).
+where it is built in. User documentation: the
+[Push Notifications guide](docs/guide.md).
 
 **Status: 0.2.** The component has been in
 use on the Snapmaker U1 for a while; the page, the settings file and the
@@ -87,6 +87,7 @@ it out again; `--purge` also removes the settings and secrets.
 - `src/pushraker/web/index.html` — the settings page
 - `src/pushraker/klipper/pushraker.cfg` — the Klipper macro file
 - `src/pushraker/__main__.py` — `python -m pushraker install|uninstall|status`
+- `docs/guide.md` — the user guide
 - `tests/` — `python tests/test_pushraker.py` (the component against a
   stand-in Moonraker; also runs `test_settings.py`)
 

{pushraker-0.2.0 → pushraker-0.2.2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "pushraker"
-version = "0.2.0"
+version = "0.2.2"
 description = "Push notifications for Klipper printers: a Moonraker component with pictures, sent through Apprise (ntfy, Pushover, Telegram, Discord, webhooks, email)"
 readme = "README.md"
 license = "GPL-3.0-or-later"

{pushraker-0.2.0 → pushraker-0.2.2}/src/pushraker/__init__.py

@@ -4,4 +4,4 @@
 
 """Push notifications for Klipper printers, as a Moonraker component."""
 
-__version__ = "0.2.0"
+__version__ = "0.2.2"

{pushraker-0.2.0 → pushraker-0.2.2}/src/pushraker/component.py

@@ -9,7 +9,7 @@
 #  * Moonraker job events: started, paused, resumed, error (and complete /
 #    cancelled as a fallback when the print hooks did not report them).
 #  * The Klipper print hooks (`_PRINT_END_NTFY`, `_CANCEL_PRINT_NTFY`), via
-#    the `push_notification` remote method, so complete/cancelled snapshots
+#    the `pushraker` remote method (`push_notification` in 0.1), so complete/cancelled snapshots
 #    are taken before the printer parks.
 #  * Snapmaker's exception manager: coded faults and warnings, including
 #    those that never reach print_stats (Klipper shutdowns, idle faults).
@@ -97,7 +97,9 @@ if TYPE_CHECKING:
 # The printer's own fault event (see printers.py); listened for from the
 # start, it simply never fires on a printer without one
 EXCEPTION_EVENTS = printers.EXCEPTION_EVENTS
-REMOTE_METHOD = "push_notification"
+REMOTE_METHOD = "pushraker"
+# The 0.1 name, still answered (a Klipper macro file from 0.1 calls it)
+OLD_REMOTE_METHOD = "push_notification"
 MILESTONES = (25, 50, 75)
 ROW_IDS = (
     "started", "layer_started", "first_layer", "progress_25", "progress_50", "progress_75",
@@ -660,7 +662,9 @@ class PushNotifications:
             "~/printer_data")
         config_dir = os.path.dirname(app_args.get("config_file") or "") \
             or os.path.join(data_path, "config")
-        self._low_path = os.path.join(data_path, ".push_notifications.json")
+        self._low_path = os.path.join(data_path, ".pushraker.json")
+        # 0.1 kept it under this name; moved on first read
+        self._old_low_path = os.path.join(data_path, ".push_notifications.json")
         # Where the settings come from: pushraker.conf (the page edits it,
         # the component re-reads it), or, when the [pushraker]
         # section itself carries notification options, those (the old
@@ -699,6 +703,7 @@ class PushNotifications:
         self.server.register_event_handler(
             "server:klippy_ready", self._on_klippy_ready)
         self.server.register_remote_method(REMOTE_METHOD, self._on_remote)
+        self.server.register_remote_method(OLD_REMOTE_METHOD, self._on_remote)
         self.server.register_event_handler(
             "server:gcode_response", self._on_gcode_response)
         if self.store is not None:
@@ -1385,7 +1390,7 @@ class PushNotifications:
         if not data.startswith(b"\xff\xd8") or len(data) > SNAPSHOT_MAX:
             logging.warning("[pushraker] snapshot is not a JPEG")
             return None
-        tmpdir = tempfile.mkdtemp(prefix="push_notifications_")
+        tmpdir = tempfile.mkdtemp(prefix="pushraker_")
         path = os.path.join(tmpdir, "snapshot.jpg")
         try:
             with open(path, "wb") as f:
@@ -1525,7 +1530,7 @@ class PushNotifications:
         try:
             name = self._image_name(title, filename or self._job_filename,
                                     os.path.splitext(path)[1] or ".jpg")
-            tmpdir = tempfile.mkdtemp(prefix="push_notifications_")
+            tmpdir = tempfile.mkdtemp(prefix="pushraker_")
             dest = os.path.join(tmpdir, name)
             shutil.copyfile(path, dest)
             return dest
@@ -1581,7 +1586,7 @@ class PushNotifications:
         """Emails about one print go in one thread: the same subject
         (printer and file name; the notification's title moves into the
         email) and References to the same thread id. Others keep their
-        title as subject. Sent as an HTML card (push_notifications_email)
+        title as subject. Sent as an HTML card (email_html)
         with the image inline. The headers are set right before each attempt
         (the channel sends one at a time)."""
         thread = self._thread_for(rid)
@@ -3353,6 +3358,12 @@ class PushNotifications:
 
     def _low_load(self) -> Dict[str, float]:
         if self._low_sent is None:
+            if (not os.path.exists(self._low_path)
+                    and os.path.exists(self._old_low_path)):
+                try:
+                    os.replace(self._old_low_path, self._low_path)
+                except OSError:
+                    pass
             try:
                 with open(self._low_path) as f:
                     data = json.load(f)
@@ -4188,7 +4199,7 @@ class PushNotifications:
     def _render_rows(self, rows: List[Dict[str, Any]]) -> Optional[str]:
         if images is None:
             return None
-        tmpdir = tempfile.mkdtemp(prefix="push_notifications_")
+        tmpdir = tempfile.mkdtemp(prefix="pushraker_")
         try:
             return images.render(rows, os.path.join(tmpdir, "spools.jpg"))
         except Exception as e:

{pushraker-0.2.0 → pushraker-0.2.2}/src/pushraker/discord.py

@@ -2,7 +2,7 @@
 # SPDX-PackageHomePage: https://github.com/noon92/pushraker
 # SPDX-FileCopyrightText: Copyright (c) 2026 @noon92
 
-# Discord senders for push_notifications, registered as Apprise plugins so
+# Discord senders for pushraker, registered as Apprise plugins so
 # they get the same queues, retries and fallbacks as the other services:
 #
 #   discordhook://<webhook id>/<webhook token>?name=U1&ping=<mention>
@@ -30,7 +30,7 @@ from apprise.decorators import notify
 API = "https://discord.com/api/v10"
 USER_AGENT = ("DiscordBot (https://github.com/paxx12-snapmaker-u1/"
               "SnapmakerU1-Extended-Firmware, 1)")
-TIMEOUT = (10., 60.)      # connect, read: same as push_notifications
+TIMEOUT = (10., 60.)      # connect, read: same as the component
 # Embed bar colours, matching the spool pictures
 COLOURS = {"info": 0x5F6269, "success": 0x24743A, "warning": 0xC46800,
            "failure": 0xB02626}

{pushraker-0.2.0 → pushraker-0.2.2}/src/pushraker/email_html.py

@@ -2,7 +2,7 @@
 # SPDX-PackageHomePage: https://github.com/noon92/pushraker
 # SPDX-FileCopyrightText: Copyright (c) 2026 @noon92
 
-# HTML emails for push_notifications (and the Firmware Config test): a card
+# HTML emails for pushraker: a card
 # with a colour bar for the kind of notification, the title, the text, the
 # image inline, and the links as buttons. Inline styles and tables only, so
 # it looks the same in Gmail, Outlook and phone mail apps. Apprise adds a

{pushraker-0.2.0 → pushraker-0.2.2}/src/pushraker/images.py

@@ -2,7 +2,7 @@
 # SPDX-PackageHomePage: https://github.com/noon92/pushraker
 # SPDX-FileCopyrightText: Copyright (c) 2026 @noon92
 
-# Spool pictures for the Spoolman notifications of push_notifications.
+# Spool pictures for pushraker's Spoolman notifications.
 #
 # One row per toolhead: its spool, drawn in the filament's colour (or
 # colours: wedges and stripes for a multi-colour filament) and filled

{pushraker-0.2.0 → pushraker-0.2.2}/src/pushraker/klipper/pushraker.cfg

@@ -52,9 +52,9 @@ gcode:
     M400
 
 [gcode_macro _NTFY_SEND]
-description: Report a print hook event to the push_notifications component
+description: Report a print hook event to the pushraker component
 gcode:
-    {action_call_remote_method("push_notification", event=params.EVENT)}
+    {action_call_remote_method("pushraker", event=params.EVENT)}
 
 [gcode_macro _PRINT_END_NTFY]
 description: Notify print complete (call at the start of PRINT_END)

{pushraker-0.2.0 → pushraker-0.2.2}/src/pushraker/web/index.html

@@ -2,7 +2,7 @@
 <!-- SPDX-License-Identifier: GPL-3.0-or-later -->
 <!-- SPDX-PackageHomePage: https://github.com/noon92/pushraker -->
 <!-- SPDX-FileCopyrightText: Copyright (c) 2026 @noon92 -->
-<!-- pushraker's settings page. Talks to Moonraker's push_notifications
+<!-- pushraker's settings page. Talks to Moonraker's pushraker
      component (GET/POST /server/pushraker/config, POST .../test),
      through the same origin (nginx proxies /server/ to Moonraker, as the
      Fluidd and Mainsail setups do) or Moonraker's own port. -->
@@ -20,6 +20,8 @@
     .container { max-width: 900px; margin: 0 auto; }
     h1 { color: var(--accent); margin-bottom: 16px; font-size: 22px; display: flex; justify-content: space-between; align-items: center; gap: 12px; flex-wrap: wrap; }
     h1 small { font-size: 12px; color: var(--muted); font-weight: normal; }
+    h1 small a { margin-right: 10px; }
+    .nt-guide { font-size: 12px; font-weight: 500; margin-left: 10px; }
     .card { background: var(--card); border-radius: 8px; padding: 16px; margin-bottom: 16px; }
     .btn { border: none; padding: 8px 16px; border-radius: 6px; cursor: pointer; font-size: 13px; font-weight: 600; min-height: 34px; }
     .btn:disabled { opacity: 0.5; cursor: not-allowed; }
@@ -29,16 +31,33 @@
     .btn-secondary:hover:not(:disabled) { background: #666; }
     .pr-actions { display: flex; gap: 10px; align-items: center; flex-wrap: wrap; position: sticky; bottom: 0; background: var(--bg); padding: 12px 0; }
     .pr-status { font-size: 13px; color: var(--muted); }
-    .pr-console { background: #111; color: #ddd; font-family: monospace; font-size: 12px; padding: 12px; border-radius: 6px; white-space: pre-wrap; max-height: 320px; overflow: auto; margin-bottom: 16px; display: none; }
+    /* Save & Apply is a group of its own: a gap from Cancel and Send Test
+       (on a phone: one line, those two at the left, it at the right) */
+    .btn-save { background: #2e7d32; color: #fff; font-size: 15px; min-height: 42px; padding: 10px 24px; margin-left: 40px; }
+    @media (max-width: 600px) {
+        .btn-save { margin-left: auto; padding: 10px 16px; white-space: nowrap; }
+        .pr-actions .btn { white-space: nowrap; }
+        .pr-status { flex-basis: 100%; }
+    }
+    .btn-save:hover:not(:disabled) { background: #388e3c; }
+    .pr-console { background: #111; color: #ddd; font-family: monospace; font-size: 12px; padding: 12px; border-radius: 6px; white-space: pre-wrap; max-height: 320px; overflow: auto; margin-bottom: 16px; display: none; scroll-margin-bottom: 90px; }
     .pr-console .err { color: var(--error); font-weight: 600; }
     .pr-console .ok { color: var(--success); }
-    .pr-error { color: var(--error); font-size: 13px; margin: 8px 0; font-weight: 500; }
+    .pr-error { color: var(--error); font-size: 13px; margin: 8px 0; font-weight: 500; scroll-margin-bottom: 90px; }
     .pr-modal { position: fixed; inset: 0; background: rgba(0,0,0,0.7); display: none; align-items: center; justify-content: center; z-index: 10; padding: 20px; }
     .pr-modal.open { display: flex; }
     .pr-modal-box { background: var(--card); border-radius: 8px; padding: 20px; max-width: 480px; width: 100%; }
     .pr-modal-box h3 { color: #fff; margin-bottom: 12px; font-size: 16px; }
     .pr-modal-box p { white-space: pre-wrap; margin-bottom: 20px; font-size: 14px; line-height: 1.5; }
     .pr-modal-box .pr-buttons { display: flex; gap: 10px; justify-content: flex-end; }
+    .pr-discard .pr-modal-box { border: 3px solid #d32f2f; }
+    .pr-discard h3 { color: #ff5252; font-size: 24px; font-weight: 800; text-transform: uppercase; letter-spacing: 0.5px; }
+    .pr-discard p { color: #ff8a80; font-size: 18px; font-weight: 700; }
+    .pr-discard .btn { font-size: 15px; min-height: 42px; padding: 10px 18px; }
+    .btn-keep { background: #2e7d32; color: #fff; }
+    .btn-keep:hover { background: #388e3c; }
+    .btn-discard { background: #c62828; color: #fff; }
+    .btn-discard:hover:not(:disabled) { background: #d32f2f; }
     .pr-loading { color: var(--muted); padding: 24px; text-align: center; }
     .pr-hidden { display: none !important; }
     .nt { font-size: 14px; }
@@ -106,7 +125,7 @@
 </head>
 <body>
 <div class="container">
-<h1><span>Push notifications</span><small id="pr-version"></small></h1>
+<h1><span>Push notifications</span><small><a href="https://github.com/noon92/pushraker/blob/main/docs/guide.md" target="_blank">Guide</a><span id="pr-version"></span></small></h1>
 <div class="card">
 <div class="pr-loading" id="pr-loading">Loading settings…</div>
 <div class="nt pr-hidden" id="nt-root">
@@ -254,7 +273,7 @@
         </div>
         </div>
 
-        <div class="nt-section">Email</div>
+        <div class="nt-section">Email<a class="nt-guide" href="https://github.com/noon92/pushraker/blob/main/docs/guide.md#email" target="_blank">Guide</a></div>
         <label class="nt-enable nt-sec"><input type="checkbox" id="nt-email-enabled"> Send email notifications</label>
         <div class="nt-grid" id="nt-email">
             <div class="nt-field">
@@ -300,7 +319,7 @@
             </div>
         </div>
 
-        <div class="nt-section">Webhook</div>
+        <div class="nt-section">Webhook<a class="nt-guide" href="https://github.com/noon92/pushraker/blob/main/docs/guide.md#webhook" target="_blank">Guide</a></div>
         <label class="nt-enable nt-sec"><input type="checkbox" id="nt-wh-enabled"> Send every notification to a webhook</label>
         <div class="nt-grid" id="nt-webhook">
             <div class="nt-field">
@@ -384,11 +403,23 @@
 <div class="pr-console" id="pr-console"></div>
 <div class="pr-error" id="pr-error" style="display:none"></div>
 <div class="pr-actions">
-    <button type="button" class="btn btn-primary" id="pr-save">Save &amp; Apply</button>
+    <button type="button" class="btn btn-secondary" id="pr-close">Cancel</button>
     <button type="button" class="btn btn-secondary" id="pr-test">Send Test</button>
+    <button type="button" class="btn btn-save" id="pr-save">Save &amp; Apply</button>
     <span class="pr-status" id="pr-status"></span>
 </div>
 
+<div class="pr-modal pr-discard" id="pr-discard" role="alertdialog" aria-labelledby="pr-discard-title">
+    <div class="pr-modal-box">
+        <h3 id="pr-discard-title">⚠ Warning: your changes will be lost</h3>
+        <p>You are leaving without saving. The changes you made on this page will NOT be kept.</p>
+        <div class="pr-buttons">
+            <button type="button" class="btn btn-discard" id="pr-discard-yes" disabled>Discard changes</button>
+            <button type="button" class="btn btn-keep" id="pr-discard-no">Keep editing</button>
+        </div>
+    </div>
+</div>
+
 <div class="pr-modal" id="pr-modal">
     <div class="pr-modal-box">
         <h3 id="pr-modal-title"></h3>
@@ -557,6 +588,14 @@
         el('nt-table').classList.toggle('nt-no-email', !email);
     }
 
+    // The user guide, and the section of it for each push service
+    const GUIDE = 'https://github.com/noon92/pushraker/blob/main/docs/guide.md';
+    const guideLink = (anchor, text) =>
+        ` <a href="${GUIDE}#${anchor}" target="_blank">${text || 'Setup guide'}</a>`;
+    const PROVIDER_GUIDE = {
+        ntfy: ['ntfy-server', 'Hosting your own ntfy'], gotify: ['gotify'],
+        telegram: ['telegram'], discord_dm: ['discord'], discord: ['discord']
+    };
     const PROVIDER_HINTS = {
         ntfy: '<a href="https://ntfy.sh" target="_blank">ntfy</a>: free and open source; use the public server or host your own.',
         gotify: '<a href="https://gotify.net" target="_blank">Gotify</a>: free and open source, on your own server.<div class="nt-public">Text only: picture attachments not supported by Gotify.</div>',
@@ -672,7 +711,8 @@
     function updateProvider() {
         const provider = el('nt-provider').value;
         el('nt-ntfy').style.display = provider === 'ntfy' ? '' : 'none';
-        el('nt-provider-hint').innerHTML = PROVIDER_HINTS[provider] || '';
+        const g = PROVIDER_GUIDE[provider];
+        el('nt-provider-hint').innerHTML = (PROVIDER_HINTS[provider] || '') + (g ? guideLink(g[0], g[1]) : '');
         el('nt-pushover').style.display = provider === 'pushover' ? '' : 'none';
         el('nt-gotify').style.display = provider === 'gotify' ? '' : 'none';
         el('nt-gt-token').placeholder = state.has_secret && state.provider === 'gotify' ? 'Saved (leave empty to keep)' : '';
@@ -950,6 +990,7 @@
     function showError(msg) {
         el('pr-error').textContent = msg || '';
         el('pr-error').style.display = msg ? '' : 'none';
+        if (msg) el('pr-error').scrollIntoView({ block: 'nearest', behavior: 'smooth' });
     }
 
     function showConsole(lines, ok) {
@@ -958,8 +999,11 @@
             const c = l.startsWith('!! ') ? 'err' : (/^(Sent to|Test notification sent|Settings saved)/.test(l) ? 'ok' : '');
             return `<div class="${c}">${esc(l.replace(/^!! /, ''))}</div>`;
         }).join('');
-        box.style.display = lines.length ? '' : 'none';
+        box.style.display = lines.length ? 'block' : 'none';
         box.scrollTop = box.scrollHeight;
+        // The console is at the end of the page: bring it into view, or
+        // on a long page it is never seen
+        if (lines.length) box.scrollIntoView({ block: 'nearest', behavior: 'smooth' });
     }
 
     function busy(on, what) {
@@ -977,8 +1021,8 @@
             const data = await api('/server/pushraker/config', 'POST', payload);
             const notes = (data.notes || []).slice();
             render(data);
-            showConsole(['Settings saved and applied.'].concat(notes), true);
-            el('pr-status').textContent = data.meta.summary || 'Saved';
+            showConsole(['Settings saved and applied. Nothing restarts: they are in effect now, during a print job too.'].concat(notes), true);
+            el('pr-status').textContent = 'Saved and applied';
         } catch (e) {
             showError(e.message);
             el('pr-status').textContent = '';
@@ -996,10 +1040,11 @@
         try {
             const data = await api('/server/pushraker/test', 'POST', payload);
             showConsole(data.lines || [], data.ok);
-            el('pr-status').textContent = data.ok ? 'Test sent' : 'Test failed';
+            if (data.ok) el('pr-status').textContent = 'Test sent';
+            else el('pr-status').innerHTML = 'Test failed.' + guideLink('troubleshooting', 'Troubleshooting');
         } catch (e) {
             showConsole(['!! ' + e.message], false);
-            el('pr-status').textContent = 'Test failed';
+            el('pr-status').innerHTML = 'Test failed.' + guideLink('troubleshooting', 'Troubleshooting');
         } finally {
             busy(false);
         }
@@ -1022,14 +1067,58 @@
                 };
                 return;
             }
-            el('pr-loading').textContent = `Could not load the settings from Moonraker: ${e.message}. Is the push_notifications component enabled?`;
+            el('pr-loading').textContent = `Could not load the settings from Moonraker: ${e.message}. Is the pushraker component enabled ([pushraker] in moonraker.conf)?`;
         }
     }
 
     el('pr-save').onclick = save;
     el('pr-test').onclick = test;
+    // Close without saving: embedded (an iframe in a host page's modal),
+    // tell the host, which closes it; on its own, go back to the page it
+    // was opened from, or close the tab, or go to the printer's start page
+    let closing = false;
+    const dirty = () => !!state && JSON.stringify(collect(false)) !== saved;
+    // With unsaved changes, a warning first: the discard button only
+    // works after 5 seconds, so a misclick can't throw the changes away
+    function confirmDiscard() {
+        return new Promise(resolve => {
+            const box = el('pr-discard'), yes = el('pr-discard-yes'), no = el('pr-discard-no');
+            let left = 5, timer = null;
+            const tick = () => {
+                yes.disabled = left > 0;
+                yes.textContent = left > 0 ? `Discard changes (${left})` : 'Discard changes';
+                if (left-- > 0) timer = setTimeout(tick, 1000);
+            };
+            const done = v => {
+                clearTimeout(timer);
+                document.removeEventListener('keydown', esc);
+                box.classList.remove('open');
+                resolve(v);
+            };
+            const esc = e => { if (e.key === 'Escape') done(false); };
+            yes.onclick = () => { if (!yes.disabled) done(true); };
+            no.onclick = () => done(false);
+            box.onclick = e => { if (e.target === box) done(false); };
+            document.addEventListener('keydown', esc);
+            box.classList.add('open');
+            no.focus();
+            tick();
+        });
+    }
+    el('pr-close').onclick = async () => {
+        if (dirty() && !(await confirmDiscard())) return;
+        closing = true;
+        if (window.parent !== window) {
+            window.parent.postMessage({ type: 'pushraker:close' }, '*');
+            return;
+        }
+        if (history.length > 1) { history.back(); return; }
+        window.close();
+        setTimeout(() => { location.href = '/'; }, 300);
+    };
     window.addEventListener('beforeunload', e => {
-        if (state && JSON.stringify(collect(false)) !== saved) { e.preventDefault(); e.returnValue = ''; }
+        if (closing) return;
+        if (dirty()) { e.preventDefault(); e.returnValue = ''; }
     });
     load();
 })();

{pushraker-0.2.0 → pushraker-0.2.2/src/pushraker.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pushraker
-Version: 0.2.0
+Version: 0.2.2
 Summary: Push notifications for Klipper printers: a Moonraker component with pictures, sent through Apprise (ntfy, Pushover, Telegram, Discord, webhooks, email)
 Author: noon92
 License-Expression: GPL-3.0-or-later
@@ -30,8 +30,8 @@ own web page, live, with no Moonraker or Klipper restart.
 
 It grew out of the Push Notifications feature of the
 [Snapmaker U1 Extended Firmware](https://github.com/paxx12-snapmaker-u1/SnapmakerU1-Extended-Firmware),
-where it is built in; the user documentation lives there
-for now: [notifications](https://snapmakeru1-extended-firmware.pages.dev/notifications).
+where it is built in. User documentation: the
+[Push Notifications guide](docs/guide.md).
 
 **Status: 0.2.** The component has been in
 use on the Snapmaker U1 for a while; the page, the settings file and the
@@ -107,6 +107,7 @@ it out again; `--purge` also removes the settings and secrets.
 - `src/pushraker/web/index.html` — the settings page
 - `src/pushraker/klipper/pushraker.cfg` — the Klipper macro file
 - `src/pushraker/__main__.py` — `python -m pushraker install|uninstall|status`
+- `docs/guide.md` — the user guide
 - `tests/` — `python tests/test_pushraker.py` (the component against a
   stand-in Moonraker; also runs `test_settings.py`)
 

{pushraker-0.2.0 → pushraker-0.2.2}/tests/test_pushraker.py

@@ -230,7 +230,7 @@ class Config:
         return self.server
 
     def get_name(self):
-        return "push_notifications"
+        return "pushraker"
 
     def get(self, key, default=None):
         return self.values.get(key, default)
@@ -305,9 +305,10 @@ def make(values, services):
     email)]}."""
     server = Server()
     os.makedirs(os.path.join(WORK, "data"), exist_ok=True)
-    state = os.path.join(WORK, "data", ".push_notifications.json")
-    if os.path.exists(state):
-        os.remove(state)
+    for state in (".pushraker.json", ".push_notifications.json"):
+        state = os.path.join(WORK, "data", state)
+        if os.path.exists(state):
+            os.remove(state)
     c = pn.PushNotifications(Config(server, dict(
         dict(name="U1", settle_time="0.1", settings="options"), **values)))
     c.rows = {rid: ("snapshot" if not rid.startswith(("filament", "spool", "slot"))
@@ -777,7 +778,7 @@ async def test_faults_over_a_job():
     STATE["print_stats"] = ps("printing", exception=ex)
     await events(JobEvent.RESUMED, {}, STATE["print_stats"])
     # ...nor a cancel from the print hook
-    await server.remote["push_notification"](event="cancelled")
+    await server.remote["pushraker"](event="cancelled")
     await asyncio.sleep(0.6)
     titles = [e["title"].split(" ", 1)[1] for e in log]
     check("a resumed fault doesn't colour a later pause or cancel",
@@ -808,7 +809,7 @@ async def test_faults_over_a_job():
     STATE["print_stats"] = ps("paused", exception=ex)
     c._faults_sent.clear()
     await events(JobEvent.PAUSED, {}, STATE["print_stats"])
-    await server.remote["push_notification"](event="cancelled")
+    await server.remote["pushraker"](event="cancelled")
     await asyncio.sleep(0.6)
     titles = [e["title"].split(" ", 1)[1] for e in log]
     check("cancel after a reported fault-pause: no second error",
@@ -2242,6 +2243,23 @@ async def test_config_lines():
     SECRETS.clear()
 
 
+async def test_old_names():
+    """0.1's names keep working: the remote method, the low-spool memory."""
+    data = os.path.join(WORK, "data")
+    server, c = make({}, {})
+    check("remote method answered under both names",
+          "pushraker" in server.remote and "push_notification" in server.remote,
+          sorted(server.remote))
+    old = os.path.join(data, ".push_notifications.json")
+    with open(old, "w") as f:
+        json.dump({"low_sent": {"7": 123.0}}, f)
+    c._low_sent = None
+    got = c._low_load()
+    check("0.1's low-spool memory is moved to .pushraker.json",
+          got == {"7": 123.0} and not os.path.exists(old)
+          and os.path.exists(os.path.join(data, ".pushraker.json")), got)
+
+
 async def run_component_tests():
     for t in (test_order_and_priority, test_expiry_and_independence,
               test_fault_dedup, test_same_preparation_everywhere,
@@ -2249,7 +2267,7 @@ async def run_component_tests():
               test_faults_over_a_job, test_spool_switch, test_ace, test_file_pauses, test_file_mode, test_generic_printer, test_status_report, test_time_left, test_calibration, test_gotify, test_image_names, test_fault_emoji, test_send_gap, test_macro_notify, test_queue_line, test_chamber, test_filament_change, test_backup_order, test_console,
               test_driver_hot,
               test_print_by_object,
-              test_no_secrets_in_logs, test_config_lines):
+              test_no_secrets_in_logs, test_config_lines, test_old_names):
         try:
             await t()
         except Exception as e:  # report and carry on