Skip to content

[16.0][IMP] shopfloor: improve performance of generic_find #1174

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
nicolas-delbovier-acsone wants to merge 3 commits into
base: 16.0
Choose a base branch
from
+6 −4
Open

[16.0][IMP] shopfloor: improve performance of generic_find #1174

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1cd17ae
[REF] shopfloor_gs1: fix invalid file name
nicolas-delbovier-acsone Jun 3, 2026
a7d1d92
[IMP] shopfloor: avoid useless searches in `generic_find`
nicolas-delbovier-acsone Jun 3, 2026
be80ccd
[IMP] shopfloor: prioritize parsed barcode types over unknown fallback
nicolas-delbovier-acsone Jun 3, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions shopfloor/actions/search.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@


class SearchResult:

__slots__ = ("record", "type", "code", "parse_result")

def __init__(self, **kw) -> None:
Expand Down Expand Up @@ -95,8 +94,11 @@ def generic_find(self, barcode, types=None, handler_kw=None):
_types = types or self._barcode_type_handler.keys()
# TODO: decide the best default order in case we don't pass `types`
parse_results = self.parser.parse(barcode, types)
for parse_result in parse_results:
for btype in _types:
# OPTIMIZATION: Push 'unknown' types to the end so that we return earlier
# in case the type is known after parsing
for parse_result in sorted(parse_results, key=lambda r: r.type == "unknown"):
btypes = _types if parse_result.type == "unknown" else [parse_result.type]
for btype in btypes:
record = self._find_record_by_type(
parse_result.value, btype, handler_kw
)
Expand Down
2 changes: 1 addition & 1 deletion shopfloor_gs1/actions/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
from . import search
from . import barcode_parser

@simahawk simahawk Jun 3, 2026

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

is this change really needed?

@nicolas-delbovier-acsone nicolas-delbovier-acsone Jun 4, 2026

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I am not against reverting this change if really you prefer so.

I was just applying the "boy scout rule" to bring this file name in line with naming conventions while I was working in the area.

0 shopfloor_gs1/actions/search.py → shopfloor_gs1/actions/barcode_parser.py
View file
Open in desktop
File renamed without changes.
Loading