diff --git a/debian/control b/debian/control index 9e01244..f31c96a 100644 --- a/debian/control +++ b/debian/control @@ -23,6 +23,7 @@ Depends: python3-cli-helpers, python3-prompt-toolkit (>= 2.0), python3-sqlglot, + python3-pyfzf, python3-sqlparse (>= 0.4), python3-tabulate, python3-terminaltables, diff --git a/debian/patches/debian/0001-disable-fzf.patch b/debian/patches/debian/0001-disable-fzf.patch deleted file mode 100644 index 5a9c943..0000000 --- a/debian/patches/debian/0001-disable-fzf.patch +++ /dev/null @@ -1,65 +0,0 @@ -Author: Daniel Baumann -Description: Disabling fzf until pyfzf has passed NEW (Closes: #1087961). - -diff -Naurp mycli.orig/mycli/packages/toolkit/fzf.py mycli/mycli/packages/toolkit/fzf.py ---- mycli.orig/mycli/packages/toolkit/fzf.py -+++ mycli/mycli/packages/toolkit/fzf.py -@@ -1,45 +1,14 @@ - from shutil import which - --from pyfzf import FzfPrompt - from prompt_toolkit import search - from prompt_toolkit.key_binding.key_processor import KeyPressEvent - - from .history import FileHistoryWithTimestamp - - --class Fzf(FzfPrompt): -- def __init__(self): -- self.executable = which("fzf") -- if self.executable: -- super().__init__() -- -- def is_available(self) -> bool: -- return self.executable is not None -- -- - def search_history(event: KeyPressEvent): - buffer = event.current_buffer - history = buffer.history - -- fzf = Fzf() -- -- if fzf.is_available() and isinstance(history, FileHistoryWithTimestamp): -- history_items_with_timestamp = history.load_history_with_timestamp() -- -- formatted_history_items = [] -- original_history_items = [] -- for item, timestamp in history_items_with_timestamp: -- formatted_item = item.replace("\n", " ") -- timestamp = timestamp.split(".")[0] if "." in timestamp else timestamp -- formatted_history_items.append(f"{timestamp} {formatted_item}") -- original_history_items.append(item) -- -- result = fzf.prompt(formatted_history_items, fzf_options="--tiebreak=index") -- -- if result: -- selected_index = formatted_history_items.index(result[0]) -- buffer.text = original_history_items[selected_index] -- buffer.cursor_position = len(buffer.text) -- else: -- # Fallback to default reverse incremental search -- search.start_search(direction=search.SearchDirection.BACKWARD) -+ # Fallback to default reverse incremental search -+ search.start_search(direction=search.SearchDirection.BACKWARD) -diff -Naurp mycli.orig/pyproject.toml mycli/pyproject.toml ---- mycli.orig/pyproject.toml -+++ mycli/pyproject.toml -@@ -20,7 +20,6 @@ dependencies = [ - "cli_helpers[styles] >= 2.2.1", - "pyperclip >= 1.8.1", - "pyaes >= 1.6.1", -- "pyfzf >= 0.3.1", - "importlib_resources >= 5.0.0; python_version<'3.9'", - ] - diff --git a/debian/patches/series b/debian/patches/series deleted file mode 100644 index ea52987..0000000 --- a/debian/patches/series +++ /dev/null @@ -1 +0,0 @@ -debian/0001-disable-fzf.patch