zebra-day 1.0.2__py3-none-any.whl → 2.0.0__py3-none-any.whl

zebra_day/print_mgr.py

@@ -25,6 +25,7 @@ from importlib.resources import files
 
 from zebra_day.logging_config import get_logger
 from zebra_day import paths as xdg
+import zebra_day.cmd_mgr as zdcm
 
 _log = get_logger(__name__)
 
@@ -123,9 +124,10 @@ class zpl:
             self.create_new_printers_json_with_single_test_printer(str(jcfg))
 
 
-    def probe_zebra_printers_add_to_printers_json(self, ip_stub="192.168.1", scan_wait="0.25",lab="scan-results", relative=False):
+    def probe_zebra_printers_add_to_printers_json(self, ip_stub="192.168.1", scan_wait="0.25", lab="scan-results", relative=False):
         """
-        Scan the network for zebra printers
+        Scan the network for zebra printers.
+
         NOTE! this should work with no dependencies on a MAC
         UBUNTU requires system wide net-tools (for arp)
         Others... well, this may not work
@@ -133,61 +135,106 @@ class zpl:
         ---
         Requires:
           curl is pretty standard, arp seems less so
-          arp  
+          arp
         ---
-        
-        ip_stub = all 255 possibilities will be probed beneath this
-        stub provided
-
-        can_wait = seconds to re-try probing until moving on. 0.25
-        default may be too squick
 
-        lab = code for the lab key to add/update to given finding
-        new printers. Existing printers will be over written.
+        ip_stub = all 255 possibilities will be probed beneath this stub provided
+        scan_wait = seconds to re-try probing until moving on. 0.25 default may be too quick
+        lab = code for the lab key to add/update to given finding new printers
         """
+        # Ensure schema version is set
+        if "schema_version" not in self.printers:
+            self.printers["schema_version"] = "2.0.0"
 
+        # Initialize lab with v2 structure if not exists
         if lab not in self.printers['labs']:
-            self.printers['labs'][lab] = {}
-
-        self.printers['labs'][lab]["Download-Label-png"] = {
+            self.printers['labs'][lab] = {
+                "lab_name": lab,
+                "available_locations": [],
+                "printers": {}
+            }
+
+        # Ensure lab has printers sub-object (migration from v1)
+        if "printers" not in self.printers['labs'][lab]:
+            self.printers['labs'][lab]["printers"] = {}
+            self.printers['labs'][lab].setdefault("lab_name", lab)
+            self.printers['labs'][lab].setdefault("available_locations", [])
+
+        # Add the virtual PNG printer
+        self.printers['labs'][lab]["printers"]["Download-Label-png"] = {
             "ip_address": "dl_png",
-            "label_zpl_styles": ["tube_2inX1in"],
-            "print_method": "generate png",
+            "printer_name": "Download Label as PNG",
+            "lab_location": None,
+            "manufacturer": "virtual",
             "model": "na",
             "serial": "na",
-            "arp_data": ""
+            "label_zpl_styles": ["tube_2inX1in"],
+            "default_label_style": "tube_2inX1in",
+            "print_method": "generate png",
+            "arp_data": "",
+            "notes": ""
         }
 
-        # Run scanner script using subprocess instead of os.popen
-        script_path = Path(str(files('zebra_day'))) / "bin" / "scan_for_networed_zebra_printers_curl.sh"
-        result = subprocess.run(
-            [str(script_path), ip_stub, scan_wait],
-            capture_output=True,
-            text=True,
-            check=False
-        )
-
-        for line in result.stdout.splitlines():
-            line = line.rstrip()
-            sl = line.split('|')
-            if len(sl) > 1:
-                zp = sl[0]
-                ip = sl[1]
-                model = sl[2]
-                serial = sl[3]
-                status = sl[4]
-                arp_response = sl[5]
-
-                if ip not in self.printers['labs'][lab]:
-                    # The label formats set here are the installed defaults
-                    self.printers['labs'][lab][ip] = {
-                        "ip_address": ip,
-                        "label_zpl_styles": ["tube_2inX1in", "plate_1inX0.25in", "tube_2inX0.3in"],
-                        "print_method": "unk",
-                        "model": model,
-                        "serial": serial,
-                        "arp_data": arp_response
-                    }
+        # Scan network for Zebra printers using pure Python
+        wait_time = float(scan_wait) if scan_wait else 0.25
+
+        for i in range(1, 255):
+            ip = f"{ip_stub}.{i}"
+            try:
+                # Try to connect to ZPL port (9100)
+                import socket
+                sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
+                sock.settimeout(wait_time)
+                result = sock.connect_ex((ip, 9100))
+                sock.close()
+
+                if result == 0:
+                    # Port is open, try to get printer info
+                    model = "Unknown"
+                    serial = "Unknown"
+
+                    try:
+                        # Query printer for model and serial
+                        printer = zdcm.ZebraPrinter(ip)
+                        config = printer.get_configuration()
+
+                        # Parse model from config
+                        if "MODEL" in config:
+                            for line in config.split('\n'):
+                                if "MODEL" in line.upper():
+                                    parts = line.split(':')
+                                    if len(parts) > 1:
+                                        model = parts[1].strip()
+                                        break
+
+                        # Parse serial from config
+                        if "SERIAL" in config.upper():
+                            for line in config.split('\n'):
+                                if "SERIAL" in line.upper():
+                                    parts = line.split(':')
+                                    if len(parts) > 1:
+                                        serial = parts[1].strip()
+                                        break
+                    except Exception:
+                        pass  # Use defaults if we can't query printer
+
+                    if ip not in self.printers['labs'][lab]["printers"]:
+                        # The label formats set here are the installed defaults
+                        self.printers['labs'][lab]["printers"][ip] = {
+                            "ip_address": ip,
+                            "printer_name": None,  # User can set friendly name later
+                            "lab_location": None,  # User can set location later
+                            "manufacturer": "zebra",
+                            "model": model,
+                            "serial": serial,
+                            "label_zpl_styles": ["tube_2inX1in", "plate_1inX0.25in", "tube_2inX0.3in"],
+                            "default_label_style": "tube_2inX1in",  # Default to first style
+                            "print_method": "socket",
+                            "arp_data": "",
+                            "notes": ""
+                        }
+            except Exception:
+                pass  # Skip unreachable IPs
 
         self.save_printer_json(self.printers_filename, relative=False)
 
@@ -274,15 +321,18 @@ class zpl:
 
     def clear_printers_json(self, json_file: str = "/etc/printer_config.json") -> None:
         """
-        Reset printers JSON to empty minimal structure.
+        Reset printers JSON to empty minimal v2.0.0 structure.
 
         Args:
             json_file: Path to the config file (relative to package)
         """
         json_path = Path(str(files('zebra_day'))) / json_file.lstrip('/')
 
-        # Write empty config using pathlib
-        empty_config = {"labs": {}}
+        # Write empty config with v2 schema
+        empty_config = {
+            "schema_version": "2.0.0",
+            "labs": {}
+        }
         json_path.parent.mkdir(parents=True, exist_ok=True)
         with open(json_path, 'w') as f:
             json.dump(empty_config, f, indent=4)
@@ -313,22 +363,24 @@ class zpl:
 
 
 
-    def get_valid_label_styles_for_lab(self,lab=None):
+    def get_valid_label_styles_for_lab(self, lab=None):
         """
-        The intention for this method was to confirm a template
-          being requested for use in printing to some printer
-          was 'allowed' by checking with that printers printer json
-          for the array of valid templates.
+        Get all unique label styles available for printers in a lab.
 
-        This was a huge PITA in testing, could be re-enabled at some point
+        The intention for this method was to confirm a template
+        being requested for use in printing to some printer
+        was 'allowed' by checking with that printers printer json
+        for the array of valid templates.
 
+        This was a huge PITA in testing, could be re-enabled at some point.
         It is used once, but prints a warning only.
         """
-        
         unique_labels = set()
 
-        for printer in self.printers['labs'][lab]:
-            for style in self.printers['labs'][lab][printer]['label_zpl_styles']:
+        # Access printers via nested 'printers' key (v2 schema)
+        lab_printers = self.printers['labs'][lab].get('printers', {})
+        for printer_id, printer_data in lab_printers.items():
+            for style in printer_data.get('label_zpl_styles', []):
                 unique_labels.add(style)
 
         result = list(unique_labels)
@@ -410,39 +462,43 @@ class zpl:
     def print_zpl(self, lab=None, printer_name=None, uid_barcode='', alt_a='', alt_b='', alt_c='', alt_d='', alt_e='', alt_f='', label_zpl_style=None, client_ip='pkg', print_n=1, zpl_content=None):
         """
         The main print method. Accepts info to determine the desired
-          printer IP and to request the desired ZPL string to be sent
-          to the printer.
-
-        lab = top level key in self.printers['labs']
-        printer_name = key for printer info (ie: ip_address) needed
-          to satisfy print requests.
-        label_zpl_style = template code, see above for addl deets
-        client_ip = optional, this is logged with print request info
-        print_n = integer, > 0
-        zpl_content = DO NOT USE -- hacky way to directly pass a zpl
-          string to a printer. to do: write a cleaner
-          string+ip method of printing.
-        """
+        printer IP and to request the desired ZPL string to be sent
+        to the printer.
 
+        Args:
+            lab: top level key in self.printers['labs']
+            printer_name: key for printer info (ie: ip_address) needed
+                to satisfy print requests.
+            label_zpl_style: template code, see above for addl deets
+            client_ip: optional, this is logged with print request info
+            print_n: integer, > 0
+            zpl_content: DO NOT USE -- hacky way to directly pass a zpl
+                string to a printer. to do: write a cleaner
+                string+ip method of printing.
+        """
         if print_n < 1:
             raise Exception(f"\n\nprint_n < 1 , specified {print_n}")
 
-        rec_date = str(datetime.datetime.now()).replace(' ','_')
+        rec_date = str(datetime.datetime.now()).replace(' ', '_')
         print_n = int(print_n)
 
-        if printer_name in ['','None',None] and lab in [None,'','None']:
+        if printer_name in ['', 'None', None] and lab in [None, '', 'None']:
             raise Exception(f"lab and printer_name are both required to route a zebra print request, the following was what was received: lab:{lab} & printer_name:{printer_name}")
-        
-        if label_zpl_style in [None,'','None']:
-            label_zpl_style = self.printers['labs'][lab][printer_name]['label_zpl_styles'][0]  # If a style is not specified, assume the first
-        elif label_zpl_style not in self.printers['labs'][lab][printer_name]['label_zpl_styles']:
+
+        # Access printer via nested 'printers' key (v2 schema)
+        printer_data = self.printers['labs'][lab]['printers'][printer_name]
+
+        if label_zpl_style in [None, '', 'None']:
+            # Use default_label_style if set, otherwise fall back to first in list
+            label_zpl_style = printer_data.get('default_label_style') or printer_data['label_zpl_styles'][0]
+        elif label_zpl_style not in printer_data['label_zpl_styles']:
             _log.warning(
                 "ZPL style '%s' is not valid for %s/%s. Valid styles: %s",
                 label_zpl_style, lab, printer_name,
-                self.printers['labs'][lab][printer_name]['label_zpl_styles']
+                printer_data['label_zpl_styles']
             )
 
-        printer_ip = self.printers['labs'][lab][printer_name]["ip_address"]
+        printer_ip = printer_data["ip_address"]
 
         zpl_string = ''
         if zpl_content in [None]:

zebra_day/templates/modern/config_backups.html

@@ -0,0 +1,59 @@
+{% extends "modern/base.html" %}
+
+{% block title %}Config Backups - Zebra Day{% endblock %}
+
+{% block content %}
+<div class="page-header">
+    <h1 class="page-title">Configuration Backups</h1>
+    <div class="header-actions">
+        <a href="/config" class="btn btn-outline"><i class="fas fa-arrow-left"></i> Back</a>
+    </div>
+</div>
+
+<div class="card">
+    <div class="card-header">
+        <h3 class="card-title"><i class="fas fa-history"></i> Saved Configuration Files</h3>
+        <span class="badge">{{ backup_files | length }} backups</span>
+    </div>
+    
+    <p class="text-muted mb-md" style="padding: 0 1rem;">
+        To restore a backup, download the file, open in a text editor, copy the contents, 
+        then paste into the <a href="/config/edit">config editor</a> and save.
+    </p>
+    
+    {% if backup_files %}
+    <div class="table-container">
+        <table class="table">
+            <thead>
+                <tr>
+                    <th>Filename</th>
+                    <th>Actions</th>
+                </tr>
+            </thead>
+            <tbody>
+                {% for file in backup_files %}
+                <tr>
+                    <td>
+                        <i class="fas fa-file-code text-muted"></i>
+                        {{ file }}
+                    </td>
+                    <td>
+                        <a href="/etc/old_printer_config/{{ file }}" class="btn btn-sm btn-outline" download>
+                            <i class="fas fa-download"></i> Download
+                        </a>
+                    </td>
+                </tr>
+                {% endfor %}
+            </tbody>
+        </table>
+    </div>
+    {% else %}
+    <div class="empty-state">
+        <i class="fas fa-history"></i>
+        <p>No backup files found</p>
+        <small class="text-muted">Backups are created automatically when you save configuration changes</small>
+    </div>
+    {% endif %}
+</div>
+{% endblock %}
+

zebra_day/templates/modern/config_editor.html

@@ -0,0 +1,95 @@
+{% extends "modern/base.html" %}
+
+{% block title %}{{ title }} - Zebra Day{% endblock %}
+
+{% block content %}
+<div class="page-header">
+    <h1 class="page-title">{{ title }}</h1>
+    <div class="header-actions">
+        <a href="/config" class="btn btn-outline"><i class="fas fa-arrow-left"></i> Back</a>
+        {% if mode == 'edit' %}
+        <button type="button" class="btn btn-outline" onclick="resetConfig()"><i class="fas fa-undo"></i> Reset</button>
+        <button type="button" class="btn btn-outline" onclick="clearConfig()"><i class="fas fa-trash"></i> Clear</button>
+        {% endif %}
+    </div>
+</div>
+
+{% if error_msg %}
+<div class="alert alert-error mb-lg">
+    <i class="fas fa-exclamation-circle"></i> {{ error_msg }}
+</div>
+{% endif %}
+
+<div class="card">
+    <div class="card-header">
+        <h3 class="card-title"><i class="fas fa-file-code"></i> Printer Configuration JSON</h3>
+        {% if mode == 'edit' %}
+        <span class="badge badge-warning">Editing</span>
+        {% else %}
+        <span class="badge badge-info">Read Only</span>
+        {% endif %}
+    </div>
+    <form method="post" action="/config/save">
+        <div class="form-group">
+            <textarea name="json_data" id="json-editor" class="form-control code-editor" rows="30" {% if mode != 'edit' %}readonly{% endif %}>{{ config_json }}</textarea>
+        </div>
+        {% if mode == 'edit' %}
+        <div class="form-actions">
+            <button type="submit" class="btn btn-primary" onclick="showLoading('Saving configuration...')">
+                <i class="fas fa-save"></i> Save Configuration
+            </button>
+        </div>
+        {% endif %}
+    </form>
+</div>
+
+<style>
+.code-editor {
+    font-family: 'JetBrains Mono', 'Consolas', monospace;
+    font-size: 0.875rem;
+    line-height: 1.5;
+    background: var(--color-gray-700);
+    border: 1px solid var(--color-gray-600);
+    padding: 1rem;
+    resize: vertical;
+    min-height: 400px;
+}
+.code-editor:read-only {
+    background: var(--color-gray-800);
+    cursor: default;
+}
+.form-actions {
+    display: flex;
+    gap: 1rem;
+    padding: 1rem;
+    border-top: 1px solid var(--color-gray-600);
+}
+</style>
+
+<script>
+async function resetConfig() {
+    if (confirm('Reset configuration to template defaults? This will backup the current config.')) {
+        showLoading('Resetting configuration...');
+        window.location.href = '/config/reset';
+    }
+}
+
+async function clearConfig() {
+    if (confirm('Clear all printer configuration? This will backup the current config.')) {
+        showLoading('Clearing configuration...');
+        window.location.href = '/config/clear';
+    }
+}
+
+// Auto-format JSON on blur
+document.getElementById('json-editor')?.addEventListener('blur', function() {
+    try {
+        const parsed = JSON.parse(this.value);
+        this.value = JSON.stringify(parsed, null, 4);
+    } catch (e) {
+        // Invalid JSON, leave as-is
+    }
+});
+</script>
+{% endblock %}
+

zebra_day/templates/modern/config_new.html

@@ -0,0 +1,93 @@
+{% extends "modern/base.html" %}
+
+{% block title %}New Configuration - Zebra Day{% endblock %}
+
+{% block content %}
+<div class="page-header">
+    <h1 class="page-title">Build New Configuration</h1>
+    <div class="header-actions">
+        <a href="/config" class="btn btn-outline"><i class="fas fa-arrow-left"></i> Back</a>
+    </div>
+</div>
+
+<div class="grid grid-2">
+    <!-- Network Scan -->
+    <div class="card">
+        <div class="card-header">
+            <h3 class="card-title"><i class="fas fa-wifi"></i> Scan Network for Printers</h3>
+        </div>
+        <form action="/config/scan" method="get">
+            <div class="form-group">
+                <label class="form-label">IP Range Prefix</label>
+                <input type="text" name="ip_stub" class="form-control" value="{{ ip_root }}" placeholder="192.168.1">
+                <small class="text-muted">Enter the first three octets of your network</small>
+            </div>
+            <div class="form-group">
+                <label class="form-label">Lab Name</label>
+                <input type="text" name="lab" class="form-control" value="scan-results" placeholder="Enter lab name">
+                <small class="text-muted">Printers found will be added to this lab</small>
+            </div>
+            <div class="form-group">
+                <label class="form-label">Scan Wait Time</label>
+                <select name="scan_wait" class="form-control">
+                    <option value="0.15">Fast (0.15s)</option>
+                    <option value="0.25" selected>Normal (0.25s)</option>
+                    <option value="0.5">Slow (0.5s)</option>
+                    <option value="1.0">Very Slow (1.0s)</option>
+                </select>
+                <small class="text-muted">Longer wait times find more printers on slow networks</small>
+            </div>
+            <button type="submit" class="btn btn-primary" onclick="showLoading('Scanning network for Zebra printers...')">
+                <i class="fas fa-search"></i> Start Network Scan
+            </button>
+        </form>
+    </div>
+
+    <!-- Quick Actions -->
+    <div class="card">
+        <div class="card-header">
+            <h3 class="card-title"><i class="fas fa-bolt"></i> Quick Actions</h3>
+        </div>
+        <div class="quick-actions">
+            <a href="/config/reset" class="action-card" onclick="return confirm('Reset config to template defaults?')">
+                <i class="fas fa-undo"></i>
+                <div>
+                    <strong>Reset to Template</strong>
+                    <small class="text-muted d-block">Restore default configuration</small>
+                </div>
+            </a>
+            <a href="/config/clear" class="action-card" onclick="return confirm('Clear all printer configuration?')">
+                <i class="fas fa-trash"></i>
+                <div>
+                    <strong>Clear Configuration</strong>
+                    <small class="text-muted d-block">Remove all printers</small>
+                </div>
+            </a>
+            <a href="/config/edit" class="action-card">
+                <i class="fas fa-edit"></i>
+                <div>
+                    <strong>Manual Edit</strong>
+                    <small class="text-muted d-block">Edit JSON directly</small>
+                </div>
+            </a>
+        </div>
+        
+        <hr class="my-md">
+        
+        <h4 class="mb-md">Existing Labs</h4>
+        {% if labs %}
+        <div class="grid grid-3">
+            {% for lab in labs %}
+            <a href="/printers/{{ lab }}" class="action-card">
+                <i class="fas fa-building"></i>
+                <strong>{{ lab }}</strong>
+            </a>
+            {% endfor %}
+        </div>
+        {% else %}
+        <p class="text-muted">No labs configured yet. Run a network scan to discover printers.</p>
+        {% endif %}
+    </div>
+</div>
+{% endblock %}
+

zebra_day/templates/modern/print_request.html

@@ -116,12 +116,16 @@
 
         printerSelect.innerHTML = '<option value="">Select a printer...</option>';
 
-        if (lab && labsDict[lab]) {
-            for (var printer in labsDict[lab]) {
+        if (lab && labsDict[lab] && labsDict[lab].printers) {
+            // v2 schema: printers are nested under 'printers' key
+            var printers = labsDict[lab].printers;
+            for (var printerId in printers) {
+                var printerInfo = printers[printerId];
                 var option = document.createElement('option');
-                option.value = printer;
-                option.text = printer;
-                if (printer === selectedPrinter) {
+                option.value = printerId;
+                // Display friendly name if available, otherwise use ID
+                option.text = printerInfo.printer_name || printerId;
+                if (printerId === selectedPrinter) {
                     option.selected = true;
                 }
                 printerSelect.appendChild(option);