.gitlab-ci.yml

@@ -1,19 +0,0 @@
-stages:
-  - armv6
-
-variables:
-    DOCKER_HOST: tcp://docker:2375/
-    DOCKER_DRIVER: overlay2
-    CROSS_REMOTE: 1
-    DOCKER_TLS_CERTDIR: ""
-
-services:
-    - docker:18.09-dind
-
-armv6:
-  stage: armv6
-  image: ghcr.io/cross-rs/x86_64-unknown-linux-gnu:main
-  only:
-    - dev/gitlab-cross-ci
-  script:
-    - cross test --target arm-unknown-linux-gnueabihf

Cargo.lock

@@ -140,25 +140,27 @@ dependencies = [
 
 [[package]]
 name = "futures-channel"
-version = "0.3.26"
+version = "0.3.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2e5317663a9089767a1ec00a487df42e0ca174b61b4483213ac24448e4664df5"
+checksum = "74ed2411805f6e4e3d9bc904c95d5d423b89b3b25dc0250aa74729de20629ff9"
 dependencies = [
  "futures-core",
 ]
 
 [[package]]
 name = "futures-core"
-version = "0.3.26"
+version = "0.3.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ec90ff4d0fe1f57d600049061dc6bb68ed03c7d2fbd697274c41805dcb3f8608"
+checksum = "af51b1b4a7fdff033703db39de8802c673eb91855f2e0d47dcf3bf2c0ef01f99"
 
 [[package]]
 name = "futures-macro"
-version = "0.3.26"
+version = "0.3.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "95a73af87da33b5acf53acfebdc339fe592ecf5357ac7c0a7734ab9d8c876a70"
+checksum = "c54913bae956fb8df7f4dc6fc90362aa72e69148e3f39041fbe8742d21e0ac57"
 dependencies = [
+ "autocfg",
+ "proc-macro-hack",
  "proc-macro2",
  "quote",
  "syn",
@@ -166,27 +168,30 @@ dependencies = [
 
 [[package]]
 name = "futures-sink"
-version = "0.3.26"
+version = "0.3.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f310820bb3e8cfd46c80db4d7fb8353e15dfff853a127158425f31e0be6c8364"
+checksum = "c0f30aaa67363d119812743aa5f33c201a7a66329f97d1a887022971feea4b53"
 
 [[package]]
 name = "futures-task"
-version = "0.3.26"
+version = "0.3.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dcf79a1bf610b10f42aea489289c5a2c478a786509693b80cd39c44ccd936366"
+checksum = "bbe54a98670017f3be909561f6ad13e810d9a51f3f061b902062ca3da80799f2"
 
 [[package]]
 name = "futures-util"
-version = "0.3.26"
+version = "0.3.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c1d6de3acfef38d2be4b1f543f553131788603495be83da675e180c8d6b7bd1"
+checksum = "67eb846bfd58e44a8481a00049e82c43e0ccb5d61f8dc071057cb19249dd4d78"
 dependencies = [
+ "autocfg",
  "futures-core",
  "futures-macro",
  "futures-task",
  "pin-project-lite",
  "pin-utils",
+ "proc-macro-hack",
+ "proc-macro-nested",
  "slab",
 ]
 
@@ -491,6 +496,18 @@ dependencies = [
  "version_check",
 ]
 
+[[package]]
+name = "proc-macro-hack"
+version = "0.5.20+deprecated"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dc375e1527247fe1a97d8b7156678dfe7c1af2fc075c9a4db3690ecd2a148068"
+
+[[package]]
+name = "proc-macro-nested"
+version = "0.1.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bc881b2c22681370c6a780e47af9840ef841837bc98118431d4e1868bd0c1086"
+
 [[package]]
 name = "proc-macro2"
 version = "1.0.28"

src/ui/no_yaml_found.rs

@@ -53,7 +53,8 @@ impl std::iter::Iterator for State {
 pub enum DeferredEvent {
     Quit,
     NewRepo(String),
-    LoadMoreTags,
+    TagPrevious,
+    TagNext,
 }
 
 impl Ui {
@@ -72,8 +73,6 @@ impl Ui {
         events: mpsc::Receiver<DeferredEvent>,
         sender: mpsc::Sender<UiEvent>,
     ) -> Result<(), Error> {
-        use std::sync::atomic::Ordering;
-        let fetching_tags = Arc::new(std::sync::atomic::AtomicBool::new(false));
         loop {
             match events.recv() {
                 Ok(DeferredEvent::Quit) => break,
@@ -87,39 +86,29 @@ impl Ui {
                     let mut ui = ui.lock().unwrap();
                     ui.tags = list;
                 }
-                Ok(DeferredEvent::LoadMoreTags) if !fetching_tags.load(Ordering::Relaxed) => {
-                    fetching_tags.store(true, Ordering::Relaxed);
-                    let mut tags_copy = {
+                Ok(DeferredEvent::TagPrevious) => {
                     let mut ui = ui.lock().unwrap();
+                    ui.tags.previous();
+                    ui.details = ui.tags.create_detail_widget();
+                }
+                Ok(DeferredEvent::TagNext) => {
+                    let (fetched_new_tags, mut tags) = {
+                        let mut ui = ui.lock().unwrap();
+                        if ui.tags.at_end_of_list() {
                             ui.info.set_text("Fetching more tags...");
                             sender.send(UiEvent::RefreshOnNewData)?;
-                        ui.tags.clone()
-                    };
-
-                    let sender_copy = sender.clone();
-                    let ui_copy = ui.clone();
-                    let fetching_tags_copy = fetching_tags.clone();
-                    std::thread::spawn(move || {
-                        tokio::runtime::Builder::new_multi_thread()
-                            .enable_all()
-                            .build()
-                            .unwrap()
-                            .block_on(async {
-                                tags_copy.load_next_page().await;
-                                let mut ui = ui_copy.lock().unwrap();
-                                //set position to the position of old TagList
-                                //it may have changed since tag fetching has been invoked
-                                tags_copy.set_cursor(ui.tags.get_cursor().clone());
-                                ui.tags = tags_copy;
-                                ui.details = ui.tags.create_detail_widget();
-                                ui.info.set_text("Fetching tags done");
-                                sender_copy.send(UiEvent::RefreshOnNewData).unwrap();
-                                fetching_tags_copy.store(false, Ordering::Relaxed);
-                            })
-                    });
+                            (true, ui.tags.clone())
+                        } else {
+                            (false, ui.tags.clone())
+                        }
+                    };
+                    tags.next().await;
+                    let mut ui = ui.lock().unwrap();
+                    ui.tags = tags;
+                    ui.details = ui.tags.create_detail_widget();
+                    if fetched_new_tags {
+                        ui.info.set_text("Fetching tags done");
                     }
-                Ok(DeferredEvent::LoadMoreTags) => {
-                    //do nothing, as we are fetching tags
                 }
                 Err(e) => {
                     let mut ui = ui.lock().unwrap();
@@ -192,7 +181,7 @@ impl Ui {
                 let (tags, state) = ui_data.tags.render(render_state);
                 let more_chunks = Layout::default()
                     .direction(Direction::Horizontal)
-                    .constraints([Constraint::Min(15), Constraint::Length(30)].as_ref())
+                    .constraints([Constraint::Min(15), Constraint::Length(28)].as_ref())
                     .split(chunks[1]);
                 rect.render_stateful_widget(tags, more_chunks[0], state);
                 rect.render_widget(ui_data.details.render(), more_chunks[1]);
@@ -234,14 +223,12 @@ impl Ui {
                     }
                     //moving up on selecting tags
                     Key::Up | Key::Char('k') if ui_data.state == State::SelectTag => {
-                        ui_data.tags.previous();
+                        deferred_sender.send(DeferredEvent::TagPrevious)?;
                         ui_data.details = ui_data.tags.create_detail_widget();
                     }
                     //moving down on selecting tags
                     Key::Down | Key::Char('j') if ui_data.state == State::SelectTag => {
-                        if ui_data.tags.next().is_some() {
-                            deferred_sender.send(DeferredEvent::LoadMoreTags).unwrap();
-                        }
+                        deferred_sender.send(DeferredEvent::TagNext)?;
                         ui_data.details = ui_data.tags.create_detail_widget();
                     }
                     //append character on editing repository

src/ui/yaml_found.rs

@@ -58,7 +58,8 @@ impl std::iter::Iterator for State {
 pub enum DeferredEvent {
     Quit,
     NewRepo(String),
-    LoadMoreTags,
+    TagPrevious,
+    TagNext,
 }
 
 impl Ui {
@@ -77,8 +78,6 @@ impl Ui {
         events: mpsc::Receiver<DeferredEvent>,
         sender: mpsc::Sender<UiEvent>,
     ) -> Result<(), Error> {
-        use std::sync::atomic::Ordering;
-        let fetching_tags = Arc::new(std::sync::atomic::AtomicBool::new(false));
         loop {
             match events.recv() {
                 Ok(DeferredEvent::Quit) => break,
@@ -92,39 +91,29 @@ impl Ui {
                     let mut ui = ui.lock().unwrap();
                     ui.tags = list;
                 }
-                Ok(DeferredEvent::LoadMoreTags) if !fetching_tags.load(Ordering::Relaxed) => {
-                    fetching_tags.store(true, Ordering::Relaxed);
-                    let mut tags_copy = {
+                Ok(DeferredEvent::TagPrevious) => {
                     let mut ui = ui.lock().unwrap();
+                    ui.tags.previous();
+                    ui.details = ui.tags.create_detail_widget();
+                }
+                Ok(DeferredEvent::TagNext) => {
+                    let (fetched_new_tags, mut tags) = {
+                        let mut ui = ui.lock().unwrap();
+                        if ui.tags.at_end_of_list() {
                             ui.info.set_text("Fetching more tags...");
                             sender.send(UiEvent::RefreshOnNewData)?;
-                        ui.tags.clone()
-                    };
-
-                    let sender_copy = sender.clone();
-                    let ui_copy = ui.clone();
-                    let fetching_tags_copy = fetching_tags.clone();
-                    std::thread::spawn(move || {
-                        tokio::runtime::Builder::new_multi_thread()
-                            .enable_all()
-                            .build()
-                            .unwrap()
-                            .block_on(async {
-                                tags_copy.load_next_page().await;
-                                let mut ui = ui_copy.lock().unwrap();
-                                //set position to the position of old TagList
-                                //it may have changed since tag fetching has been invoked
-                                tags_copy.set_cursor(ui.tags.get_cursor().clone());
-                                ui.tags = tags_copy;
-                                ui.details = ui.tags.create_detail_widget();
-                                ui.info.set_text("Fetching tags done");
-                                sender_copy.send(UiEvent::RefreshOnNewData).unwrap();
-                                fetching_tags_copy.store(false, Ordering::Relaxed);
-                            })
-                    });
+                            (true, ui.tags.clone())
+                        } else {
+                            (false, ui.tags.clone())
+                        }
+                    };
+                    tags.next().await;
+                    let mut ui = ui.lock().unwrap();
+                    ui.tags = tags;
+                    ui.details = ui.tags.create_detail_widget();
+                    if fetched_new_tags {
+                        ui.info.set_text("Fetching tags done");
                     }
-                Ok(DeferredEvent::LoadMoreTags) => {
-                    //do nothing, as we are fetching tags
                 }
                 Err(e) => {
                     let mut ui = ui.lock().unwrap();
@@ -323,15 +312,11 @@ impl Ui {
                     }
                     //moving up on selecting tags
                     Key::Up | Key::Char('k') if ui_data.state == State::SelectTag => {
-                        ui_data.tags.previous();
-                        ui_data.details = ui_data.tags.create_detail_widget();
+                        deferred_sender.send(DeferredEvent::TagPrevious).unwrap();
                     }
                     //moving down on selecting tags
                     Key::Down | Key::Char('j') if ui_data.state == State::SelectTag => {
-                        if ui_data.tags.next().is_some() {
-                            deferred_sender.send(DeferredEvent::LoadMoreTags).unwrap();
-                        }
-                        ui_data.details = ui_data.tags.create_detail_widget();
+                        deferred_sender.send(DeferredEvent::TagNext).unwrap();
                     }
                     //append character on editing repository
                     Key::Char(key) if ui_data.state == State::EditRepo => {

src/widget/async_tag_list.rs

@@ -86,12 +86,11 @@ impl TagList {
         }
     }
 
-    pub fn set_cursor(&mut self, state: ListState) {
-        self.state = state;
+    pub fn at_end_of_list(&self) -> bool {
+        if let Some(i) = self.state.selected() {
+            return i == self.lines.len() - 2;
         }
-
-    pub fn get_cursor(&self) -> &ListState {
-        &self.state
+        false
     }
 
     pub fn render(&mut self, colored: bool) -> (List, &mut ListState) {
@@ -178,19 +177,16 @@ impl TagList {
     }
 
     /// select next tag
-    /// returns Some when more tags need to be fetched otherwise None
-    pub fn next(&mut self) -> Option<()> {
+    pub async fn next(&mut self) {
         if let Some(Line::Status(_)) = self.lines.get(0) {
-            return None;
+            return;
         }
         match self.state.selected() {
             None if !self.lines.is_empty() => self.state.select(Some(0)),
             None => (),
-            Some(i) if i == self.lines.len() - 2 => return Some(()),
-            // Some(i) if i == self.lines.len() - 2 => return self.load_next_page().await,
+            Some(i) if i == self.lines.len() - 2 => self.load_next_page().await,
             Some(i) => self.state.select(Some(i + 1)),
         }
-        None
     }
 
     /// select previous tag

src/widget/details.rs

@@ -26,7 +26,7 @@ impl Details {
         let mut lines = vec![format!("{:^10}|{:^6}|{:^6}", "ARCH", "OS", "SIZE")];
         for d in &self.details {
             lines.push(format!(
-                "{:>10}|{:>6}|{:>6} MB",
+                "{:^10}|{:^6}|{:^6}MB",
                 format!(
                     "{}{}",
                     d.arch.clone().unwrap_or_default(),