make loading of additional config files optional

Signed-off-by: Robin Appelman <robin@icewind.nl>

appinfo/info.xml

@@ -7,7 +7,7 @@
 	<description><![CDATA[Push update support for desktop app.
 
 Once the app is installed, the push binary needs to be setup. You can either use the setup wizard with `occ notify_push:setup` or see the [README](http://github.com/nextcloud/notify_push) for detailed setup instructions]]></description>
-	<version>0.2.0</version>
+	<version>0.2.1</version>
 	<licence>agpl</licence>
 	<author>Robin Appelman</author>
 	<namespace>NotifyPush</namespace>

src/config.rs

@@ -65,6 +65,9 @@ pub struct Opt {
     /// Disable ansi escape sequences in logging output
     #[structopt(long)]
     pub no_ansi: bool,
+    /// Load other files named *.config.php in the config folder
+    #[structopt(long)]
+    pub glob_config: bool,
 }
 
 #[derive(Debug)]
@@ -171,7 +174,7 @@ impl Config {
         let from_config = opt
             .config_file
             .as_ref()
-            .map(PartialConfig::from_file)
+            .map(|path| PartialConfig::from_file(path, opt.glob_config))
             .transpose()?
             .unwrap_or_default();
         let from_env = PartialConfig::from_env()?;
@@ -232,8 +235,8 @@ impl PartialConfig {
         })
     }
 
-    fn from_file(file: impl AsRef<Path>) -> Result<Self> {
-        parse_config_file(file)
+    fn from_file(file: impl AsRef<Path>, glob: bool) -> Result<Self> {
+        parse_config_file(file, glob)
     }
 
     fn from_opt(opt: Opt) -> Self {

src/config/nc.rs

@@ -1,10 +1,11 @@
 use crate::config::PartialConfig;
 use color_eyre::{eyre::WrapErr, Result};
-use nextcloud_config_parser::parse;
+use nextcloud_config_parser::{parse, parse_glob};
 use std::path::Path;
 
-pub(super) fn parse_config_file(path: impl AsRef<Path>) -> Result<PartialConfig> {
-    let config = parse(path).wrap_err("Failed to parse nextcloud config")?;
+pub(super) fn parse_config_file(path: impl AsRef<Path>, glob: bool) -> Result<PartialConfig> {
+    let config = if glob { parse(path) } else { parse_glob(path) }
+        .wrap_err("Failed to parse nextcloud config")?;
 
     Ok(PartialConfig {
         database: Some(config.database.into()),