diff options
| author | Jörg Frings-Fürst <debian@jff.email> | 2026-03-09 18:19:48 +0100 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff.email> | 2026-03-09 18:19:48 +0100 |
| commit | b11befe1c9ea84969ebd418e96f7209b772b58d0 (patch) | |
| tree | 4cee94cb12ad4dd24253c2a111b87577f50ed80d /src/db | |
| parent | d048b2c970f6182a2201b5ba6c29d0d155abc22b (diff) | |
| parent | 8656a544ddcf098e10df1430eecb75902dbc7999 (diff) | |
Merge branch 'release/debian/0.32.15-1'HEADdebian/0.32.15-1master
Diffstat (limited to 'src/db')
| -rw-r--r-- | src/db/DatabaseTable.vala | 2 | ||||
| -rw-r--r-- | src/db/Db.vala | 8 | ||||
| -rw-r--r-- | src/db/VideoTable.vala | 2 |
3 files changed, 9 insertions, 3 deletions
diff --git a/src/db/DatabaseTable.vala b/src/db/DatabaseTable.vala index be45e5e..5d84df2 100644 --- a/src/db/DatabaseTable.vala +++ b/src/db/DatabaseTable.vala @@ -57,7 +57,7 @@ public abstract class DatabaseTable { re = regex_map[pattern]; } else { try { - re = new Regex(pattern, RegexCompileFlags.DEFAULT, RegexMatchFlags.DEFAULT); + re = new Regex(pattern, 0, 0); regex_map[pattern] = re; } catch (Error err) { context.result_error("Invalid pattern: %s".printf(err.message), Sqlite.ERROR); diff --git a/src/db/Db.vala b/src/db/Db.vala index 7f76f2d..e537ee0 100644 --- a/src/db/Db.vala +++ b/src/db/Db.vala @@ -56,8 +56,12 @@ public VerifyResult verify_database(out string app_version, out int schema_versi return result; } - PhotoTable.clean_comments(); - VideoTable.clean_comments(); + try { + PhotoTable.clean_comments(); + VideoTable.clean_comments(); + } catch (DatabaseError err) { + debug("Ignoring database error while clean ing comments: %s", err.message); + } return VerifyResult.OK; diff --git a/src/db/VideoTable.vala b/src/db/VideoTable.vala index 67c50ba..753e02a 100644 --- a/src/db/VideoTable.vala +++ b/src/db/VideoTable.vala @@ -158,6 +158,8 @@ public class VideoTable : DatabaseTable { if (res != Sqlite.DONE) { if (res != Sqlite.CONSTRAINT) throw_error("VideoTable.add", res); + + return VideoID(); } // fill in ignored fields with database values |