Add news_url in config.rs

man/paru.8

@@ -553,8 +553,9 @@ gpg config\%.
 
 
 .TP
-.B \-\-newsonupgrade
-Print new news during sysupgrade.
+.B \-\-newsonupgrade[=URL]
+Print new news during sysupgrade. By default paru fetches news from the Arch Linux
+RSS news feed. Users of other distributions can customize the RSS feed URL here.
 
 .TP
 .B \-\-useask

man/paru.conf.5

@@ -135,8 +135,9 @@ are built or a package in the build queue is needed as a dependency to build
 another package, install all the packages in the install queue.
 
 .TP
-.B NewsOnUpgrade
-Print new news during sysupgrade.
+.B NewsOnUpgrade [= URL]
+Print new news during sysupgrade. By default paru fetches news from the Arch Linux
+RSS news feed. Users of other distributions can customize the RSS feed URL here.
 
 .TP
 .B UseAsk

src/command_line.rs

@@ -293,8 +293,16 @@ impl Config {
             Arg::Long("noinstall") => self.no_install = true,
 
             Arg::Long("print") | Arg::Short('p') => self.print = true,
-            Arg::Long("newsonupgrade") => self.news_on_upgrade = true,
-            Arg::Long("nonewsonupgrade") => self.news_on_upgrade = false,
+            Arg::Long("newsonupgrade") => {
+                let url: Option<Url>;
+                if let Some(value) = value.ok() {
+                    url = Some(value.parse()?);
+                } else {
+                    url = None;
+                }
+                self.enable_news(url)?;
+            }
+            Arg::Long("nonewsonupgrade") => self.news_url = None,
             Arg::Long("comments") => self.comments = true,
             Arg::Long("ssh") => self.ssh = true,
             Arg::Long("failfast") => self.fail_fast = true,
@@ -414,6 +422,7 @@ fn takes_value(arg: Arg) -> TakesValue {
         Arg::Long("redownload") => TakesValue::Optional,
         Arg::Long("rebuild") => TakesValue::Optional,
         Arg::Long("sudoloop") => TakesValue::Optional,
+        Arg::Long("newsonupgrade") => TakesValue::Optional,
         Arg::Long("develsuffixes") => TakesValue::Required,
         Arg::Long("localrepo") => TakesValue::Optional,
         Arg::Long("chroot") => TakesValue::Optional,

src/config.rs

@@ -416,6 +416,7 @@ pub struct Config {
     pub aur_rpc_url: Option<Url>,
     #[default(Url::parse("https://archlinux.org").unwrap())]
     pub arch_url: Url,
+    pub news_url: Option<Url>,
     pub build_dir: PathBuf,
     pub cache_dir: PathBuf,
     pub state_dir: PathBuf,
@@ -467,7 +468,6 @@ pub struct Config {
     pub optional: bool,
     pub complete: bool,
     pub print: bool,
-    pub news_on_upgrade: bool,
     pub comments: bool,
     pub ssh: bool,
     pub keep_repo_cache: bool,
@@ -1056,7 +1056,15 @@ impl Config {
             "BatchInstall" => self.batch_install = true,
             "UseAsk" => self.use_ask = true,
             "SaveChanges" => self.save_changes = true,
-            "NewsOnUpgrade" => self.news_on_upgrade = true,
+            "NewsOnUpgrade" => {
+                let url: Option<Url>;
+                if let Some(l) = value {
+                    url = Some(l.parse()?);
+                } else {
+                    url = None;
+                }
+                self.enable_news(url)?;
+            }
             "InstallDebug" => self.install_debug = true,
             "Redownload" => self.redownload = YesNoAll::Yes.default_or(key, value)?,
             "Rebuild" => self.rebuild = YesNoAllTree::Yes.default_or(key, value)?,
@@ -1158,6 +1166,13 @@ impl Config {
             "aur"
         }
     }
+
+    // sets url to the one specified if url is Some,
+    // or the defualt arch news url if it's None
+    pub fn enable_news(&mut self, url: Option<Url>) -> Result<()> {
+        self.news_url = Some(url.unwrap_or(self.arch_url.join("feeds/news")?));
+        Ok(())
+    }
 }
 
 pub fn version() {

src/install.rs

@@ -149,7 +149,7 @@ impl Installer {
     async fn news(&self, config: &Config) -> Result<()> {
         let c = config.color;
 
-        if config.news_on_upgrade && config.args.has_arg("u", "sysupgrade") {
+        if config.news_url.is_some() && config.args.has_arg("u", "sysupgrade") {
             let mut ret = 0;
             match news::news(config).await {
                 Ok(v) => ret = v,

src/news.rs

@@ -4,7 +4,7 @@ use crate::fmt::print_indent;
 use std::str::Chars;
 
 use ansi_term::Style;
-use anyhow::{bail, Result};
+use anyhow::{bail, Context, Result};
 use htmlescape::decode_html;
 use rss::Channel;
 use tr::tr;
@@ -30,7 +30,10 @@ pub fn newest_pkg(config: &Config) -> i64 {
 }
 
 pub async fn news(config: &Config) -> Result<i32> {
-    let url = config.arch_url.join("feeds/news")?;
+    let url = config
+        .news_url
+        .clone()
+        .with_context(|| "NewsOnUpgrade is not set")?;
     let client = config.raur.client();
 
     let resp = client.get(url.clone()).send().await?;