Also handle URL redirect links on print page

Signed-off-by: Hollow Man <[email protected]>

Author: HollowMan6

src/utils/mod.rs

@@ -204,24 +204,42 @@ fn adjust_links<'a>(
                     // Fix redirect links
                     let normalized_path_split: Vec<&str> = normalized_path.split('#').collect();
                     for (original, redirect) in &redirects {
-                        if !SCHEME_LINK.is_match(&redirect)
-                            && normalize_path(original.trim_start_matches('/'))
-                                .eq_ignore_ascii_case(&normalize_path(normalized_path_split[0]))
+                        if normalize_path(original.trim_start_matches('/'))
+                            .eq_ignore_ascii_case(&normalized_path)
+                            || normalize_path(original.trim_start_matches('/'))
+                                .eq_ignore_ascii_case(&normalized_path_split[0])
                         {
                             let mut unnormalized_path = String::new();
-                            let base = PathBuf::from(normalized_path_split[0])
-                                .parent()
-                                .expect("path can't be empty")
-                                .to_str()
-                                .expect("utf-8 paths only")
-                                .to_owned();
-                            write!(unnormalized_path, "{}/{}", normalize_path(base), redirect)
-                                .unwrap();
-                            for i in 1..normalized_path_split.len() {
-                                unnormalized_path.push('#');
-                                unnormalized_path.push_str(normalized_path_split[i]);
+                            if SCHEME_LINK.is_match(&redirect) {
+                                unnormalized_path = redirect.to_string();
+                            } else {
+                                let base = PathBuf::from(normalized_path_split[0])
+                                    .parent()
+                                    .expect("path can't be empty")
+                                    .to_str()
+                                    .expect("utf-8 paths only")
+                                    .to_owned();
+                                write!(unnormalized_path, "{}/{}", normalize_path(base), redirect)
+                                    .unwrap();
+                            }
+
+                            // original without anchors, need to append link anchors
+                            if !original.contains("#") {
+                                for i in 1..normalized_path_split.len() {
+                                    if !unnormalized_path.contains("#") {
+                                        unnormalized_path.push('#');
+                                    } else {
+                                        unnormalized_path.push('-');
+                                    }
+                                    unnormalized_path.push_str(normalized_path_split[i]);
+                                }
+                            }
+
+                            if !SCHEME_LINK.is_match(&redirect) {
+                                normalized_path = normalize_path(unnormalized_path);
+                            } else {
+                                return CowStr::from(unnormalized_path);
                             }
-                            normalized_path = normalize_path(unnormalized_path);
                             break;
                         }
                     }