Fix support for non-numeric scrub plans (fixes #48)

README.md

@@ -39,7 +39,7 @@ feature you are missing, you can have a look
 ## Changelog
 ### Unreleased
 * Add --ignore-deletethreshold (by exterrestris, #25)
-* Add support for scrub --plan, replacing --percentage
+* Add support for scrub --plan, replacing --percentage (thanks to fmoledina)
 * Remove snapraid progress output. Was accidentially introduced with python3
   support.
 

snapraid-runner.conf.example

@@ -40,4 +40,5 @@ password =
 enabled = false
 ; scrub plan - either a percentage or one of [bad, new, full]
 plan = 12
+; minimum block age (in days) for scrubbing. Only used with percentage plans
 older-than = 10

snapraid-runner.py

@@ -291,10 +291,17 @@ def run():
     if config["scrub"]["enabled"]:
         logging.info("Running scrub...")
         try:
-            snapraid_command("scrub", {
+            # Check if a percentage plan was given
+            int(config["scrub"]["plan"])
+        except ValueError:
+            scrub_args = {"plan": config["scrub"]["plan"]}
+        else:
+            scrub_args = {
                 "plan": config["scrub"]["plan"],
                 "older-than": config["scrub"]["older-than"],
-            })
+            }
+        try:
+            snapraid_command("scrub", scrub_args)
         except subprocess.CalledProcessError as e:
             logging.error(e)
             finish(False)