Skip to content
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

Jump to bottom

Minimally invasive changes to improve search performance. #439

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

Minimally invasive changes to improve search performance. #439

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
30 changes: 20 additions & 10 deletions library.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ class Library:
def __init__(self, parent):
self.logger = logging.getLogger(__name__)
self.parent = parent
self.order_by = "LCSC Part"
self.order_by = None
self.order_dir = "ASC"
self.datadir = os.path.join(PLUGIN_PATH, "jlcpcb")
self.partsdb_file = os.path.join(self.datadir, "parts.db")
Expand Down Expand Up @@ -125,11 +125,11 @@ def search(self, parameters):
self.logger.error("Can't split keyword: %s", str(e))

keyword_columns = [
"LCSC Part",
# "LCSC Part",
"Description",
"MFR.Part",
"Package",
"Manufacturer",
# "Package",
# "Manufacturer",
]
query_chunks = []
for kw in keywords:
Expand All @@ -141,19 +141,25 @@ def search(self, parameters):
query_chunks.append(f'"Manufacturer" LIKE "{p}"')
if "package" in parameters and parameters["package"] != "":
p = parameters["package"]
query_chunks.append(f'"Package" LIKE "{p}"')
if p.isdigit():
query_chunks.append(f'"Package" = "{p}" COLLATE NOCASE')
else:
query_chunks.append(f'"Package" LIKE "{p}%"')
if "category" in parameters and parameters["category"] != "" and parameters["category"] != "All":
p = parameters["category"]
query_chunks.append(f'"First Category" LIKE "{p}"')
query_chunks.append(f'"First Category" LIKE "{p}%"')
if "subcategory" in parameters and parameters["subcategory"] != "":
p = parameters["subcategory"]
query_chunks.append(f'"Second Category" LIKE "{p}"')
query_chunks.append(f'"Second Category" LIKE "{p}%"')
if "part_no" in parameters and parameters["part_no"] != "":
p = parameters["part_no"]
query_chunks.append(f'"MFR.Part" LIKE "{p}"')
if p.isdigit():
query_chunks.append(f'("MFR.Part" = "{p}" COLLATE NOCASE OR "LCSC Part" = "{p}" COLLATE NOCASE)')
else:
query_chunks.append(f'("MFR.Part" LIKE "{p}%" OR "LCSC Part" = "{p}" COLLATE NOCASE)')
if "solder_joints" in parameters and parameters["solder_joints"] != "":
p = parameters["solder_joints"]
query_chunks.append(f'"Solder Joint" LIKE "{p}"')
query_chunks.append(f'"Solder Joint" = "{p}"')

library_types = []
if parameters["basic"]:
Expand All @@ -170,7 +176,11 @@ def search(self, parameters):
return []

query += " AND ".join(query_chunks)
query += f' ORDER BY "{self.order_by}" COLLATE naturalsort {self.order_dir}'

if self.order_by != None:
# query = f"SELECT * FROM ({query})"
query += f' ORDER BY "{self.order_by}" COLLATE naturalsort {self.order_dir}'

query += " LIMIT 1000"

with contextlib.closing(sqlite3.connect(self.partsdb_file)) as con:
Expand Down