almost work

Author: zhangfuwen

README.md

@@ -1,16 +1,28 @@
-# nvim-plugin-template
+# github_nvim
 
-Neovim plugin template; includes automatic documentation generation from README, integration tests with Busted, and linting with Stylua
 
 ## Usage
 
-1. Click `use this template` button generate a repo on your github.
-2. Clone your plugin repo. Open terminal then cd plugin directory.
-3. Run `python3 rename.py your-plugin-name`. This will replace all `nvim-plugin-template` to your `plugin-name`. 
-   Then it will prompt you input `y` or `n` to remove example codes in `init.lua` and
-   `test/plugin_spec.lua`. If you are familiar this repo just input `y`. If you are looking at this template for the first time I suggest you inspect the contents. After this step `rename.py` will also auto-remove.
 
-Now you have a clean plugin environment. Enjoy!
+```lua
+
+github_nvim = require("github_nvim")
+github_nvim.setup({})
+require('telescope').load_extension('github_repos')
+
+vim.keymap.set("n", "<leader>ghr", function()
+    vim.cmd("Telescope github_repos")
+end, { desc = "List github repos", buffer = bufnr })
+
+vim.keymap.set("n", "<leader>ghc", function()
+    require("github_nvim").clone()
+end, { desc = "Clone a github repo", buffer = bufnr })
+
+vim.keymap.set("n", "<leader>ghn", function()
+    require("github_nvim").create()
+end, { desc = "New github repo", buffer = bufnr })
+
+```
 
 ## Format
 

lua/github_nvim/clone.lua

@@ -1,14 +1,11 @@
 util = require("github_nvim.util")
+gh = require("github_nvim.gh")
 
 M = {}
 
 
 function M.clone(config)
-    print(vim.inspect(config))
-    is_repo_public = true
-    message = "no message"
-    messageHighlight = "SpecialKey"
-    repo_input = ""
+    local repo_input = ""
     local Popup = require("nui.popup")
     local Layout = require("nui.layout")
     local Input = require("nui.input")
@@ -35,10 +32,8 @@ function M.clone(config)
         prompt = "> ",
         default_value = repo_input,
         on_close = function()
-            print("Input Closed!")
         end,
         on_submit = function(value)
-            print("Input Submitted: " .. value)
         end,
         on_change = function(value)
             repo_input = value
@@ -61,25 +56,8 @@ function M.clone(config)
 
     local function update_status()
         local line = NuiLine()
-        line:append("Options: ")
-        local bufnr, ns_id, linenr_start = popup_one.bufnr, -1, 1
-        line:render(bufnr, ns_id, linenr_start)
-
-        line = NuiLine()
-        line:append("  Visibility: ")
-        line:append(is_repo_public and "public" or "private", "Error")
-        line:append(" <c-p>", "SpecialKey")
-        local bufnr, ns_id, linenr_start = popup_one.bufnr, -1, 2
-        line:render(bufnr, ns_id, linenr_start)
-
-        --NuiLine({ NuiText("one"), NuiText("two", "Error")}):render(bufnr, ns_id, 3)
-        NuiLine({ NuiText("") }):render(bufnr, ns_id, 3)
-        NuiLine({ NuiText("Message: "), NuiText(string.gsub(message, "\n", ""), messageHighlight) }):render(bufnr, ns_id, 4)
-        NuiLine({ NuiText("") }):render(bufnr, ns_id, 5)
-
-        line = NuiLine()
         line:append("Keymaps: ")
-        local bufnr, ns_id, linenr_start = popup_one.bufnr, -1, 6
+        local bufnr, ns_id, linenr_start = popup_one.bufnr, -1, 1
         line:render(bufnr, ns_id, linenr_start)
     end
 
@@ -97,67 +75,6 @@ function M.clone(config)
         }, { dir = "col" })
     )
 
-    local function update_message(msg, hl)
-        message = msg
-        messageHighlight = hl
-        update_status()
-    end
-
-    local function do_clone(user_name, repo_name)
-        local user_dir = config.github_dir .. config.sep .. user_name
-        local repo_dir = user_dir .. config.sep .. repo_name
-        if util.path_exists(repo_dir) then
-            update_message("Error: repo exists", "Error")
-            util.promptYesNo("remove local and retry?", function()
-                local code = util.rm_rf(repo_dir)
-                --                print(string.format("rm command returns %d", code))
-                do_clone(user_name, repo_name)
-            end)
-            return
-        end
-
-        if not util.path_exists(user_dir) then
-            print("making user_dir "..user_dir)
-            util.mkdir_p(user_dir)
-        end
-
-        local clone_command = "gh repo clone " .. user_name .. config.sep .. repo_name
-        message = "running command " .. clone_command .. " ..."
-        update_status()
-
-        local function on_command_exit(result)
-            vim.schedule(function()
-                if result.code == 0 then
-                    update_message("success, path: ".. repo_dir, "Error")
-                    if config.on_clone_success then 
-                        util.promptYesNo("close window and open it?", function()
-                            layout:unmount()
-                            config.on_clone_success(repo_dir)
-                        end)
-                    else
-                        util.promptYesNo("close window?", function() 
-                            layout:unmount()
-                        end)
-                    end
-                else
-                    update_message("failed, reason: " .. result.stderr, "Error")
-                    util.promptYesNo("remove local and retry?", function()
-                        util.rm_rf(repo_dir)
-                        do_clone(user_name, repo_name)
-                    end)
-                end
-            end
-            )
-        end
-
-
-        vim.system({ "bash", "-c", clone_command }, {
-            text = true,
-            cwd = user_dir,
-        }, on_command_exit)
-
-        -- 错误处理
-    end
     local function handle_clone()
         local user_name = ""
         local repo_name = ""
@@ -178,27 +95,23 @@ function M.clone(config)
         messageHighlight = "Error"
         update_status()
 
-        print(string.format("repo: %s, visibility: %s", repo_input, is_repo_public and "public" or "private"))
-        do_clone(user_name, repo_name)
+        gh.do_clone(config, user_name, repo_name, {
+            on_success = function(repo_dir)
+                layout:unmount()
+                util.open_project(repo_dir)
+            end,
+            on_fail = function()
+                layout:unmount()
+            end
+
+        })
     end
     --gh repo create github.nvim --template nvimdev/nvim-plugin-template --public --clone
 
 
 
     update_status()
     keymaps = {
-        {
-            mode = { "i", "n" },
-            lhs = "<c-p>",
-            rhs = function()
-                is_repo_public = not is_repo_public
-                update_status()
-            end,
-            opts = {
-                desc = "change visibility"
-            }
-
-        },
         {
             mode = { "i", "n" },
             lhs = "<c-g>",
@@ -221,7 +134,17 @@ function M.clone(config)
             mode = { "i", "n" },
             lhs = "<c-c>",
             rhs = function()
-                print("close")
+                layout:unmount()
+            end,
+            opts = {
+                desc = "close window"
+            }
+
+        },
+        {
+            mode = { "i", "n" },
+            lhs = "<Esc>",
+            rhs = function()
                 layout:unmount()
             end,
             opts = {
@@ -236,11 +159,10 @@ function M.clone(config)
             clone_input:map(mode, keymap.lhs, keymap.rhs, keymap.opts)
             popup_one:map(mode, keymap.lhs, keymap.rhs, keymap.opts)
         end
-        set_hints(keymap, 6 + i)
+        set_hints(keymap, 1 + i)
     end
 
     layout:mount()
 end
 
-
 return M

lua/github_nvim/config.lua

@@ -1,7 +1,6 @@
 local sep = vim.fn.has("win32") == 1 and "\\" or "/"
 local home = vim.env.HOME or os.getenv("HOME")
 local defaults = {
-    on_clone_success = nil,  -- function(local_path)
     sep = sep,
     home = home,
     github_dir = home .. sep .. "Code" .. sep .. "github.com",

lua/github_nvim/create.lua

@@ -27,7 +27,7 @@ function M.create(config)
         border = {
             style = "single",
             text = {
-                top = "clone: (user/repo)",
+                top = "create: (user/repo)",
                 top_align = "center",
             },
         },
@@ -180,16 +180,10 @@ function M.create(config)
             vim.schedule(function()
                 if result.code == 0 then
                     update_message("success, path: " .. repo_dir, "Error")
-                    if config.on_clone_success then
-                        util.promptYesNo("close window and open it?", function()
-                            layout:unmount()
-                            config.on_clone_success(repo_dir)
-                        end)
-                    else
-                        util.promptYesNo("close window?", function()
-                            layout:unmount()
-                        end)
-                    end
+                    util.promptYesNo("close window and open it?", function()
+                        layout:unmount()
+                        util.open_project(repo_dir)
+                    end)
                 else
                     update_message("failed, reason: " .. result.stderr, "Error")
                     util.promptYesNo("remove local and retry?", function()
@@ -306,6 +300,17 @@ function M.create(config)
             opts = {
                 desc = "close window"
             }
+        },
+        {
+            mode = { "i", "n" },
+            lhs = "<Esc>",
+            rhs = function()
+                print("close")
+                layout:unmount()
+            end,
+            opts = {
+                desc = "close window"
+            }
 
         }
     }

lua/github_nvim/gh.lua

@@ -1,12 +1,82 @@
+local vim = vim
+local util = require("github_nvim.util")
 M = {}
 
 function M.get_github_username()
-  local result = vim.fn.system("gh api user --jq '.login' 2>/dev/null")
-  if vim.v.shell_error == 0 then
-    return string.gsub(result, "\n$", "") -- remove newline
-  else
-    return nil
-  end
+    local result = vim.fn.system("gh api user --jq '.login' 2>/dev/null")
+    if vim.v.shell_error == 0 then
+        return string.gsub(result, "\n$", "") -- remove newline
+    else
+        return nil
+    end
 end
 
+local plugin = util.plugin_name
+local function do_clone(config, user_name, repo_name, opts)
+    opts = opts or {}
+    local user_dir = config.github_dir .. config.sep .. user_name
+    local repo_dir = user_dir .. config.sep .. repo_name
+    if util.path_exists(repo_dir) then
+        vim.notify("Error: repo exists", vim.log.levels.ERROR, { title = plugin })
+        util.promptYesNo("remove local and retry?", function()
+            util.rm_rf(repo_dir)
+            do_clone(config, user_name, repo_name, opts)
+        end)
+        return
+    end
+
+    if not util.path_exists(user_dir) then
+        print("making user_dir " .. user_dir)
+        util.mkdir_p(user_dir)
+    end
+
+
+
+    local clone_command = "gh repo clone " .. user_name .. config.sep .. repo_name
+    local message = "running command " .. clone_command .. " ..."
+    vim.notify(message, vim.log.levels.INFO, {
+        title = plugin,
+        on_open = function()
+            local function on_command_exit(result)
+                vim.schedule(function()
+                    if result.code == 0 then
+                        vim.notify("success, path: " .. repo_dir, vim.log.levels.INFO, { title = plugin })
+                        if opts.on_success then opts.on_success(repo_dir) end
+                    else
+                        vim.notify("failed, reason: " .. result.stderr, "Error", { title = plugin })
+                        util.promptYesNo("retry(remove local)?", function()
+                            util.rm_rf(repo_dir)
+                            do_clone(config, user_name, repo_name, opts)
+                        end, function()
+                            if opts.on_fail then opts.on_fail() end
+                        end
+                        )
+                    end
+                end
+                )
+            end
+
+
+            vim.system({ "bash", "-c", clone_command }, {
+                text = true,
+                cwd = user_dir,
+            }, on_command_exit)
+
+            -- local timer = vim.loop.new_timer()
+            -- timer:start(2000, 0, function()
+            --     vim.notify({ "executing ", "Please wait..." }, "info", {
+            --         title = plugin,
+            --         timeout = 3000,
+            --         on_close = function()
+            --             vim.notify("Problem solved", nil, { title = plugin })
+            --             vim.notify("Error code 0x0395AF", 1, { title = plugin })
+            --         end,
+            --     })
+            -- end)
+        end,
+    })
+end
+
+M.do_clone = do_clone
+
 return M

lua/github_nvim/init.lua

@@ -1,16 +1,6 @@
 local M = {}
 local config = require("github_nvim.config")
 
-
--- M.github_repos = require('github_nvim.pickers.github_repos')
--- local telescope = require("telescope")
--- telescope.register_extension {
---   exports = {
---     github_repos = require('github_nvim/pickers/github_repos')
---   }
--- }
-require('telescope').load_extension('github_repos')
-
 function M.setup(options)
     setmetatable(M, {
         __newindex = config.set,