Merge pull request #339 from Kobzol/verifier-generalize

Allow using survey verifier for more survey kinds

Author: Kobzol

verifier/src/api.rs

@@ -28,8 +28,14 @@ impl Client {
             .inner
             .get("https://api.surveyhero.com/v1/surveys")
             .basic_auth(&self.username, Some(&self.password))
-            .send()?
-            .error_for_status()?;
+            .send()?;
+        let status = response.status();
+        if !status.is_success() {
+            let text = response.text()?;
+            return Err(anyhow::anyhow!(
+                "HTTP error status {status} while fetching surveys:\n{text}"
+            ));
+        }
         let surveys: Surveys = response.json()?;
         Ok(surveys.surveys)
     }

verifier/src/main.rs

@@ -15,20 +15,22 @@ fn main() -> anyhow::Result<()> {
     let args = Args::parse();
     let online_data = fetch_surveyhero_data(args.cmd.shared())?;
 
-    let base_path = PathBuf::from(format!(
-        "../surveys/{}-annual-survey",
-        args.cmd.shared().year
-    ));
-    let mut pairs = vec![(base_path.join("questions.md"), online_data.main)];
-    for (language, questions) in online_data.secondary_languages {
-        pairs.push((
-            base_path
-                .join("translations")
-                .join(language)
-                .with_extension("md"),
-            questions,
-        ));
-    }
+    let base_path = PathBuf::from(format!("../surveys/{}", args.cmd.shared().path));
+    let pairs = if base_path.is_dir() {
+        let mut pairs = vec![(base_path.join("questions.md"), online_data.main)];
+        for (language, questions) in online_data.secondary_languages {
+            pairs.push((
+                base_path
+                    .join("translations")
+                    .join(language)
+                    .with_extension("md"),
+                questions,
+            ));
+        }
+        pairs
+    } else {
+        vec![(base_path, online_data.main)]
+    };
 
     match args.cmd {
         VerifierCmd::Check { .. } => {
@@ -318,9 +320,9 @@ struct SharedArgs {
     /// Name of the survey.
     #[clap(long)]
     survey_name: String,
-    /// Year of the survey. Corresponds to `surveys/<year>-annual-survey` directory.
+    /// Survey path. Corresponds to a Markdown file or a directory at `surveys/<path>`.
     #[clap(long)]
-    year: u32,
+    path: String,
 }
 
 #[derive(clap::Parser, Clone)]