From ff551210949b09218915b7fb4c7dd17ea2026a88 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Mon, 27 Mar 2023 13:06:02 +0530 Subject: [PATCH] Move the kittens Go code into the kittens folder --- docs/conf.py | 6 +----- gen-go-code.py | 8 ++++---- {tools/cmd => kittens}/ask/choices.go | 0 {tools/cmd => kittens}/ask/get_line.go | 0 {tools/cmd => kittens}/ask/main.go | 0 {tools/cmd => kittens}/clipboard/legacy.go | 0 {tools/cmd => kittens}/clipboard/main.go | 0 {tools/cmd => kittens}/clipboard/read.go | 0 {tools/cmd => kittens}/clipboard/write.go | 0 {tools/cmd => kittens}/diff/collect.go | 0 {tools/cmd => kittens}/diff/collect_test.go | 0 {tools/cmd => kittens}/diff/diff.go | 0 {tools/cmd => kittens}/diff/highlight.go | 0 {tools/cmd => kittens}/diff/main.go | 2 +- {tools/cmd => kittens}/diff/patch.go | 0 {tools/cmd => kittens}/diff/render.go | 0 {tools/cmd => kittens}/diff/search.go | 0 {tools/cmd => kittens}/diff/ui.go | 0 {tools/cmd => kittens}/hints/main.go | 0 {tools/cmd => kittens}/hints/marks.go | 0 {tools/cmd => kittens}/hints/marks_test.go | 0 {tools/cmd => kittens}/hints/url_regex.go | 0 .../cmd => kittens}/hyperlinked_grep/main.go | 0 .../hyperlinked_grep/main_test.go | 0 {tools/cmd => kittens}/icat/detect.go | 0 {tools/cmd => kittens}/icat/magick.go | 0 {tools/cmd => kittens}/icat/main.go | 0 {tools/cmd => kittens}/icat/native.go | 0 {tools/cmd => kittens}/icat/process_images.go | 0 {tools/cmd => kittens}/icat/transmit.go | 0 {tools/cmd => kittens}/ssh/askpass.go | 0 {tools/cmd => kittens}/ssh/config.go | 0 {tools/cmd => kittens}/ssh/config_test.go | 0 {tools/cmd => kittens}/ssh/data.go | 0 {tools/cmd => kittens}/ssh/main.go | 0 {tools/cmd => kittens}/ssh/main_test.go | 0 {tools/cmd => kittens}/ssh/utils.go | 0 {tools/cmd => kittens}/ssh/utils_test.go | 0 {tools/cmd => kittens}/themes/list.go | 0 {tools/cmd => kittens}/themes/main.go | 0 {tools/cmd => kittens}/themes/ui.go | 0 {tools/cmd => kittens}/unicode_input/main.go | 0 {tools/cmd => kittens}/unicode_input/table.go | 0 tools/cmd/main.go | 2 +- tools/cmd/pytest/main.go | 2 +- tools/cmd/tool/main.go | 18 +++++++++--------- 46 files changed, 17 insertions(+), 21 deletions(-) rename {tools/cmd => kittens}/ask/choices.go (100%) rename {tools/cmd => kittens}/ask/get_line.go (100%) rename {tools/cmd => kittens}/ask/main.go (100%) rename {tools/cmd => kittens}/clipboard/legacy.go (100%) rename {tools/cmd => kittens}/clipboard/main.go (100%) rename {tools/cmd => kittens}/clipboard/read.go (100%) rename {tools/cmd => kittens}/clipboard/write.go (100%) rename {tools/cmd => kittens}/diff/collect.go (100%) rename {tools/cmd => kittens}/diff/collect_test.go (100%) rename {tools/cmd => kittens}/diff/diff.go (100%) rename {tools/cmd => kittens}/diff/highlight.go (100%) rename {tools/cmd => kittens}/diff/main.go (99%) rename {tools/cmd => kittens}/diff/patch.go (100%) rename {tools/cmd => kittens}/diff/render.go (100%) rename {tools/cmd => kittens}/diff/search.go (100%) rename {tools/cmd => kittens}/diff/ui.go (100%) rename {tools/cmd => kittens}/hints/main.go (100%) rename {tools/cmd => kittens}/hints/marks.go (100%) rename {tools/cmd => kittens}/hints/marks_test.go (100%) rename {tools/cmd => kittens}/hints/url_regex.go (100%) rename {tools/cmd => kittens}/hyperlinked_grep/main.go (100%) rename {tools/cmd => kittens}/hyperlinked_grep/main_test.go (100%) rename {tools/cmd => kittens}/icat/detect.go (100%) rename {tools/cmd => kittens}/icat/magick.go (100%) rename {tools/cmd => kittens}/icat/main.go (100%) rename {tools/cmd => kittens}/icat/native.go (100%) rename {tools/cmd => kittens}/icat/process_images.go (100%) rename {tools/cmd => kittens}/icat/transmit.go (100%) rename {tools/cmd => kittens}/ssh/askpass.go (100%) rename {tools/cmd => kittens}/ssh/config.go (100%) rename {tools/cmd => kittens}/ssh/config_test.go (100%) rename {tools/cmd => kittens}/ssh/data.go (100%) rename {tools/cmd => kittens}/ssh/main.go (100%) rename {tools/cmd => kittens}/ssh/main_test.go (100%) rename {tools/cmd => kittens}/ssh/utils.go (100%) rename {tools/cmd => kittens}/ssh/utils_test.go (100%) rename {tools/cmd => kittens}/themes/list.go (100%) rename {tools/cmd => kittens}/themes/main.go (100%) rename {tools/cmd => kittens}/themes/ui.go (100%) rename {tools/cmd => kittens}/unicode_input/main.go (100%) rename {tools/cmd => kittens}/unicode_input/table.go (100%) diff --git a/docs/conf.py b/docs/conf.py index 552c73dd7..721ce7d60 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -267,7 +267,6 @@ if you specify a program-to-run you can use the special placeholder p('.. program::', 'kitty @', func.name) p('\n\n' + as_rst(*cli_params_for(func))) from kittens.runner import get_kitten_cli_docs - from kitty.fast_data_types import wrapped_kitten_names for kitten in all_kitten_names: data = get_kitten_cli_docs(kitten) @@ -277,10 +276,7 @@ if you specify a program-to-run you can use the special placeholder p('.. program::', 'kitty +kitten', kitten) p('\nSource code for', kitten) p('-' * 72) - if kitten in wrapped_kitten_names(): - scurl = f'https://github.com/kovidgoyal/kitty/tree/master/tools/cmd/{kitten}' - else: - scurl = f'https://github.com/kovidgoyal/kitty/tree/master/kittens/{kitten}' + scurl = f'https://github.com/kovidgoyal/kitty/tree/master/kittens/{kitten}' p(f'\nThe source code for this kitten is `available on GitHub <{scurl}>`_.') p('\nCommand Line Interface') p('-' * 72) diff --git a/gen-go-code.py b/gen-go-code.py index 68f722da0..5385e132e 100755 --- a/gen-go-code.py +++ b/gen-go-code.py @@ -336,7 +336,7 @@ def wrapped_kittens() -> Sequence[str]: def generate_conf_parser(kitten: str, defn: Definition) -> None: - with replace_if_needed(f'tools/cmd/{kitten}/conf_generated.go'): + with replace_if_needed(f'kittens/{kitten}/conf_generated.go'): print(f'package {kitten}') print(gen_go_code(defn)) @@ -370,11 +370,11 @@ def kitten_clis() -> None: ecp = get_kitten_extra_cli_parsers(kitten) if ecp: for name, spec in ecp.items(): - with replace_if_needed(f'tools/cmd/{kitten}/{name}_cli_generated.go'): + with replace_if_needed(f'kittens/{kitten}/{name}_cli_generated.go'): print(f'package {kitten}') generate_extra_cli_parser(name, spec) - with replace_if_needed(f'tools/cmd/{kitten}/cli_generated.go'): + with replace_if_needed(f'kittens/{kitten}/cli_generated.go'): od = [] kcd = kitten_cli_docs(kitten) has_underscore = '_' in kitten @@ -722,7 +722,7 @@ def generate_ssh_kitten_data() -> None: for f in filenames: path = os.path.join(dirpath, f) files.add(path.replace(os.sep, '/')) - dest = 'tools/cmd/ssh/data_generated.bin' + dest = 'kittens/ssh/data_generated.bin' def normalize(t: tarfile.TarInfo) -> tarfile.TarInfo: t.uid = t.gid = 0 diff --git a/tools/cmd/ask/choices.go b/kittens/ask/choices.go similarity index 100% rename from tools/cmd/ask/choices.go rename to kittens/ask/choices.go diff --git a/tools/cmd/ask/get_line.go b/kittens/ask/get_line.go similarity index 100% rename from tools/cmd/ask/get_line.go rename to kittens/ask/get_line.go diff --git a/tools/cmd/ask/main.go b/kittens/ask/main.go similarity index 100% rename from tools/cmd/ask/main.go rename to kittens/ask/main.go diff --git a/tools/cmd/clipboard/legacy.go b/kittens/clipboard/legacy.go similarity index 100% rename from tools/cmd/clipboard/legacy.go rename to kittens/clipboard/legacy.go diff --git a/tools/cmd/clipboard/main.go b/kittens/clipboard/main.go similarity index 100% rename from tools/cmd/clipboard/main.go rename to kittens/clipboard/main.go diff --git a/tools/cmd/clipboard/read.go b/kittens/clipboard/read.go similarity index 100% rename from tools/cmd/clipboard/read.go rename to kittens/clipboard/read.go diff --git a/tools/cmd/clipboard/write.go b/kittens/clipboard/write.go similarity index 100% rename from tools/cmd/clipboard/write.go rename to kittens/clipboard/write.go diff --git a/tools/cmd/diff/collect.go b/kittens/diff/collect.go similarity index 100% rename from tools/cmd/diff/collect.go rename to kittens/diff/collect.go diff --git a/tools/cmd/diff/collect_test.go b/kittens/diff/collect_test.go similarity index 100% rename from tools/cmd/diff/collect_test.go rename to kittens/diff/collect_test.go diff --git a/tools/cmd/diff/diff.go b/kittens/diff/diff.go similarity index 100% rename from tools/cmd/diff/diff.go rename to kittens/diff/diff.go diff --git a/tools/cmd/diff/highlight.go b/kittens/diff/highlight.go similarity index 100% rename from tools/cmd/diff/highlight.go rename to kittens/diff/highlight.go diff --git a/tools/cmd/diff/main.go b/kittens/diff/main.go similarity index 99% rename from tools/cmd/diff/main.go rename to kittens/diff/main.go index cb15502da..4107a4ac5 100644 --- a/tools/cmd/diff/main.go +++ b/kittens/diff/main.go @@ -12,8 +12,8 @@ import ( "path/filepath" "strings" + "kitty/kittens/ssh" "kitty/tools/cli" - "kitty/tools/cmd/ssh" "kitty/tools/config" "kitty/tools/tui/loop" "kitty/tools/utils" diff --git a/tools/cmd/diff/patch.go b/kittens/diff/patch.go similarity index 100% rename from tools/cmd/diff/patch.go rename to kittens/diff/patch.go diff --git a/tools/cmd/diff/render.go b/kittens/diff/render.go similarity index 100% rename from tools/cmd/diff/render.go rename to kittens/diff/render.go diff --git a/tools/cmd/diff/search.go b/kittens/diff/search.go similarity index 100% rename from tools/cmd/diff/search.go rename to kittens/diff/search.go diff --git a/tools/cmd/diff/ui.go b/kittens/diff/ui.go similarity index 100% rename from tools/cmd/diff/ui.go rename to kittens/diff/ui.go diff --git a/tools/cmd/hints/main.go b/kittens/hints/main.go similarity index 100% rename from tools/cmd/hints/main.go rename to kittens/hints/main.go diff --git a/tools/cmd/hints/marks.go b/kittens/hints/marks.go similarity index 100% rename from tools/cmd/hints/marks.go rename to kittens/hints/marks.go diff --git a/tools/cmd/hints/marks_test.go b/kittens/hints/marks_test.go similarity index 100% rename from tools/cmd/hints/marks_test.go rename to kittens/hints/marks_test.go diff --git a/tools/cmd/hints/url_regex.go b/kittens/hints/url_regex.go similarity index 100% rename from tools/cmd/hints/url_regex.go rename to kittens/hints/url_regex.go diff --git a/tools/cmd/hyperlinked_grep/main.go b/kittens/hyperlinked_grep/main.go similarity index 100% rename from tools/cmd/hyperlinked_grep/main.go rename to kittens/hyperlinked_grep/main.go diff --git a/tools/cmd/hyperlinked_grep/main_test.go b/kittens/hyperlinked_grep/main_test.go similarity index 100% rename from tools/cmd/hyperlinked_grep/main_test.go rename to kittens/hyperlinked_grep/main_test.go diff --git a/tools/cmd/icat/detect.go b/kittens/icat/detect.go similarity index 100% rename from tools/cmd/icat/detect.go rename to kittens/icat/detect.go diff --git a/tools/cmd/icat/magick.go b/kittens/icat/magick.go similarity index 100% rename from tools/cmd/icat/magick.go rename to kittens/icat/magick.go diff --git a/tools/cmd/icat/main.go b/kittens/icat/main.go similarity index 100% rename from tools/cmd/icat/main.go rename to kittens/icat/main.go diff --git a/tools/cmd/icat/native.go b/kittens/icat/native.go similarity index 100% rename from tools/cmd/icat/native.go rename to kittens/icat/native.go diff --git a/tools/cmd/icat/process_images.go b/kittens/icat/process_images.go similarity index 100% rename from tools/cmd/icat/process_images.go rename to kittens/icat/process_images.go diff --git a/tools/cmd/icat/transmit.go b/kittens/icat/transmit.go similarity index 100% rename from tools/cmd/icat/transmit.go rename to kittens/icat/transmit.go diff --git a/tools/cmd/ssh/askpass.go b/kittens/ssh/askpass.go similarity index 100% rename from tools/cmd/ssh/askpass.go rename to kittens/ssh/askpass.go diff --git a/tools/cmd/ssh/config.go b/kittens/ssh/config.go similarity index 100% rename from tools/cmd/ssh/config.go rename to kittens/ssh/config.go diff --git a/tools/cmd/ssh/config_test.go b/kittens/ssh/config_test.go similarity index 100% rename from tools/cmd/ssh/config_test.go rename to kittens/ssh/config_test.go diff --git a/tools/cmd/ssh/data.go b/kittens/ssh/data.go similarity index 100% rename from tools/cmd/ssh/data.go rename to kittens/ssh/data.go diff --git a/tools/cmd/ssh/main.go b/kittens/ssh/main.go similarity index 100% rename from tools/cmd/ssh/main.go rename to kittens/ssh/main.go diff --git a/tools/cmd/ssh/main_test.go b/kittens/ssh/main_test.go similarity index 100% rename from tools/cmd/ssh/main_test.go rename to kittens/ssh/main_test.go diff --git a/tools/cmd/ssh/utils.go b/kittens/ssh/utils.go similarity index 100% rename from tools/cmd/ssh/utils.go rename to kittens/ssh/utils.go diff --git a/tools/cmd/ssh/utils_test.go b/kittens/ssh/utils_test.go similarity index 100% rename from tools/cmd/ssh/utils_test.go rename to kittens/ssh/utils_test.go diff --git a/tools/cmd/themes/list.go b/kittens/themes/list.go similarity index 100% rename from tools/cmd/themes/list.go rename to kittens/themes/list.go diff --git a/tools/cmd/themes/main.go b/kittens/themes/main.go similarity index 100% rename from tools/cmd/themes/main.go rename to kittens/themes/main.go diff --git a/tools/cmd/themes/ui.go b/kittens/themes/ui.go similarity index 100% rename from tools/cmd/themes/ui.go rename to kittens/themes/ui.go diff --git a/tools/cmd/unicode_input/main.go b/kittens/unicode_input/main.go similarity index 100% rename from tools/cmd/unicode_input/main.go rename to kittens/unicode_input/main.go diff --git a/tools/cmd/unicode_input/table.go b/kittens/unicode_input/table.go similarity index 100% rename from tools/cmd/unicode_input/table.go rename to kittens/unicode_input/table.go diff --git a/tools/cmd/main.go b/tools/cmd/main.go index 23c12705c..eed0f32e9 100644 --- a/tools/cmd/main.go +++ b/tools/cmd/main.go @@ -5,9 +5,9 @@ package main import ( "os" + "kitty/kittens/ssh" "kitty/tools/cli" "kitty/tools/cmd/completion" - "kitty/tools/cmd/ssh" "kitty/tools/cmd/tool" ) diff --git a/tools/cmd/pytest/main.go b/tools/cmd/pytest/main.go index bb929c705..ef8d73518 100644 --- a/tools/cmd/pytest/main.go +++ b/tools/cmd/pytest/main.go @@ -5,8 +5,8 @@ package pytest import ( "fmt" + "kitty/kittens/ssh" "kitty/tools/cli" - "kitty/tools/cmd/ssh" "kitty/tools/utils/shm" ) diff --git a/tools/cmd/tool/main.go b/tools/cmd/tool/main.go index 22aa421ca..89205736c 100644 --- a/tools/cmd/tool/main.go +++ b/tools/cmd/tool/main.go @@ -5,19 +5,19 @@ package tool import ( "fmt" + "kitty/kittens/ask" + "kitty/kittens/clipboard" + "kitty/kittens/diff" + "kitty/kittens/hints" + "kitty/kittens/hyperlinked_grep" + "kitty/kittens/icat" + "kitty/kittens/ssh" + "kitty/kittens/themes" + "kitty/kittens/unicode_input" "kitty/tools/cli" - "kitty/tools/cmd/ask" "kitty/tools/cmd/at" - "kitty/tools/cmd/clipboard" - "kitty/tools/cmd/diff" "kitty/tools/cmd/edit_in_kitty" - "kitty/tools/cmd/hints" - "kitty/tools/cmd/hyperlinked_grep" - "kitty/tools/cmd/icat" "kitty/tools/cmd/pytest" - "kitty/tools/cmd/ssh" - "kitty/tools/cmd/themes" - "kitty/tools/cmd/unicode_input" "kitty/tools/cmd/update_self" "kitty/tools/tui" )