/* the code above is auto generated do not remove the tag below */
###END_AUTOCODE
+ protected $file; /* Cache the associated file sometimes */
+
public static function schemaDef()
{
return array(
* size (optional): byte size from Content-Length header
* time (optional): timestamp from Last-Modified header
*/
- public function lookupWhere($short_url, $redirs = 10, $protected = false) {
+ static function lookupWhere($short_url, $redirs = 10, $protected = false) {
if ($redirs < 0) return false;
if(strpos($short_url,'://') === false){
*
* @param string $in_url
* @param boolean $discover true to attempt dereferencing the redirect if we don't know it already
- * @return mixed one of:
- * string - target URL, if this is a direct link or a known redirect
- * array - redirect info if this is an *unknown* redirect:
- * associative array with the following elements:
- * code: HTTP status code
- * redirects: count of redirects followed
- * url: URL string of final target
- * type (optional): MIME type from Content-Type header
- * size (optional): byte size from Content-Length header
- * time (optional): timestamp from Last-Modified header
+ * @return File_redirection
*/
- public function where($in_url, $discover=true) {
- // let's see if we know this...
+ static function where($in_url, $discover=true) {
+ $redir = new File_redirection();
+ $redir->url = $in_url;
+ $redir->urlhash = File::hashurl($redir->url);
+ $redir->redirections = 0;
+
try {
- $a = File::getByUrl($in_url);
- // this is a direct link to $a->url
- return $a->url;
+ $r = File_redirection::getByUrl($in_url);
+ if($r instanceof File_redirection) {
+ return $r;
+ }
} 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;
+ $f = File::getByUrl($in_url);
+ $redir->file_id = $f->id;
+ $redir->file = $f;
+ return $redir;
} catch (NoResultException $e) {
// Oh well, let's keep going
}
}
if ($discover) {
- $ret = File_redirection::lookupWhere($in_url);
- return $ret;
- } else {
- // No manual dereferencing; leave the unknown URL as is.
- return $in_url;
+ $redir_info = File_redirection::lookupWhere($in_url);
+ if(is_string($redir_info)) {
+ $redir_info = array('url' => $redir_info);
+ }
+
+ // Double check that we don't already have the resolved URL
+ $r = self::where($redir_info['url'], false);
+ if (!empty($r->file_id)) {
+ return $r;
+ }
+
+ $redir->httpcode = $redir_info['code'];
+ $redir->redirections = intval($redir_info['redirects']);
+ $redir->redir_url = $redir_info['url'];
+ $redir->file = new File();
+ $redir->file->url = $redir_info['url'];
+ $redir->file->mimetype = $redir_info['type'];
+ $redir->file->size = isset($redir_info['size']) ? $redir_info['size'] : null;
+ $redir->file->date = isset($redir_info['time']) ? $redir_info['time'] : null;
+ if (isset($redir_info['protected']) && !empty($redir_info['protected'])) {
+ $redir->file->protected = true;
+ }
}
+
+ return $redir;
}
/**
* @param User $user whose shortening options to use; defaults to the current web session user
* @return string
*/
- function makeShort($long_url, $user=null)
+ static function makeShort($long_url, $user=null)
{
$canon = File_redirection::_canonUrl($long_url);
// Did we get one? Is it shorter?
- if (!empty($short_url)) {
- return $short_url;
- } else {
- return $long_url;
- }
+ return !empty($short_url) ? $short_url : $long_url;
}
/**
* @return string
*/
- function forceShort($long_url, $user)
+ static function forceShort($long_url, $user)
{
$canon = File_redirection::_canonUrl($long_url);
$short_url = File_redirection::_userMakeShort($canon, $user, true);
// Did we get one? Is it shorter?
- if (!empty($short_url)) {
- return $short_url;
- } else {
- return $long_url;
- }
+ return !empty($short_url) ? $short_url : $long_url;
}
- function _userMakeShort($long_url, User $user=null, $force = false) {
+ static function _userMakeShort($long_url, User $user=null, $force = false) {
$short_url = common_shorten_url($long_url, $user, $force);
if (!empty($short_url) && $short_url != $long_url) {
$short_url = (string)$short_url;
// store it
- $file = File::getKV('url', $long_url);
- if ($file instanceof File) {
- $file_id = $file->getID();
- } else {
+ try {
+ $file = File::getByUrl($long_url);
+ } catch (NoResultException $e) {
// Check if the target URL is itself a redirect...
- $redir_data = File_redirection::where($long_url);
- if (is_array($redir_data)) {
- // We haven't seen the target URL before.
- // Save file and embedding data about it!
- $file = File::saveNew($redir_data, $long_url);
- $file_id = $file->getID();
- } else if (is_string($redir_data)) {
- // The file is a known redirect target.
- $file = File::getKV('url', $redir_data);
- if (empty($file)) {
- // @fixme should we save a new one?
- // this case was triggering sometimes for redirects
- // with unresolvable targets; found while fixing
- // "can't linkify" bugs with shortened links to
- // SSL sites with cert issues.
- return null;
- }
- $file_id = $file->getID();
+ $redir = File_redirection::where($long_url);
+ $file = $redir->getFile();
+ if (empty($file->id)) {
+ $file->saveFile();
}
}
- $file_redir = File_redirection::getKV('url', $short_url);
- if (!$file_redir instanceof File_redirection) {
- $file_redir = new File_redirection;
+ // Now we definitely have a File object in $file
+ try {
+ $file_redir = File_redirection::getByUrl($short_url);
+ } catch (NoResultException $e) {
+ $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->file_id = $file->getID();
$file_redir->insert();
}
return $short_url;
* @param string $default_scheme if given a bare link; defaults to 'http://'
* @return string
*/
- function _canonUrl($in_url, $default_scheme = 'http://') {
+ static function _canonUrl($in_url, $default_scheme = 'http://') {
if (empty($in_url)) return false;
$out_url = $in_url;
$p = parse_url($out_url);
return $out_url;
}
- function saveNew($data, $file_id, $url) {
+ static function saveNew($data, $file_id, $url) {
$file_redir = new File_redirection;
- $file_redir->urlhash = File::hashurl($short_url);
+ $file_redir->urlhash = File::hashurl($url);
$file_redir->url = $url;
$file_redir->file_id = $file_id;
$file_redir->redirections = intval($data['redirects']);
echo "DONE.\n";
echo "Resuming core schema upgrade...";
}
-}
+
+ public function getFile() {
+ if(empty($this->file) && $this->file_id) {
+ $this->file = File::getKV('id', $this->file_id);
+ }
+
+ return $this->file;
+ }
+}
\ No newline at end of file