From fbe25e1a1c3fdc6be790489a9fbc0b190516cc5d Mon Sep 17 00:00:00 2001
From: daa84 <daa84@inbox.ru>
Date: Wed, 18 Oct 2017 17:49:56 +0300
Subject: [PATCH] Code reorganisation

---
 src/plug_manager/manager.rs  | 45 ++++++-----------------------
 src/plug_manager/mod.rs      |  2 ++
 src/plug_manager/store.rs    |  9 ++++++
 src/plug_manager/ui.rs       | 16 +++++++----
 src/plug_manager/vim_plug.rs | 56 ++++++++++++++++++++++++++++++++++++
 5 files changed, 86 insertions(+), 42 deletions(-)
 create mode 100644 src/plug_manager/store.rs
 create mode 100644 src/plug_manager/vim_plug.rs

diff --git a/src/plug_manager/manager.rs b/src/plug_manager/manager.rs
index 24d295e..13158ee 100644
--- a/src/plug_manager/manager.rs
+++ b/src/plug_manager/manager.rs
@@ -1,50 +1,21 @@
 use std::rc::Rc;
-use std::cell::{RefCell, RefMut};
+use std::cell::RefCell;
 
-use neovim_lib::{Neovim, NeovimApi};
-
-use nvim::{NeovimClient, ErrorReport};
+use super::vim_plug;
+use nvim::NeovimClient;
 
 pub struct Manager {
-    nvim: Option<Rc<RefCell<NeovimClient>>>,
+    pub vim_plug: vim_plug::Manager,
 }
 
 impl Manager {
     pub fn new() -> Self {
-        Manager { nvim: None }
+        Manager {  
+            vim_plug: vim_plug::Manager::new(),
+        }
     }
 
     pub fn initialize(&mut self, nvim: Rc<RefCell<NeovimClient>>) {
-        self.nvim = Some(nvim);
-    }
-
-    fn nvim(&self) -> Option<RefMut<Neovim>> {
-        let nvim_client = self.nvim.as_ref().unwrap();
-        if nvim_client.borrow().is_initialized() {
-            Some(RefMut::map(nvim_client.borrow_mut(), |n| n.nvim_mut()))
-        } else {
-            None
-        }
-    }
-
-    pub fn get_state(&self) -> State {
-        if let Some(mut nvim) = self.nvim() {
-            let loaded_plug = nvim.eval("exists('g:loaded_plug')");
-            loaded_plug
-                .ok_and_report(&mut *nvim)
-                .and_then(|loaded_plug| loaded_plug.as_i64())
-                .map_or(State::Unknown, |loaded_plug| if loaded_plug > 0 {
-                    State::AlreadyLoaded
-                } else {
-                    State::Unknown
-                })
-        } else {
-            State::Unknown
-        }
+        self.vim_plug.initialize(nvim);
     }
 }
-
-pub enum State {
-    Unknown,
-    AlreadyLoaded,
-}
diff --git a/src/plug_manager/mod.rs b/src/plug_manager/mod.rs
index d20f8e8..647f6f4 100644
--- a/src/plug_manager/mod.rs
+++ b/src/plug_manager/mod.rs
@@ -1,4 +1,6 @@
 mod ui;
+mod vim_plug;
+mod store;
 mod manager;
 
 pub use self::ui::Ui;
diff --git a/src/plug_manager/store.rs b/src/plug_manager/store.rs
new file mode 100644
index 0000000..56d7d81
--- /dev/null
+++ b/src/plug_manager/store.rs
@@ -0,0 +1,9 @@
+pub struct Store {
+    
+}
+
+impl Store {
+    pub fn new() -> Self {
+        Store {  }
+    }
+}
diff --git a/src/plug_manager/ui.rs b/src/plug_manager/ui.rs
index e3d1dd0..c1d939e 100644
--- a/src/plug_manager/ui.rs
+++ b/src/plug_manager/ui.rs
@@ -2,6 +2,7 @@ use gtk;
 use gtk::prelude::*;
 
 use super::manager;
+use super::vim_plug;
 
 pub struct Ui<'a> {
     manager: &'a manager::Manager,
@@ -26,10 +27,10 @@ impl<'a> Ui<'a> {
         let tabs = gtk::Notebook::new();
 
         match self.get_state() {
-            manager::State::AlreadyLoaded => {
+            vim_plug::State::AlreadyLoaded => {
                 let get_plugins = gtk::Box::new(gtk::Orientation::Vertical, 0);
                 let warn_lbl = gtk::Label::new(
-                    "Plug manager already loaded.\n\
+                    "vim-plug manager already loaded.\n\
                                                NeovimGtk manages plugins using vim-plug as backend.\n\
                                                To allow NeovimGtk manage plugins please disable vim-plug in your configuration",
                 );
@@ -37,13 +38,14 @@ impl<'a> Ui<'a> {
                 let get_plugins_lbl = gtk::Label::new("Help");
                 tabs.append_page(&get_plugins, Some(&get_plugins_lbl));
             }
-            manager::State::Unknown => {
+            vim_plug::State::Unknown => {
                 let get_plugins = gtk::Box::new(gtk::Orientation::Vertical, 0);
                 let get_plugins_lbl = gtk::Label::new("Get Plugins");
                 tabs.append_page(&get_plugins, Some(&get_plugins_lbl));
             }
         }
 
+        self.get_plugs();
         let plugins = gtk::Box::new(gtk::Orientation::Vertical, 0);
         let plugins_lbl = gtk::Label::new("Plugins");
         tabs.append_page(&plugins, Some(&plugins_lbl));
@@ -63,7 +65,11 @@ impl<'a> Ui<'a> {
         dlg.destroy();
     }
 
-    fn get_state(&self) -> manager::State {
-        self.manager.get_state()
+    fn get_state(&self) -> vim_plug::State {
+        self.manager.vim_plug.get_state()
+    }
+
+    fn get_plugs(&self) {
+        self.manager.vim_plug.get_plugs();
     }
 }
diff --git a/src/plug_manager/vim_plug.rs b/src/plug_manager/vim_plug.rs
new file mode 100644
index 0000000..9113956
--- /dev/null
+++ b/src/plug_manager/vim_plug.rs
@@ -0,0 +1,56 @@
+use std::rc::Rc;
+use std::cell::{RefCell, RefMut};
+
+use neovim_lib::{Neovim, NeovimApi};
+
+use nvim::{NeovimClient, ErrorReport};
+
+pub struct Manager {
+    nvim: Option<Rc<RefCell<NeovimClient>>>,
+}
+
+impl Manager {
+    pub fn new() -> Self {
+        Manager { nvim: None }
+    }
+
+    pub fn initialize(&mut self, nvim: Rc<RefCell<NeovimClient>>) {
+        self.nvim = Some(nvim);
+    }
+
+    fn nvim(&self) -> Option<RefMut<Neovim>> {
+        let nvim_client = self.nvim.as_ref().unwrap();
+        if nvim_client.borrow().is_initialized() {
+            Some(RefMut::map(nvim_client.borrow_mut(), |n| n.nvim_mut()))
+        } else {
+            None
+        }
+    }
+
+    pub fn get_plugs(&self) {
+        if let Some(mut nvim) = self.nvim() {
+            let plugs = nvim.eval("g:plugs");
+        }
+    }
+
+    pub fn get_state(&self) -> State {
+        if let Some(mut nvim) = self.nvim() {
+            let loaded_plug = nvim.eval("exists('g:loaded_plug')");
+            loaded_plug
+                .ok_and_report(&mut *nvim)
+                .and_then(|loaded_plug| loaded_plug.as_i64())
+                .map_or(State::Unknown, |loaded_plug| if loaded_plug > 0 {
+                    State::AlreadyLoaded
+                } else {
+                    State::Unknown
+                })
+        } else {
+            State::Unknown
+        }
+    }
+}
+
+pub enum State {
+    Unknown,
+    AlreadyLoaded,
+}