Automatic repair for calendar objects with invalid VERSION:4.0

src/commands/mod.rs

@@ -17,6 +17,7 @@ pub fn cmd_gen_config(_args: GenConfigArgs) -> anyhow::Result<()> {
         http: HttpConfig::default(),
         data_store: DataStoreConfig::Sqlite(SqliteDataStoreConfig {
             db_url: "/var/lib/rustical/db.sqlite3".to_owned(),
+            run_repairs: true,
         }),
         tracing: TracingConfig::default(),
         frontend: FrontendConfig {

src/config.rs

@@ -26,6 +26,8 @@ impl Default for HttpConfig {
 #[serde(deny_unknown_fields)]
 pub struct SqliteDataStoreConfig {
     pub db_url: String,
+    #[serde(default = "default_true")]
+    pub run_repairs: bool,
 }
 
 #[derive(Debug, Deserialize, Serialize)]

src/main.rs

@@ -70,15 +70,22 @@ async fn get_data_stores(
     Receiver<CollectionOperation>,
 )> {
     Ok(match &config {
-        DataStoreConfig::Sqlite(SqliteDataStoreConfig { db_url }) => {
+        DataStoreConfig::Sqlite(SqliteDataStoreConfig {
+            db_url,
+            run_repairs,
+        }) => {
             let db = create_db_pool(db_url, migrate).await?;
             // Channel to watch for changes (for DAV Push)
             let (send, recv) = tokio::sync::mpsc::channel(1000);
 
             let addressbook_store = Arc::new(SqliteAddressbookStore::new(db.clone(), send.clone()));
-            addressbook_store.repair_orphans().await?;
             let cal_store = Arc::new(SqliteCalendarStore::new(db.clone(), send));
-            cal_store.repair_orphans().await?;
+            if *run_repairs {
+                info!("Running repair tasks");
+                addressbook_store.repair_orphans().await?;
+                cal_store.repair_invalid_version_4_0().await?;
+                cal_store.repair_orphans().await?;
+            }
             let subscription_store = Arc::new(SqliteStore::new(db.clone()));
             let principal_store = Arc::new(SqlitePrincipalStore::new(db));
             (
@@ -119,7 +126,9 @@ async fn main() -> Result<()> {
                 get_data_stores(!args.no_migrations, &config.data_store).await?;
 
             warn!(
-                "Validating calendar data against the next-version ical parser.\nIn the next major release these will be rejected and cause errors.\nIf any errors occur, please open an issue so they can be fixed before the next major release."
+                "Validating calendar data against the next-version ical parser.
+In the next major release these will be rejected and cause errors.
+If any errors occur, please open an issue so they can be fixed before the next major release."
             );
             validate_calendar_objects_0_12(principal_store.as_ref(), cal_store.as_ref()).await?;
             validate_address_objects_0_12(principal_store.as_ref(), addr_store.as_ref()).await?;

src/migration_0_12.rs

@@ -16,10 +16,6 @@ pub async fn validate_calendar_objects_0_12(
                     ical_dev::parser::ical::IcalObjectParser::new(object.get_ics().as_bytes())
                         .expect_one()
                 {
-                    if ical_dev::parser::ParserError::InvalidVersion == err {
-                        // This is a known issue that might cause a lot of spam in the logs
-                        continue;
-                    }
                     success = false;
                     error!(
                         "An error occured parsing a calendar object: principal={principal}, calendar={calendar}, object_id={object_id}: {err}",