Skip to content
New issue

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

#

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

Already on GitHub? # to your account

Feat #81: Added index support #82

Merged
merged 2 commits into from
Nov 19, 2021
Merged

Feat #81: Added index support #82

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e7cf765
added index support
0xrushi Oct 29, 2021
758e349
Update utils.py
0xrushi Oct 29, 2021
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
37 changes: 21 additions & 16 deletions keep/utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,12 +64,12 @@ def first_time_use(ctx):


def list_commands(ctx):
table_data = [['Command', 'Description', 'Alias']]
table_data = [['Id', 'Command', 'Description', 'Alias']]
no_of_columns = len(table_data[0])

commands = read_commands()
for cmd, fields in commands.items():
table_data.append(['$ ' + cmd, fields['desc'], fields['alias']])
for i, (cmd, fields) in enumerate(commands.items()):
table_data.append([str(i + 1), '$ ' + cmd, fields['desc'], fields['alias']])

table = AsciiTable(table_data)
max_width = table.table_width//3
Expand Down Expand Up @@ -212,24 +212,29 @@ def grep_commands(pattern):
result = None
if commands:
result = []
for cmd, fields in commands.items():
for i, (cmd, fields) in enumerate(commands.items()):
desc = fields['desc']
alias = fields['alias']
if alias == pattern and alias.strip() != "":
if pattern.isdigit() and pattern == str(i + 1):
result.clear()
result.append((cmd, desc))
break
if re.search(pattern, cmd + " :: " + desc):
result.append((cmd, desc))
continue
# Show if all the parts of the pattern are in one command/desc
keywords_len = len(pattern.split())
i_keyword = 0
for keyword in pattern.split():
if keyword.lower() in cmd.lower() or keyword.lower() in desc.lower():
i_keyword += 1
if i_keyword == keywords_len:
result.append((cmd, desc))
else:
if alias == pattern and alias.strip() != "":
result.clear()
result.append((cmd, desc))
break
if re.search(pattern, cmd + " :: " + desc):
result.append((cmd, desc))
continue
# Show if all the parts of the pattern are in one command/desc
keywords_len = len(pattern.split())
i_keyword = 0
for keyword in pattern.split():
if keyword.lower() in cmd.lower() or keyword.lower() in desc.lower():
i_keyword += 1
if i_keyword == keywords_len:
result.append((cmd, desc))
return result


Expand Down