Skip to content

Commit 6553c3d

Browse files
committed
Add default value for the preferences clean_urls field
1 parent f5a6e7e commit 6553c3d

File tree

1 file changed

+6
-2
lines changed

1 file changed

+6
-2
lines changed

src/utils.rs

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ use hyper::{Body, Request, Response};
1313
use libflate::deflate::{Decoder, Encoder};
1414
use log::error;
1515
use regex::Regex;
16-
use revision::revisioned;
16+
use revision::{revisioned, Error};
1717
use rust_embed::RustEmbed;
1818
use serde::{Deserialize, Deserializer, Serialize, Serializer};
1919
use serde_json::Value;
@@ -671,7 +671,7 @@ pub struct Preferences {
671671
pub hide_score: String,
672672
#[revision(start = 1)]
673673
pub remove_default_feeds: String,
674-
#[revision(start = 2)]
674+
#[revision(start = 2, default_fn = "default_clean_urls")]
675675
pub clean_urls: String,
676676
}
677677

@@ -748,6 +748,9 @@ impl Preferences {
748748
pub fn to_bincode_str(&self) -> Result<String, String> {
749749
Ok(base2048::encode(&self.to_compressed_bincode()?))
750750
}
751+
fn default_clean_urls(_revision: u16) -> Result<String, Error> {
752+
Ok("off".to_owned())
753+
}
751754
}
752755

753756
pub fn deflate_compress(i: Vec<u8>) -> Result<Vec<u8>, String> {
@@ -1680,6 +1683,7 @@ static KNOWN_GOOD_CONFIGS: &[&str] = &[
16801683
"ఴӅβØØҞÉဏႢձĬ༧ȒʯऌԔӵ୮༏",
16811684
"ਧՊΥÀÃǎƱГ۸ඣമĖฤ႙ʟาúໜϾௐɥঀĜໃહཞઠѫҲɂఙ࿔DzઉƲӟӻĻฅΜδ໖ԜǗဖငƦơ৶Ą௩ԹʛใЛʃශаΏ",
16821685
"ਧԩΥÀÃΊ౭൩ඔႠϼҭöҪƸռઇԾॐნɔາǒՍҰच௨ಖມŃЉŐདƦ๙ϩএఠȝഽйʮჯඒϰळՋ௮ສ৵ऎΦѧਹಧଟƙŃ३î༦ŌပղयƟแҜ།",
1686+
"ԅҫടÀÁÓɿဧඑปฎɣĊဨ۹ÕќଌઞೱũდϚӕӜĄӑƺӌĩҹஸইພÇƄŴ࿀টŨ୬ਦတႣಮѿౡಛളƖljljೱ႒ઽරਊԚƢൿɧűХխபծಥဤ౧À"
16831687
];
16841688

16851689
#[test]

0 commit comments

Comments
 (0)