refactor: add SearchContinue data struct

src/ui/search/display.rs

@@ -120,11 +120,11 @@ pub fn display_search_results(siv: &mut Cursive, search: Search) -> Result<()> {
 
     // create the continue button (Button)
     let search_continue_button = {
-        let search = search;
-        Button::new("Show more results...", move |s| {
-            on_continue_submit(s, search.clone())
-        })
-        .with_name(search_continue_button_name)
+        let callback: Box<dyn 'static + Fn(&mut Cursive)> = match search.continue_data() {
+            Some(data) => Box::new(move |s| on_continue_submit(s, data.clone())),
+            None => Box::new(|_| {}),
+        };
+        Button::new("Show more results...", callback).with_name(search_continue_button_name)
     };
 
     debug!("created the views for the search results layout");
@@ -195,7 +195,11 @@ pub fn display_more_search_results(siv: &mut Cursive, search: Search) -> Result<
 
     // modify the callback of the continue button so we don't search for the same thing again
     {
-        search_continue_button.set_callback(move |s| on_continue_submit(s, search.clone()));
+        let callback: Box<dyn 'static + Fn(&mut Cursive)> = match search.continue_data() {
+            Some(data) => Box::new(move |s| on_continue_submit(s, data.clone())),
+            None => Box::new(|_| {}),
+        };
+        search_continue_button.set_callback(callback);
     }
     debug!("set the new callback of the continue button");
 

src/ui/search/mod.rs

@@ -1,7 +1,7 @@
 use crate::{
     config::Config,
     ui::utils::display_error,
-    wiki::search::{Search, SearchResult},
+    wiki::search::{Search, SearchContinue, SearchResult},
 };
 
 use anyhow::Context;
@@ -108,18 +108,13 @@ fn on_result_select(siv: &mut Cursive, item: &SearchResult) {
 
 /// Searches for more results at a given offset and adds them to the results view. It's a callback
 /// for the continue button and displays an error if something went wrong
-fn on_continue_submit(siv: &mut Cursive, search: Search) {
-    let offset = match search.continue_offset {
-        Some(ref offset) => offset,
-        None => return,
-    };
-
+fn on_continue_submit(siv: &mut Cursive, continue_data: SearchContinue) {
     // continue the search and fetch more results
     let continue_search = match Search::builder()
-        .query(search.query)
-        .endpoint(search.endpoint)
-        .language(search.language)
-        .offset(*offset)
+        .query(continue_data.query)
+        .endpoint(continue_data.endpoint)
+        .language(continue_data.language)
+        .offset(continue_data.offset)
         .search()
         .context("failed to fetch more search results")
     {

src/wiki/search.rs

@@ -25,6 +25,27 @@ impl Search {
     pub fn builder() -> SearchBuilder<NoQuery, NoEndpoint, NoLanguage> {
         SearchBuilder::default()
     }
+
+    pub fn continue_data(&self) -> Option<SearchContinue> {
+        if let Some(ref offset) = self.continue_offset {
+            return Some(SearchContinue {
+                query: self.query.clone(),
+                endpoint: self.endpoint.clone(),
+                language: self.language.clone(),
+                offset: *offset,
+            });
+        }
+        None
+    }
+}
+
+/// Struct containing all the necessary data for continuing the search
+#[derive(Debug, Clone)]
+pub struct SearchContinue {
+    pub query: String,
+    pub endpoint: Url,
+    pub language: Language,
+    pub offset: usize,
 }
 
 #[derive(Deserialize, Debug, Clone)]