X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=classes%2FFile_oembed.php;h=551d12cafb0c33f3240a81b3e849da42664f302a;hb=87370f0cb18aab5d2c5f7d1325f47692fa39ad90;hp=041b4474043cb80d6ad50abc93912591077c2889;hpb=c6f09306b1c72296db8b55500a5d6a2ea8cd5dd2;p=quix0rs-gnu-social.git

diff --git a/classes/File_oembed.php b/classes/File_oembed.php
index 041b447404..551d12cafb 100644
--- a/classes/File_oembed.php
+++ b/classes/File_oembed.php
@@ -26,7 +26,7 @@ require_once INSTALLDIR.'/classes/File_redirection.php';
  * Table Definition for file_oembed
  */
 
-class File_oembed extends Memcached_DataObject
+class File_oembed extends Managed_DataObject
 {
     ###START_AUTOCODE
     /* the code below is auto generated do not remove the above tag */
@@ -47,37 +47,45 @@ class File_oembed extends Memcached_DataObject
     public $url;                             // varchar(255)
     public $modified;                        // timestamp()   not_null default_CURRENT_TIMESTAMP
 
-    /* Static get */
-    function staticGet($k,$v=NULL) { return Memcached_DataObject::staticGet('File_oembed',$k,$v); }
-
     /* the code above is auto generated do not remove the tag below */
     ###END_AUTOCODE
 
-    function sequenceKey()
+    public static function schemaDef()
     {
-        return array(false, false, false);
+        return array(
+            'fields' => array(
+                'file_id' => array('type' => 'int', 'not null' => true, 'description' => 'oEmbed for that URL/file'),
+                'version' => array('type' => 'varchar', 'length' => 20, 'description' => 'oEmbed spec. version'),
+                'type' => array('type' => 'varchar', 'length' => 20, 'description' => 'oEmbed type: photo, video, link, rich'),
+                'mimetype' => array('type' => 'varchar', 'length' => 50, 'description' => 'mime type of resource'),
+                'provider' => array('type' => 'varchar', 'length' => 50, 'description' => 'name of this oEmbed provider'),
+                'provider_url' => array('type' => 'varchar', 'length' => 255, 'description' => 'URL of this oEmbed provider'),
+                'width' => array('type' => 'int', 'description' => 'width of oEmbed resource when available'),
+                'height' => array('type' => 'int', 'description' => 'height of oEmbed resource when available'),
+                'html' => array('type' => 'text', 'description' => 'html representation of this oEmbed resource when applicable'),
+                'title' => array('type' => 'varchar', 'length' => 255, 'description' => 'title of oEmbed resource when available'),
+                'author_name' => array('type' => 'varchar', 'length' => 50, 'description' => 'author name for this oEmbed resource'),
+                'author_url' => array('type' => 'varchar', 'length' => 255, 'description' => 'author URL for this oEmbed resource'),
+                'url' => array('type' => 'varchar', 'length' => 255, 'description' => 'URL for this oEmbed resource when applicable (photo, link)'),
+                'modified' => array('type' => 'timestamp', 'not null' => true, 'description' => 'date this record was modified'),
+            ),
+            'primary key' => array('file_id'),
+            'foreign keys' => array(
+                'file_oembed_file_id_fkey' => array('file', array('file_id' => 'id')),
+            ),
+        );
     }
 
-    function _getOembed($url, $maxwidth = 500, $maxheight = 400) {
-        require_once INSTALLDIR.'/extlib/Services/oEmbed.php';
+    function _getOembed($url) {
         $parameters = array(
-            'maxwidth'=>$maxwidth,
-            'maxheight'=>$maxheight,
+            'maxwidth' => common_config('attachments', 'thumb_width'),
+            'maxheight' => common_config('attachments', 'thumb_height'),
         );
-        try{
-            $oEmbed = new Services_oEmbed($url);
-            $object = $oEmbed->getObject($parameters);
-            return $object;
-        }catch(Exception $e){
-            try{
-                $oEmbed = new Services_oEmbed($url, array(
-                    Services_oEmbed::OPTION_API => common_config('oohembed', 'endpoint')
-                ));
-                $object = $oEmbed->getObject($parameters);
-                return $object;
-            }catch(Exception $ex){
-                return false;
-            }
+        try {
+            return oEmbedHelper::getObject($url, $parameters);
+        } catch (Exception $e) {
+            common_log(LOG_ERR, "Error during oembed lookup for $url - " . $e->getMessage());
+            return false;
         }
     }
 
@@ -94,7 +102,7 @@ class File_oembed extends Memcached_DataObject
         $file_oembed->type = $data->type;
         if (!empty($data->provider_name)) $file_oembed->provider = $data->provider_name;
         if (!empty($data->provider)) $file_oembed->provider = $data->provider;
-        if (!empty($data->provide_url)) $file_oembed->provider_url = $data->provider_url;
+        if (!empty($data->provider_url)) $file_oembed->provider_url = $data->provider_url;
         if (!empty($data->width)) $file_oembed->width = intval($data->width);
         if (!empty($data->height)) $file_oembed->height = intval($data->height);
         if (!empty($data->html)) $file_oembed->html = $data->html;
@@ -105,9 +113,9 @@ class File_oembed extends Memcached_DataObject
             $file_oembed->url = $data->url;
             $given_url = File_redirection::_canonUrl($file_oembed->url);
             if (! empty($given_url)){
-                $file = File::staticGet('url', $given_url);
+                $file = File::getKV('url', $given_url);
                 if (empty($file)) {
-                    $file_redir = File_redirection::staticGet('url', $given_url);
+                    $file_redir = File_redirection::getKV('url', $given_url);
                     if (empty($file_redir)) {
                         $redir_data = File_redirection::where($given_url);
                         $file_oembed->mimetype = $redir_data['type'];
@@ -120,8 +128,8 @@ class File_oembed extends Memcached_DataObject
             }
         }
         $file_oembed->insert();
-        if (!empty($data->thumbnail_url)) {
-            $ft = File_thumbnail::staticGet('file_id', $file_id);
+        if (!empty($data->thumbnail_url) || ($data->type == 'photo')) {
+            $ft = File_thumbnail::getKV('file_id', $file_id);
             if (!empty($ft)) {
                 common_log(LOG_WARNING, "Strangely, a File_thumbnail object exists for new file $file_id",
                            __FILE__);
@@ -131,4 +139,3 @@ class File_oembed extends Memcached_DataObject
         }
     }
 }
-