From ae19f3a2bd80586059c99b4eae285dfc34cc7ea3 Mon Sep 17 00:00:00 2001 From: DariusIII Date: Tue, 14 Feb 2017 14:34:23 +0100 Subject: [PATCH] Add patch and edit processReleases class to add entries to releases_regexes table --- Changelog | 2 ++ nntmux/processing/ProcessReleases.php | 10 ++++++++++ resources/db/patches/mysql/+1~releases_regexes.sql | 0 resources/db/patches/mysql/0295~releases_regexes.sql | 12 ++++++++++++ 4 files changed, 24 insertions(+) delete mode 100644 resources/db/patches/mysql/+1~releases_regexes.sql create mode 100644 resources/db/patches/mysql/0295~releases_regexes.sql diff --git a/Changelog b/Changelog index add2b266c..7cc8e1e94 100755 --- a/Changelog +++ b/Changelog @@ -1,3 +1,5 @@ +2017-02-14 DariusIII + * Chg: Add model for new releases_regexes table 2017-02-13 DariusIII * Chg: Add bad regex logging (bad regex, not regex with 0 matches) * Chg: Improve performance by doing poster check in PHP instead of single row MySQL queries (by b3rs3rk@nZEDb) diff --git a/nntmux/processing/ProcessReleases.php b/nntmux/processing/ProcessReleases.php index 1687ab936..b67f6d716 100755 --- a/nntmux/processing/ProcessReleases.php +++ b/nntmux/processing/ProcessReleases.php @@ -3,6 +3,7 @@ namespace nntmux\processing; use app\models\MultigroupPosters; use app\models\ReleasesGroups; +use app\models\ReleasesRegexes; use app\models\Settings; use nntmux\Categorize; use nntmux\Category; @@ -686,6 +687,15 @@ class ProcessReleases ) ); + // Add the id of regex that matched the collection to releases_regexes table + $releasesRegexes = ReleasesRegexes::create( + [ + 'releases_id' => $releaseID, + 'regex_id' => $collection['collections_regexes_id'], + ] + ); + $releasesRegexes->save(); + if (preg_match_all('#(\S+):\S+#', $collection['xref'], $matches)) { foreach ($matches[1] as $grp) { //check if the group name is in a valid format diff --git a/resources/db/patches/mysql/+1~releases_regexes.sql b/resources/db/patches/mysql/+1~releases_regexes.sql deleted file mode 100644 index e69de29bb..000000000 diff --git a/resources/db/patches/mysql/0295~releases_regexes.sql b/resources/db/patches/mysql/0295~releases_regexes.sql new file mode 100644 index 000000000..0721f47d4 --- /dev/null +++ b/resources/db/patches/mysql/0295~releases_regexes.sql @@ -0,0 +1,12 @@ +# Create the new releases_regexes table + +DROP TABLE IF EXISTS releases_regexes; +CREATE TABLE releases_regexes ( + releases_id INT(11) UNSIGNED NOT NULL AUTO_INCREMENT, + regex_id INT(11) UNSIGNED NOT NULL, + PRIMARY KEY (releases_id, regex_id) +) + ENGINE = MYISAM + DEFAULT CHARSET = utf8 + COLLATE = utf8_unicode_ci + AUTO_INCREMENT = 1;