From 8b0dd6aeddf401e02fcc28bcd1b8496736dae739 Mon Sep 17 00:00:00 2001 From: Andreas Mieke Date: Wed, 17 Apr 2024 21:07:18 -0400 Subject: [PATCH 01/24] Initial commit --- .gitignore | 228 +++++++++++++++++++++++++++++++++++++++++++++++++++++ README.md | 3 + 2 files changed, 231 insertions(+) create mode 100644 .gitignore create mode 100644 README.md diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..16e5ac0 --- /dev/null +++ b/.gitignore @@ -0,0 +1,228 @@ +# Created by https://www.toptal.com/developers/gitignore/api/macos,python,visualstudiocode +# Edit at https://www.toptal.com/developers/gitignore?templates=macos,python,visualstudiocode + +### macOS ### +# General +.DS_Store +.AppleDouble +.LSOverride + +# Icon must end with two \r +Icon + + +# Thumbnails +._* + +# Files that might appear in the root of a volume +.DocumentRevisions-V100 +.fseventsd +.Spotlight-V100 +.TemporaryItems +.Trashes +.VolumeIcon.icns +.com.apple.timemachine.donotpresent + +# Directories potentially created on remote AFP share +.AppleDB +.AppleDesktop +Network Trash Folder +Temporary Items +.apdisk + +### macOS Patch ### +# iCloud generated files +*.icloud + +### Python ### +# Byte-compiled / optimized / DLL files +__pycache__/ +*.py[cod] +*$py.class + +# C extensions +*.so + +# Distribution / packaging +.Python +build/ +develop-eggs/ +dist/ +downloads/ +eggs/ +.eggs/ +lib/ +lib64/ +parts/ +sdist/ +var/ +wheels/ +share/python-wheels/ +*.egg-info/ +.installed.cfg +*.egg +MANIFEST + +# PyInstaller +# Usually these files are written by a python script from a template +# before PyInstaller builds the exe, so as to inject date/other infos into it. +*.manifest +*.spec + +# Installer logs +pip-log.txt +pip-delete-this-directory.txt + +# Unit test / coverage reports +htmlcov/ +.tox/ +.nox/ +.coverage +.coverage.* +.cache +nosetests.xml +coverage.xml +*.cover +*.py,cover +.hypothesis/ +.pytest_cache/ +cover/ + +# Translations +*.mo +*.pot + +# Django stuff: +*.log +local_settings.py +db.sqlite3 +db.sqlite3-journal + +# Flask stuff: +instance/ +.webassets-cache + +# Scrapy stuff: +.scrapy + +# Sphinx documentation +docs/_build/ + +# PyBuilder +.pybuilder/ +target/ + +# Jupyter Notebook +.ipynb_checkpoints + +# IPython +profile_default/ +ipython_config.py + +# pyenv +# For a library or package, you might want to ignore these files since the code is +# intended to run in multiple environments; otherwise, check them in: +# .python-version + +# pipenv +# According to pypa/pipenv#598, it is recommended to include Pipfile.lock in version control. +# However, in case of collaboration, if having platform-specific dependencies or dependencies +# having no cross-platform support, pipenv may install dependencies that don't work, or not +# install all needed dependencies. +#Pipfile.lock + +# poetry +# Similar to Pipfile.lock, it is generally recommended to include poetry.lock in version control. +# This is especially recommended for binary packages to ensure reproducibility, and is more +# commonly ignored for libraries. +# https://python-poetry.org/docs/basic-usage/#commit-your-poetrylock-file-to-version-control +#poetry.lock + +# pdm +# Similar to Pipfile.lock, it is generally recommended to include pdm.lock in version control. +#pdm.lock +# pdm stores project-wide configurations in .pdm.toml, but it is recommended to not include it +# in version control. +# https://pdm.fming.dev/#use-with-ide +.pdm.toml + +# PEP 582; used by e.g. github.com/David-OConnor/pyflow and github.com/pdm-project/pdm +__pypackages__/ + +# Celery stuff +celerybeat-schedule +celerybeat.pid + +# SageMath parsed files +*.sage.py + +# Environments +.env +.venv +env/ +venv/ +ENV/ +env.bak/ +venv.bak/ + +# Spyder project settings +.spyderproject +.spyproject + +# Rope project settings +.ropeproject + +# mkdocs documentation +/site + +# mypy +.mypy_cache/ +.dmypy.json +dmypy.json + +# Pyre type checker +.pyre/ + +# pytype static type analyzer +.pytype/ + +# Cython debug symbols +cython_debug/ + +# PyCharm +# JetBrains specific template is maintained in a separate JetBrains.gitignore that can +# be found at https://github.com/github/gitignore/blob/main/Global/JetBrains.gitignore +# and can be added to the global gitignore or merged into this file. For a more nuclear +# option (not recommended) you can uncomment the following to ignore the entire idea folder. +#.idea/ + +### Python Patch ### +# Poetry local configuration file - https://python-poetry.org/docs/configuration/#local-configuration +poetry.toml + +# ruff +.ruff_cache/ + +# LSP config files +pyrightconfig.json + +### VisualStudioCode ### +.vscode/* +!.vscode/settings.json +!.vscode/tasks.json +!.vscode/launch.json +!.vscode/extensions.json +!.vscode/*.code-snippets + +# Local History for Visual Studio Code +.history/ + +# Built Visual Studio Code Extensions +*.vsix + +### VisualStudioCode Patch ### +# Ignore all local history of files +.history +.ionide + +# End of https://www.toptal.com/developers/gitignore/api/macos,python,visualstudiocode diff --git a/README.md b/README.md new file mode 100644 index 0000000..68daf74 --- /dev/null +++ b/README.md @@ -0,0 +1,3 @@ +# inventree-phomemo-plugin + +TBD From aadadd8ebfa2b010797727b196c6ae98b373706a Mon Sep 17 00:00:00 2001 From: Andreas Mieke Date: Wed, 17 Apr 2024 21:32:39 -0400 Subject: [PATCH 02/24] feat(printer): Add basic printer plugin implementation --- LICENSE | 21 +++++++++ inventree_phomemo/__init__.py | 0 inventree_phomemo/phomemo_plugin.py | 69 +++++++++++++++++++++++++++++ inventree_phomemo/version.py | 1 + setup.py | 28 ++++++++++++ 5 files changed, 119 insertions(+) create mode 100644 LICENSE create mode 100644 inventree_phomemo/__init__.py create mode 100644 inventree_phomemo/phomemo_plugin.py create mode 100644 inventree_phomemo/version.py create mode 100644 setup.py diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..6c76296 --- /dev/null +++ b/LICENSE @@ -0,0 +1,21 @@ +MIT License + +Copyright (c) 2024 Sergal.engineering + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. \ No newline at end of file diff --git a/inventree_phomemo/__init__.py b/inventree_phomemo/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/inventree_phomemo/phomemo_plugin.py b/inventree_phomemo/phomemo_plugin.py new file mode 100644 index 0000000..8366c60 --- /dev/null +++ b/inventree_phomemo/phomemo_plugin.py @@ -0,0 +1,69 @@ +# translation +from django.utils.translation import gettext_lazy as _ +from django.core.validators import MinValueValidator +from django.core.validators import MaxValueValidator + +# printer supportt +import socket + +# InvenTree plugin libs +from plugin import InvenTreePlugin +from plugin.mixins import LabelPrintingMixin, SettingsMixin + +from inventree_phomemo.version import PHOMEMO_PLUGIN_VERSION + +class PhomemoLabelPlugin(LabelPrintingMixin, SettingsMixin, InvenTreePlugin): + AUTHOR = "Sergal.engineering" + DESCRIPTION = "Label printing plugin for Phomemo printers" + VERSION = PHOMEMO_PLUGIN_VERSION + NAME = "Phomemo" + SLUG = "phomemo" + TITLE = "Phomemo Label Printer" + + SETTINGS = { + 'IP_ADDRESS': { + 'name': _('IP Address'), + 'description': _('IP address of phomemo print server'), + 'default': '', + }, + 'PORT': { + 'name': _('Port'), + 'description': _('Port of phomemo print server'), + 'default': '9100', + }, + 'THRESHOLD': { + 'name': _('Threshold'), + 'description': _('Threshold for B/W conversion (0-255)'), + 'validator': [int, MinValueValidator(0), MaxValueValidator(255)], + 'default': 200, + }, + } + + def print_label(self, **kwargs): + + # Read settings + ip_address = self.get_setting('IP_ADDRESS') + port = int(self.get_setting('PORT')) + threshold = self.get_setting('THRESHOLD') + label_image = kwargs['png_file'] + + # Extract width (x) and height (y) information. + width = kwargs['width'] + height = kwargs['height'] + + # convert image to B/W + fn = lambda x: 255 if x > threshold else 0 + label_image = label_image.convert('L').point(fn, mode='1') + + ##### Convert to phomemo + + # Send the label to the printer + try: + print_socket = socket.socket(socket.AF_INET, socket.SOCK_STREAM) + print_socket.settimeout(5) + print_socket.connect((ip_address, port)) + data = label_image + print_socket.send(data.encode()) + print_socket.close() + except Exception as error: + raise ConnectionError('Error connecting to printer server: ' + str(error)) diff --git a/inventree_phomemo/version.py b/inventree_phomemo/version.py new file mode 100644 index 0000000..aa88b61 --- /dev/null +++ b/inventree_phomemo/version.py @@ -0,0 +1 @@ +PHOMEMO_PLUGIN_VERSION = "0.0.0" \ No newline at end of file diff --git a/setup.py b/setup.py new file mode 100644 index 0000000..ab33060 --- /dev/null +++ b/setup.py @@ -0,0 +1,28 @@ +from setuptools import setup, find_packages + +from inventree_phomemo.version import PHOMEMO_PLUGIN_VERSION + +with open('README.md', encoding='utf-8') as f: + long_description = f.read() + +setup( + name = "inventree-phomemo-plugin", + version = PHOMEMO_PLUGIN_VERSION, + author = "Sergal.engineering", + author_email = "zener@theserg.al", + license = "MIT", + description = "Phomemo label plugin for InvenTree", + long_description = long_description, + long_description_content_type = 'text/markdown', + keywords = "inventree phomemo label plugin", + url = "https://git.merp.digital/sergal-engineering/inventree-phomemo-plugin/", + + packages = find_packages(), + scripts = [], + + install_requires = [], + + entry_points = { + 'inventree_plugins': [ 'PhomemoLabelPlugin = inventree_phomemo.phomemo_label:PhomemoLabelPlugin' ] + } +) From 86b1c9c1a7fa15202e7f18862ff0e0c4942a477c Mon Sep 17 00:00:00 2001 From: Andreas Mieke Date: Wed, 17 Apr 2024 21:40:36 -0400 Subject: [PATCH 03/24] fix(label): Name of plugin file --- inventree_phomemo/{phomemo_plugin.py => phomemo_label.py} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename inventree_phomemo/{phomemo_plugin.py => phomemo_label.py} (100%) diff --git a/inventree_phomemo/phomemo_plugin.py b/inventree_phomemo/phomemo_label.py similarity index 100% rename from inventree_phomemo/phomemo_plugin.py rename to inventree_phomemo/phomemo_label.py From 60f3d79e73f8fdaca0a7a54e768716af67a034f5 Mon Sep 17 00:00:00 2001 From: Andreas Mieke Date: Wed, 17 Apr 2024 21:54:13 -0400 Subject: [PATCH 04/24] fix(label): Encode label to png before sending --- .gitignore | 2 ++ inventree_phomemo/phomemo_label.py | 2 +- inventree_phomemo/server.py | 23 +++++++++++++++++++++++ 3 files changed, 26 insertions(+), 1 deletion(-) create mode 100644 inventree_phomemo/server.py diff --git a/.gitignore b/.gitignore index 16e5ac0..ebfb5fa 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,8 @@ # Created by https://www.toptal.com/developers/gitignore/api/macos,python,visualstudiocode # Edit at https://www.toptal.com/developers/gitignore?templates=macos,python,visualstudiocode +test.png # File generated by test server + ### macOS ### # General .DS_Store diff --git a/inventree_phomemo/phomemo_label.py b/inventree_phomemo/phomemo_label.py index 8366c60..a0b0c04 100644 --- a/inventree_phomemo/phomemo_label.py +++ b/inventree_phomemo/phomemo_label.py @@ -62,7 +62,7 @@ class PhomemoLabelPlugin(LabelPrintingMixin, SettingsMixin, InvenTreePlugin): print_socket = socket.socket(socket.AF_INET, socket.SOCK_STREAM) print_socket.settimeout(5) print_socket.connect((ip_address, port)) - data = label_image + data = label_image.tobytes("PNG") print_socket.send(data.encode()) print_socket.close() except Exception as error: diff --git a/inventree_phomemo/server.py b/inventree_phomemo/server.py new file mode 100644 index 0000000..01dcdbf --- /dev/null +++ b/inventree_phomemo/server.py @@ -0,0 +1,23 @@ +# server.py +# simple listener to an IP port to test the phomemo plugin + +import socket + +PORT = 9100 # Port to listen on + +s = socket.socket(socket.AF_INET, socket.SOCK_STREAM) +s.bind(('', PORT)) +s.listen(1) +while True: + conn, addr = s.accept() + print(addr) + while True: + data = conn.recv(9100) + print('data received') + print('Sending to printer...') + + printer=open('test.png','wb') + printer.write(data) + printer.close() + if not data: + break \ No newline at end of file From b29acedffdfc9adaf4e64385cd75bfb12d3c63c8 Mon Sep 17 00:00:00 2001 From: Andreas Mieke Date: Wed, 17 Apr 2024 21:55:45 -0400 Subject: [PATCH 05/24] fix(label): Remove encode, it should already be encoded --- inventree_phomemo/phomemo_label.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/inventree_phomemo/phomemo_label.py b/inventree_phomemo/phomemo_label.py index a0b0c04..5d99aa0 100644 --- a/inventree_phomemo/phomemo_label.py +++ b/inventree_phomemo/phomemo_label.py @@ -63,7 +63,7 @@ class PhomemoLabelPlugin(LabelPrintingMixin, SettingsMixin, InvenTreePlugin): print_socket.settimeout(5) print_socket.connect((ip_address, port)) data = label_image.tobytes("PNG") - print_socket.send(data.encode()) + print_socket.send(data) print_socket.close() except Exception as error: raise ConnectionError('Error connecting to printer server: ' + str(error)) From cf7003aa9a84deec8cb08d75529e04c1c83fe03d Mon Sep 17 00:00:00 2001 From: Andreas Mieke Date: Wed, 17 Apr 2024 22:07:05 -0400 Subject: [PATCH 06/24] fix(label): Use buffer for image --- .gitignore | 3 ++- inventree_phomemo/phomemo_label.py | 7 +++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index ebfb5fa..8997141 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +1,8 @@ # Created by https://www.toptal.com/developers/gitignore/api/macos,python,visualstudiocode # Edit at https://www.toptal.com/developers/gitignore?templates=macos,python,visualstudiocode -test.png # File generated by test server +# File generated by test server +test.png ### macOS ### # General diff --git a/inventree_phomemo/phomemo_label.py b/inventree_phomemo/phomemo_label.py index 5d99aa0..c69f9d5 100644 --- a/inventree_phomemo/phomemo_label.py +++ b/inventree_phomemo/phomemo_label.py @@ -5,6 +5,7 @@ from django.core.validators import MaxValueValidator # printer supportt import socket +import io # InvenTree plugin libs from plugin import InvenTreePlugin @@ -56,14 +57,16 @@ class PhomemoLabelPlugin(LabelPrintingMixin, SettingsMixin, InvenTreePlugin): label_image = label_image.convert('L').point(fn, mode='1') ##### Convert to phomemo + img_byte_arr = io.BytesIO() + label_image.save(img_byte_arr, format='PNG') + img_byte_arr = img_byte_arr.getvalue() # Send the label to the printer try: print_socket = socket.socket(socket.AF_INET, socket.SOCK_STREAM) print_socket.settimeout(5) print_socket.connect((ip_address, port)) - data = label_image.tobytes("PNG") - print_socket.send(data) + print_socket.send(img_byte_arr) print_socket.close() except Exception as error: raise ConnectionError('Error connecting to printer server: ' + str(error)) From b333e1577c372060ec0829dfa9ec1b49e6ba771e Mon Sep 17 00:00:00 2001 From: Andreas Mieke Date: Wed, 17 Apr 2024 22:23:16 -0400 Subject: [PATCH 07/24] fix(test): Fix test server to actually save the code --- inventree_phomemo/server.py | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/inventree_phomemo/server.py b/inventree_phomemo/server.py index 01dcdbf..1f51e09 100644 --- a/inventree_phomemo/server.py +++ b/inventree_phomemo/server.py @@ -11,13 +11,12 @@ s.listen(1) while True: conn, addr = s.accept() print(addr) + printer = open('test.png', 'wb') while True: - data = conn.recv(9100) + data = conn.recv(91000) print('data received') print('Sending to printer...') - - printer=open('test.png','wb') printer.write(data) - printer.close() if not data: - break \ No newline at end of file + break + printer.close() \ No newline at end of file From 536d27d2727d46dee74c89c630384107f339d7cf Mon Sep 17 00:00:00 2001 From: Andreas Mieke Date: Thu, 18 Apr 2024 00:39:06 -0400 Subject: [PATCH 08/24] feat(label): Switch to JSON --- inventree_phomemo/phomemo_label.py | 25 +++---------------------- inventree_phomemo/server.py | 2 +- 2 files changed, 4 insertions(+), 23 deletions(-) diff --git a/inventree_phomemo/phomemo_label.py b/inventree_phomemo/phomemo_label.py index c69f9d5..180b841 100644 --- a/inventree_phomemo/phomemo_label.py +++ b/inventree_phomemo/phomemo_label.py @@ -6,6 +6,7 @@ from django.core.validators import MaxValueValidator # printer supportt import socket import io +import json # InvenTree plugin libs from plugin import InvenTreePlugin @@ -32,12 +33,6 @@ class PhomemoLabelPlugin(LabelPrintingMixin, SettingsMixin, InvenTreePlugin): 'description': _('Port of phomemo print server'), 'default': '9100', }, - 'THRESHOLD': { - 'name': _('Threshold'), - 'description': _('Threshold for B/W conversion (0-255)'), - 'validator': [int, MinValueValidator(0), MaxValueValidator(255)], - 'default': 200, - }, } def print_label(self, **kwargs): @@ -45,28 +40,14 @@ class PhomemoLabelPlugin(LabelPrintingMixin, SettingsMixin, InvenTreePlugin): # Read settings ip_address = self.get_setting('IP_ADDRESS') port = int(self.get_setting('PORT')) - threshold = self.get_setting('THRESHOLD') - label_image = kwargs['png_file'] - - # Extract width (x) and height (y) information. - width = kwargs['width'] - height = kwargs['height'] - - # convert image to B/W - fn = lambda x: 255 if x > threshold else 0 - label_image = label_image.convert('L').point(fn, mode='1') - - ##### Convert to phomemo - img_byte_arr = io.BytesIO() - label_image.save(img_byte_arr, format='PNG') - img_byte_arr = img_byte_arr.getvalue() + label_data = kwargs['label_instance'] # Send the label to the printer try: print_socket = socket.socket(socket.AF_INET, socket.SOCK_STREAM) print_socket.settimeout(5) print_socket.connect((ip_address, port)) - print_socket.send(img_byte_arr) + json.dump(label_data, print_socket) print_socket.close() except Exception as error: raise ConnectionError('Error connecting to printer server: ' + str(error)) diff --git a/inventree_phomemo/server.py b/inventree_phomemo/server.py index 1f51e09..c0efce9 100644 --- a/inventree_phomemo/server.py +++ b/inventree_phomemo/server.py @@ -11,7 +11,7 @@ s.listen(1) while True: conn, addr = s.accept() print(addr) - printer = open('test.png', 'wb') + printer = open('test.json', 'w') while True: data = conn.recv(91000) print('data received') From b52ee09b90d10b4de157b34b55a621c54593ccec Mon Sep 17 00:00:00 2001 From: Andreas Mieke Date: Thu, 18 Apr 2024 00:44:12 -0400 Subject: [PATCH 09/24] fix(label): Try another way to serialize --- .gitignore | 2 +- inventree_phomemo/phomemo_label.py | 2 +- inventree_phomemo/server.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 8997141..8e78007 100644 --- a/.gitignore +++ b/.gitignore @@ -2,7 +2,7 @@ # Edit at https://www.toptal.com/developers/gitignore?templates=macos,python,visualstudiocode # File generated by test server -test.png +test.* ### macOS ### # General diff --git a/inventree_phomemo/phomemo_label.py b/inventree_phomemo/phomemo_label.py index 180b841..d4c093e 100644 --- a/inventree_phomemo/phomemo_label.py +++ b/inventree_phomemo/phomemo_label.py @@ -40,7 +40,7 @@ class PhomemoLabelPlugin(LabelPrintingMixin, SettingsMixin, InvenTreePlugin): # Read settings ip_address = self.get_setting('IP_ADDRESS') port = int(self.get_setting('PORT')) - label_data = kwargs['label_instance'] + label_data = kwargs['label_instance'].object_to_print # Send the label to the printer try: diff --git a/inventree_phomemo/server.py b/inventree_phomemo/server.py index c0efce9..6e889a8 100644 --- a/inventree_phomemo/server.py +++ b/inventree_phomemo/server.py @@ -11,7 +11,7 @@ s.listen(1) while True: conn, addr = s.accept() print(addr) - printer = open('test.json', 'w') + printer = open('test.json', 'wb') while True: data = conn.recv(91000) print('data received') From f44590a9f5a2df20017b7a2cea8852491a879053 Mon Sep 17 00:00:00 2001 From: Andreas Mieke Date: Thu, 18 Apr 2024 00:53:43 -0400 Subject: [PATCH 10/24] fix(label): Serialize only a few fields --- inventree_phomemo/phomemo_label.py | 23 +++++++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) diff --git a/inventree_phomemo/phomemo_label.py b/inventree_phomemo/phomemo_label.py index d4c093e..0bcd66e 100644 --- a/inventree_phomemo/phomemo_label.py +++ b/inventree_phomemo/phomemo_label.py @@ -40,14 +40,33 @@ class PhomemoLabelPlugin(LabelPrintingMixin, SettingsMixin, InvenTreePlugin): # Read settings ip_address = self.get_setting('IP_ADDRESS') port = int(self.get_setting('PORT')) - label_data = kwargs['label_instance'].object_to_print + + object_to_print = kwargs['label_instance'].object_to_print + + if kwargs['label_instance'].SUBDIR == 'part': + tpart = object_to_print + elif kwargs['label_instance'].SUBDIR == 'stockitem': + tpart = object_to_print.part + else: + print(f"!! Unsupported item type: {object_to_print.SUBDIR}") + return + + fields = { + 'name': tpart.name, + 'description': tpart.description, + 'pk': tpart.pk, + 'params': tpart.parameters_map(), + 'category': tpart.category.name, + 'category_path': tpart.category.pathstring, + 'qr_data': kwargs['qr_data'] + } # Send the label to the printer try: print_socket = socket.socket(socket.AF_INET, socket.SOCK_STREAM) print_socket.settimeout(5) print_socket.connect((ip_address, port)) - json.dump(label_data, print_socket) + json.dump(fields, print_socket) print_socket.close() except Exception as error: raise ConnectionError('Error connecting to printer server: ' + str(error)) From 77864ba9797eaa32989d5582fe7ead71610e5deb Mon Sep 17 00:00:00 2001 From: Andreas Mieke Date: Thu, 18 Apr 2024 01:00:50 -0400 Subject: [PATCH 11/24] fix(label): Remove qr_data --- inventree_phomemo/phomemo_label.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/inventree_phomemo/phomemo_label.py b/inventree_phomemo/phomemo_label.py index 0bcd66e..5b2141b 100644 --- a/inventree_phomemo/phomemo_label.py +++ b/inventree_phomemo/phomemo_label.py @@ -42,11 +42,15 @@ class PhomemoLabelPlugin(LabelPrintingMixin, SettingsMixin, InvenTreePlugin): port = int(self.get_setting('PORT')) object_to_print = kwargs['label_instance'].object_to_print + key = object_to_print.pk + kind = '' if kwargs['label_instance'].SUBDIR == 'part': tpart = object_to_print + kind = 'part' elif kwargs['label_instance'].SUBDIR == 'stockitem': tpart = object_to_print.part + kind = 'stockitem' else: print(f"!! Unsupported item type: {object_to_print.SUBDIR}") return @@ -58,7 +62,8 @@ class PhomemoLabelPlugin(LabelPrintingMixin, SettingsMixin, InvenTreePlugin): 'params': tpart.parameters_map(), 'category': tpart.category.name, 'category_path': tpart.category.pathstring, - 'qr_data': kwargs['qr_data'] + 'kind': kind, + 'ppk': key } # Send the label to the printer From a732fb3d4a09476579a6cd2d2ef0328ce88ece0c Mon Sep 17 00:00:00 2001 From: Andreas Mieke Date: Thu, 18 Apr 2024 01:04:11 -0400 Subject: [PATCH 12/24] fix(label): Socket sending --- inventree_phomemo/phomemo_label.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/inventree_phomemo/phomemo_label.py b/inventree_phomemo/phomemo_label.py index 5b2141b..456948e 100644 --- a/inventree_phomemo/phomemo_label.py +++ b/inventree_phomemo/phomemo_label.py @@ -66,12 +66,14 @@ class PhomemoLabelPlugin(LabelPrintingMixin, SettingsMixin, InvenTreePlugin): 'ppk': key } + data = json.dumps(fields) + # Send the label to the printer try: print_socket = socket.socket(socket.AF_INET, socket.SOCK_STREAM) print_socket.settimeout(5) print_socket.connect((ip_address, port)) - json.dump(fields, print_socket) + print_socket.sendall(bytes(data,encoding="utf-8")) print_socket.close() except Exception as error: raise ConnectionError('Error connecting to printer server: ' + str(error)) From 43c5c8a5ba4f12b26df46c024ab63fd871fa5fea Mon Sep 17 00:00:00 2001 From: Andreas Mieke Date: Sat, 20 Apr 2024 21:51:01 -0400 Subject: [PATCH 13/24] feat(label): Switch to custom barcode with numbers only --- inventree_phomemo/phomemo_label.py | 31 +++++++++++++++++------------- 1 file changed, 18 insertions(+), 13 deletions(-) diff --git a/inventree_phomemo/phomemo_label.py b/inventree_phomemo/phomemo_label.py index 456948e..fc661cc 100644 --- a/inventree_phomemo/phomemo_label.py +++ b/inventree_phomemo/phomemo_label.py @@ -42,18 +42,24 @@ class PhomemoLabelPlugin(LabelPrintingMixin, SettingsMixin, InvenTreePlugin): port = int(self.get_setting('PORT')) object_to_print = kwargs['label_instance'].object_to_print - key = object_to_print.pk - kind = '' - if kwargs['label_instance'].SUBDIR == 'part': - tpart = object_to_print - kind = 'part' - elif kwargs['label_instance'].SUBDIR == 'stockitem': - tpart = object_to_print.part - kind = 'stockitem' - else: - print(f"!! Unsupported item type: {object_to_print.SUBDIR}") - return + match kwargs['label_instance'].SUBDIR: + case 'part': + tpart = object_to_print + barcode = '1' + str(object_to_print.pk) + case 'stockitem': + tpart = object_to_print.part + barcode = '2' + str(object_to_print.pk) + case 'location': + tpart = object_to_print + barcode = '3' + str(object_to_print.pk) + case 'build': + tpart = object_to_print + barcode = '4' + str(object_to_print.pk) + case _: + tpart = object_to_print + barcode = '0' + str(object_to_print.pk) + print(f"!! Unsupported item type: {object_to_print.SUBDIR}") fields = { 'name': tpart.name, @@ -62,8 +68,7 @@ class PhomemoLabelPlugin(LabelPrintingMixin, SettingsMixin, InvenTreePlugin): 'params': tpart.parameters_map(), 'category': tpart.category.name, 'category_path': tpart.category.pathstring, - 'kind': kind, - 'ppk': key + 'barcode': barcode } data = json.dumps(fields) From fdea2b70d197e164f87a29be2885f61c22fa2983 Mon Sep 17 00:00:00 2001 From: Andreas Mieke Date: Sat, 20 Apr 2024 21:58:33 -0400 Subject: [PATCH 14/24] fix(label): Add type info to label --- inventree_phomemo/phomemo_label.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/inventree_phomemo/phomemo_label.py b/inventree_phomemo/phomemo_label.py index fc661cc..73133fe 100644 --- a/inventree_phomemo/phomemo_label.py +++ b/inventree_phomemo/phomemo_label.py @@ -59,7 +59,7 @@ class PhomemoLabelPlugin(LabelPrintingMixin, SettingsMixin, InvenTreePlugin): case _: tpart = object_to_print barcode = '0' + str(object_to_print.pk) - print(f"!! Unsupported item type: {object_to_print.SUBDIR}") + print(f"!! Unsupported item type: {kwargs['label_instance'].SUBDIR}") fields = { 'name': tpart.name, @@ -68,7 +68,8 @@ class PhomemoLabelPlugin(LabelPrintingMixin, SettingsMixin, InvenTreePlugin): 'params': tpart.parameters_map(), 'category': tpart.category.name, 'category_path': tpart.category.pathstring, - 'barcode': barcode + 'barcode': barcode, + 'type': kwargs['label_instance'].SUBDIR } data = json.dumps(fields) From 8572cccf9f9e0fb4c3dc5a8ed7ff421c4fb2bb70 Mon Sep 17 00:00:00 2001 From: Andreas Mieke Date: Sat, 20 Apr 2024 22:06:09 -0400 Subject: [PATCH 15/24] fix(label): Check if attributes exist --- inventree_phomemo/phomemo_label.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/inventree_phomemo/phomemo_label.py b/inventree_phomemo/phomemo_label.py index 73133fe..8176aab 100644 --- a/inventree_phomemo/phomemo_label.py +++ b/inventree_phomemo/phomemo_label.py @@ -65,9 +65,9 @@ class PhomemoLabelPlugin(LabelPrintingMixin, SettingsMixin, InvenTreePlugin): 'name': tpart.name, 'description': tpart.description, 'pk': tpart.pk, - 'params': tpart.parameters_map(), - 'category': tpart.category.name, - 'category_path': tpart.category.pathstring, + 'params': tpart.parameters_map() if hasattr(tpart, 'parameters_map') else None, + 'category': tpart.category.name if hasattr(tpart, 'category') else None, + 'category_path': tpart.category.pathstring if hasattr(tpart, 'category') else None, 'barcode': barcode, 'type': kwargs['label_instance'].SUBDIR } From fbfb35634e817e1c55272d561189532d59fef689 Mon Sep 17 00:00:00 2001 From: Andreas Mieke Date: Sat, 20 Apr 2024 22:10:22 -0400 Subject: [PATCH 16/24] feat(label): Add location --- inventree_phomemo/phomemo_label.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/inventree_phomemo/phomemo_label.py b/inventree_phomemo/phomemo_label.py index 8176aab..07ee7a0 100644 --- a/inventree_phomemo/phomemo_label.py +++ b/inventree_phomemo/phomemo_label.py @@ -50,7 +50,7 @@ class PhomemoLabelPlugin(LabelPrintingMixin, SettingsMixin, InvenTreePlugin): case 'stockitem': tpart = object_to_print.part barcode = '2' + str(object_to_print.pk) - case 'location': + case 'stocklocation': tpart = object_to_print barcode = '3' + str(object_to_print.pk) case 'build': @@ -68,6 +68,8 @@ class PhomemoLabelPlugin(LabelPrintingMixin, SettingsMixin, InvenTreePlugin): 'params': tpart.parameters_map() if hasattr(tpart, 'parameters_map') else None, 'category': tpart.category.name if hasattr(tpart, 'category') else None, 'category_path': tpart.category.pathstring if hasattr(tpart, 'category') else None, + 'location': tpart.location.name if hasattr(tpart, 'location') else None, + 'location_path': tpart.location.pathstring if hasattr(tpart, 'location') else None, 'barcode': barcode, 'type': kwargs['label_instance'].SUBDIR } From bfaa0b7f89be8e1f0c06a7fce1d7ecae225ca292 Mon Sep 17 00:00:00 2001 From: Andreas Mieke Date: Sat, 20 Apr 2024 22:42:17 -0400 Subject: [PATCH 17/24] feat(barcode): Add barcode support --- inventree_phomemo/phomemo_label.py | 55 ++++++++++++++++++++++++++---- 1 file changed, 49 insertions(+), 6 deletions(-) diff --git a/inventree_phomemo/phomemo_label.py b/inventree_phomemo/phomemo_label.py index 07ee7a0..9eea833 100644 --- a/inventree_phomemo/phomemo_label.py +++ b/inventree_phomemo/phomemo_label.py @@ -3,18 +3,21 @@ from django.utils.translation import gettext_lazy as _ from django.core.validators import MinValueValidator from django.core.validators import MaxValueValidator -# printer supportt +# printer support import socket -import io import json +# barcode helpers +from InvenTree.helpers_model import getModelsWithMixin +from InvenTree.models import InvenTreeBarcodeMixin + # InvenTree plugin libs from plugin import InvenTreePlugin -from plugin.mixins import LabelPrintingMixin, SettingsMixin +from plugin.mixins import LabelPrintingMixin, SettingsMixin, BarcodeMixin from inventree_phomemo.version import PHOMEMO_PLUGIN_VERSION -class PhomemoLabelPlugin(LabelPrintingMixin, SettingsMixin, InvenTreePlugin): +class PhomemoLabelPlugin(LabelPrintingMixin, BarcodeMixin, SettingsMixin, InvenTreePlugin): AUTHOR = "Sergal.engineering" DESCRIPTION = "Label printing plugin for Phomemo printers" VERSION = PHOMEMO_PLUGIN_VERSION @@ -68,8 +71,6 @@ class PhomemoLabelPlugin(LabelPrintingMixin, SettingsMixin, InvenTreePlugin): 'params': tpart.parameters_map() if hasattr(tpart, 'parameters_map') else None, 'category': tpart.category.name if hasattr(tpart, 'category') else None, 'category_path': tpart.category.pathstring if hasattr(tpart, 'category') else None, - 'location': tpart.location.name if hasattr(tpart, 'location') else None, - 'location_path': tpart.location.pathstring if hasattr(tpart, 'location') else None, 'barcode': barcode, 'type': kwargs['label_instance'].SUBDIR } @@ -85,3 +86,45 @@ class PhomemoLabelPlugin(LabelPrintingMixin, SettingsMixin, InvenTreePlugin): print_socket.close() except Exception as error: raise ConnectionError('Error connecting to printer server: ' + str(error)) + + + @staticmethod + def get_supported_barcode_models(): + """Returns a list of database models which support barcode functionality.""" + return getModelsWithMixin(InvenTreeBarcodeMixin) + + def format_matched_response(self, label, model, instance): + """Format a response for the scanned data.""" + return {label: instance.format_matched_response()} + + def scan(self, barcode_data): + # Our barcode should be a string + if type(barcode_data) is not str: + barcode_data = str(barcode_data) + + # Our barcodes are at least two symbols long + if len(barcode_data) < 2: + return + + match barcode_data[0]: + case '1': + model_type = 'part' + case '2': + model_type = 'stockitem' + case '3': + model_type = 'stocklocation' + case '4': + model_type = 'build' + + supported_models = self.get_supported_barcode_models() + + for model in supported_models: + label = model.barcode_model_type() + + if label == model_type: + try: + pk = int(barcode_data[1:]) + instance = model.objects.get(pk=pk) + return self.format_matched_response(label, model, instance) + except (ValueError, model.DoesNotExist): + pass \ No newline at end of file From 7dc96c65ff9324c1915f76f27c87607ce0c8375e Mon Sep 17 00:00:00 2001 From: Andreas Mieke Date: Sun, 21 Apr 2024 21:10:18 -0400 Subject: [PATCH 18/24] chiore(tmpl): Add empty placeholder template --- empty.html | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 empty.html diff --git a/empty.html b/empty.html new file mode 100644 index 0000000..2af6927 --- /dev/null +++ b/empty.html @@ -0,0 +1,9 @@ +{% extends "label/label_base.html" %} + +{% block style %} + +{% endblock %} + +{% block content %} + +{% endblock %} \ No newline at end of file From c5d55e79b262f66f0de443294c642d2563fb319c Mon Sep 17 00:00:00 2001 From: Andreas Mieke Date: Sun, 21 Apr 2024 21:10:51 -0400 Subject: [PATCH 19/24] feat(label): Add print_labels for multiple labels --- inventree_phomemo/phomemo_label.py | 59 ++++++++++++++++++++++++------ 1 file changed, 48 insertions(+), 11 deletions(-) diff --git a/inventree_phomemo/phomemo_label.py b/inventree_phomemo/phomemo_label.py index 9eea833..b3d292e 100644 --- a/inventree_phomemo/phomemo_label.py +++ b/inventree_phomemo/phomemo_label.py @@ -1,7 +1,5 @@ -# translation -from django.utils.translation import gettext_lazy as _ -from django.core.validators import MinValueValidator -from django.core.validators import MaxValueValidator +# django +from django.http import JsonResponse # printer support import socket @@ -14,6 +12,7 @@ from InvenTree.models import InvenTreeBarcodeMixin # InvenTree plugin libs from plugin import InvenTreePlugin from plugin.mixins import LabelPrintingMixin, SettingsMixin, BarcodeMixin +from label.models import LabelTemplate from inventree_phomemo.version import PHOMEMO_PLUGIN_VERSION @@ -38,12 +37,7 @@ class PhomemoLabelPlugin(LabelPrintingMixin, BarcodeMixin, SettingsMixin, InvenT }, } - def print_label(self, **kwargs): - - # Read settings - ip_address = self.get_setting('IP_ADDRESS') - port = int(self.get_setting('PORT')) - + def get_fields(self, **kwargs): object_to_print = kwargs['label_instance'].object_to_print match kwargs['label_instance'].SUBDIR: @@ -72,9 +66,52 @@ class PhomemoLabelPlugin(LabelPrintingMixin, BarcodeMixin, SettingsMixin, InvenT 'category': tpart.category.name if hasattr(tpart, 'category') else None, 'category_path': tpart.category.pathstring if hasattr(tpart, 'category') else None, 'barcode': barcode, - 'type': kwargs['label_instance'].SUBDIR + 'type': kwargs['label_instance'].SUBDIR, + 'width': kwargs['width'], + 'height': kwargs['height'] } + return fields + + def print_labels(self, label: LabelTemplate, items: list, request, **kwargs): + outputs = [] + + # Get label content for every label + for item in items: + label.object_to_print = item + outputs.append(self.get_fields(label, request, **kwargs)) + + # Read settings + ip_address = self.get_setting('IP_ADDRESS') + port = int(self.get_setting('PORT')) + + # Dump to json + data = json.dumps(outputs) + + # Send the label to the printer + try: + print_socket = socket.socket(socket.AF_INET, socket.SOCK_STREAM) + print_socket.settimeout(5) + print_socket.connect((ip_address, port)) + print_socket.sendall(bytes(data,encoding="utf-8")) + print_socket.close() + except Exception as error: + raise ConnectionError('Error connecting to printer server: ' + str(error)) + + return JsonResponse({ + 'success': True, + 'message': f'{len(items)} labels printed', + }) + + def print_label(self, **kwargs): + # Read settings + ip_address = self.get_setting('IP_ADDRESS') + port = int(self.get_setting('PORT')) + + # Get label content + fields = self.get_fields(self, kwargs) + + # Dump to json data = json.dumps(fields) # Send the label to the printer From 0156cf18a5af61cbc5a26757215c9a38e40020bf Mon Sep 17 00:00:00 2001 From: Andreas Mieke Date: Sun, 21 Apr 2024 21:16:36 -0400 Subject: [PATCH 20/24] fix(label): Fix django imports --- inventree_phomemo/phomemo_label.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/inventree_phomemo/phomemo_label.py b/inventree_phomemo/phomemo_label.py index b3d292e..3c11d22 100644 --- a/inventree_phomemo/phomemo_label.py +++ b/inventree_phomemo/phomemo_label.py @@ -1,4 +1,7 @@ # django +from django.utils.translation import gettext_lazy as _ +from django.core.validators import MinValueValidator +from django.core.validators import MaxValueValidator from django.http import JsonResponse # printer support From 9460d923c9321933d0b21aa544c066762ccc0946 Mon Sep 17 00:00:00 2001 From: Andreas Mieke Date: Sun, 21 Apr 2024 21:27:36 -0400 Subject: [PATCH 21/24] fix(label): Call print_label for everry label --- inventree_phomemo/phomemo_label.py | 25 ++++--------------------- 1 file changed, 4 insertions(+), 21 deletions(-) diff --git a/inventree_phomemo/phomemo_label.py b/inventree_phomemo/phomemo_label.py index 3c11d22..c5ee53e 100644 --- a/inventree_phomemo/phomemo_label.py +++ b/inventree_phomemo/phomemo_label.py @@ -82,7 +82,7 @@ class PhomemoLabelPlugin(LabelPrintingMixin, BarcodeMixin, SettingsMixin, InvenT # Get label content for every label for item in items: label.object_to_print = item - outputs.append(self.get_fields(label, request, **kwargs)) + outputs.append(self.print_label(label, request, **kwargs)) # Read settings ip_address = self.get_setting('IP_ADDRESS') @@ -106,26 +106,9 @@ class PhomemoLabelPlugin(LabelPrintingMixin, BarcodeMixin, SettingsMixin, InvenT 'message': f'{len(items)} labels printed', }) - def print_label(self, **kwargs): - # Read settings - ip_address = self.get_setting('IP_ADDRESS') - port = int(self.get_setting('PORT')) - - # Get label content - fields = self.get_fields(self, kwargs) - - # Dump to json - data = json.dumps(fields) - - # Send the label to the printer - try: - print_socket = socket.socket(socket.AF_INET, socket.SOCK_STREAM) - print_socket.settimeout(5) - print_socket.connect((ip_address, port)) - print_socket.sendall(bytes(data,encoding="utf-8")) - print_socket.close() - except Exception as error: - raise ConnectionError('Error connecting to printer server: ' + str(error)) + def print_label(self, label: LabelTemplate, request, **kwargs): + self.render_to_html(label, request, **kwargs) + return self.get_fields(**kwargs) @staticmethod From 1cf5a5880776444ec84646a58a1fe03e2e9c3844 Mon Sep 17 00:00:00 2001 From: Andreas Mieke Date: Sun, 21 Apr 2024 21:40:35 -0400 Subject: [PATCH 22/24] fix(label): Change code to more reflect the mixin --- inventree_phomemo/phomemo_label.py | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/inventree_phomemo/phomemo_label.py b/inventree_phomemo/phomemo_label.py index c5ee53e..8058f51 100644 --- a/inventree_phomemo/phomemo_label.py +++ b/inventree_phomemo/phomemo_label.py @@ -40,10 +40,10 @@ class PhomemoLabelPlugin(LabelPrintingMixin, BarcodeMixin, SettingsMixin, InvenT }, } - def get_fields(self, **kwargs): - object_to_print = kwargs['label_instance'].object_to_print + def get_fields(self, label_instance): + object_to_print = label_instance.object_to_print - match kwargs['label_instance'].SUBDIR: + match label_instance.SUBDIR: case 'part': tpart = object_to_print barcode = '1' + str(object_to_print.pk) @@ -59,7 +59,7 @@ class PhomemoLabelPlugin(LabelPrintingMixin, BarcodeMixin, SettingsMixin, InvenT case _: tpart = object_to_print barcode = '0' + str(object_to_print.pk) - print(f"!! Unsupported item type: {kwargs['label_instance'].SUBDIR}") + print(f"!! Unsupported item type: {label_instance.SUBDIR}") fields = { 'name': tpart.name, @@ -69,9 +69,9 @@ class PhomemoLabelPlugin(LabelPrintingMixin, BarcodeMixin, SettingsMixin, InvenT 'category': tpart.category.name if hasattr(tpart, 'category') else None, 'category_path': tpart.category.pathstring if hasattr(tpart, 'category') else None, 'barcode': barcode, - 'type': kwargs['label_instance'].SUBDIR, - 'width': kwargs['width'], - 'height': kwargs['height'] + 'type': label_instance.SUBDIR, + 'width': label_instance.width, + 'height': label_instance.height } return fields @@ -82,7 +82,7 @@ class PhomemoLabelPlugin(LabelPrintingMixin, BarcodeMixin, SettingsMixin, InvenT # Get label content for every label for item in items: label.object_to_print = item - outputs.append(self.print_label(label, request, **kwargs)) + outputs.append(self.get_fields(label)) # Read settings ip_address = self.get_setting('IP_ADDRESS') @@ -106,10 +106,6 @@ class PhomemoLabelPlugin(LabelPrintingMixin, BarcodeMixin, SettingsMixin, InvenT 'message': f'{len(items)} labels printed', }) - def print_label(self, label: LabelTemplate, request, **kwargs): - self.render_to_html(label, request, **kwargs) - return self.get_fields(**kwargs) - @staticmethod def get_supported_barcode_models(): From 85981d81b51c16cd4d61290e8a5a99775e9a31ec Mon Sep 17 00:00:00 2001 From: Andreas Mieke Date: Sun, 21 Apr 2024 21:55:38 -0400 Subject: [PATCH 23/24] feat(label): Switch to POST request --- inventree_phomemo/phomemo_label.py | 32 ++++++++---------------------- 1 file changed, 8 insertions(+), 24 deletions(-) diff --git a/inventree_phomemo/phomemo_label.py b/inventree_phomemo/phomemo_label.py index 8058f51..17fbfcf 100644 --- a/inventree_phomemo/phomemo_label.py +++ b/inventree_phomemo/phomemo_label.py @@ -5,8 +5,7 @@ from django.core.validators import MaxValueValidator from django.http import JsonResponse # printer support -import socket -import json +import requests # barcode helpers from InvenTree.helpers_model import getModelsWithMixin @@ -28,15 +27,10 @@ class PhomemoLabelPlugin(LabelPrintingMixin, BarcodeMixin, SettingsMixin, InvenT TITLE = "Phomemo Label Printer" SETTINGS = { - 'IP_ADDRESS': { - 'name': _('IP Address'), - 'description': _('IP address of phomemo print server'), - 'default': '', - }, - 'PORT': { - 'name': _('Port'), - 'description': _('Port of phomemo print server'), - 'default': '9100', + 'URL': { + 'name': _('URL'), + 'description': _('URL of the print endpoint'), + 'default': 'http://localhost:8080/print', }, } @@ -85,21 +79,11 @@ class PhomemoLabelPlugin(LabelPrintingMixin, BarcodeMixin, SettingsMixin, InvenT outputs.append(self.get_fields(label)) # Read settings - ip_address = self.get_setting('IP_ADDRESS') - port = int(self.get_setting('PORT')) - - # Dump to json - data = json.dumps(outputs) + url = self.get_setting('URL') # Send the label to the printer - try: - print_socket = socket.socket(socket.AF_INET, socket.SOCK_STREAM) - print_socket.settimeout(5) - print_socket.connect((ip_address, port)) - print_socket.sendall(bytes(data,encoding="utf-8")) - print_socket.close() - except Exception as error: - raise ConnectionError('Error connecting to printer server: ' + str(error)) + r = requests.post(url, json=outputs) + r.raise_for_status() return JsonResponse({ 'success': True, From a5ce162530226a2e54bf6f61e77370718deea35a Mon Sep 17 00:00:00 2001 From: Andreas Mieke Date: Sun, 21 Apr 2024 21:57:06 -0400 Subject: [PATCH 24/24] fix(install): Add requests as dependency --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index ab33060..24097d7 100644 --- a/setup.py +++ b/setup.py @@ -20,7 +20,7 @@ setup( packages = find_packages(), scripts = [], - install_requires = [], + install_requires = ['requests'], entry_points = { 'inventree_plugins': [ 'PhomemoLabelPlugin = inventree_phomemo.phomemo_label:PhomemoLabelPlugin' ]