From 27480d8e8e82f1f87362acd53f60bf24c2227b01 Mon Sep 17 00:00:00 2001 From: Mikael Nordfeldth Date: Thu, 19 Feb 2015 18:34:48 +0100 Subject: [PATCH] File_redirection also got urlhash column --- classes/File.php | 10 ++++++++++ classes/File_redirection.php | 33 ++++++++++++++++++++++++--------- scripts/upgrade.php | 17 ++++++++++------- 3 files changed, 44 insertions(+), 16 deletions(-) diff --git a/classes/File.php b/classes/File.php index dad54166b1..7d09b74c43 100644 --- a/classes/File.php +++ b/classes/File.php @@ -479,6 +479,16 @@ class File extends Managed_DataObject return $this->url; } + static public function getByUrl($url) + { + $file = new File(); + $file->urlhash = self::hashurl($url); + if (!$file->find(true)) { + throw new NoResultException($file); + } + return $file; + } + public function updateUrl($url) { $file = File::getKV('urlhash', self::hashurl($url)); diff --git a/classes/File_redirection.php b/classes/File_redirection.php index 0bcccc6cff..d341839cf2 100644 --- a/classes/File_redirection.php +++ b/classes/File_redirection.php @@ -29,7 +29,8 @@ class File_redirection extends Managed_DataObject /* the code below is auto generated do not remove the above tag */ public $__table = 'file_redirection'; // table name - public $url; // varchar(255) primary_key not_null + public $urlhash; // varchar(64) primary_key not_null + public $url; // text public $file_id; // int(4) public $redirections; // int(4) public $httpcode; // int(4) @@ -42,19 +43,30 @@ class File_redirection extends Managed_DataObject { return array( 'fields' => array( - 'url' => array('type' => 'varchar', 'length' => 255, 'not null' => true, 'description' => 'short URL (or any other kind of redirect) for file (id)'), + 'urlhash' => array('type' => 'varchar', 'length' => 64, 'description' => 'sha256 hash of the URL'), + 'url' => array('type' => 'text', 'description' => 'short URL (or any other kind of redirect) for file (id)'), 'file_id' => array('type' => 'int', 'description' => 'short URL for what URL/file'), 'redirections' => array('type' => 'int', 'description' => 'redirect count'), 'httpcode' => array('type' => 'int', 'description' => 'HTTP status code (20x, 30x, etc.)'), 'modified' => array('type' => 'timestamp', 'not null' => true, 'description' => 'date this record was modified'), ), - 'primary key' => array('url'), + 'primary key' => array('urlhash'), 'foreign keys' => array( 'file_redirection_file_id_fkey' => array('file' => array('file_id' => 'id')), ), ); } + static public function getByUrl($url) + { + $file = new File_redirection(); + $file->urlhash = File::hashurl($url); + if (!$file->find(true)) { + throw new NoResultException($file); + } + return $file; + } + static function _commonHttp($url, $redirs) { $request = new HTTPClient($url); $request->setConfig(array( @@ -161,17 +173,18 @@ class File_redirection extends Managed_DataObject */ public function where($in_url, $discover=true) { // let's see if we know this... - $a = File::getKV('url', $in_url); - - if (!empty($a)) { + try { + $a = File::getByUrl($in_url); // this is a direct link to $a->url return $a->url; - } else { - $b = File_redirection::getKV('url', $in_url); - if (!empty($b)) { + } catch (NoResultException $e) { + try { + $b = File_redirection::getByUrl($in_url); // this is a redirect to $b->file_id $a = File::getKV('id', $b->file_id); return $a->url; + } catch (NoResultException $e) { + // Oh well, let's keep going } } @@ -274,6 +287,7 @@ class File_redirection extends Managed_DataObject $file_redir = File_redirection::getKV('url', $short_url); if (!$file_redir instanceof File_redirection) { $file_redir = new File_redirection; + $file_redir->urlhash = File::hashurl($short_url); $file_redir->url = $short_url; $file_redir->file_id = $file_id; $file_redir->insert(); @@ -334,6 +348,7 @@ class File_redirection extends Managed_DataObject function saveNew($data, $file_id, $url) { $file_redir = new File_redirection; + $file_redir->urlhash = File::hashurl($short_url); $file_redir->url = $url; $file_redir->file_id = $file_id; $file_redir->redirections = intval($data['redirects']); diff --git a/scripts/upgrade.php b/scripts/upgrade.php index eeddf5559f..07207357e5 100644 --- a/scripts/upgrade.php +++ b/scripts/upgrade.php @@ -88,12 +88,13 @@ function preAlterFixes($schemaUpdater, $table) { switch ($table) { case 'file': + case 'file_redirection': $schemadef = $schemaUpdater->schema->getTableDef($table); if (isset($schemadef['fields']['urlhash'])) { // We already have the urlhash field, so no need to migrate it. break; } - printfnq("\nFound old $table table, upgrading it to contain 'urlhash' field...\n"); + echo "\nFound old $table table, upgrading it to contain 'urlhash' field...\n"; // We have to create a urlhash that is _not_ the primary key, // transfer data and THEN run checkSchema $schemadef['fields']['urlhash'] = array ( @@ -102,18 +103,20 @@ function preAlterFixes($schemaUpdater, $table) 'description' => 'sha256 of destination URL after following redirections', ); $schemaUpdater->schema->ensureTable($table, $schemadef); - printfnq("DONE.\n"); + echo "DONE.\n"; - $filefix = new File(); + $classname = ucfirst($table); + $tablefix = new $classname; // urlhash is hash('sha256', $url) in the File table - printfnq("Updating urlhash fields in $table table...\n"); - $filefix->query(sprintf('UPDATE %1$s SET %2$s=%3$s;', + echo "Updating urlhash fields in $table table...\n"; + // Maybe very MySQL specific :( + $tablefix->query(sprintf('UPDATE %1$s SET %2$s=%3$s;', $schemaUpdater->schema->quoteIdentifier($table), 'urlhash', // The line below is "result of sha256 on column `url`" 'SHA2(url, 256)')); - printfnq("DONE.\n"); - printfnq("Resuming core schema upgrade..."); + echo "DONE.\n"; + echo "Resuming core schema upgrade..."; break; } } -- 2.39.5