Changeset 19056 for extensions/gvideo/include

Timestamp:

Nov 17, 2012, 5:05:32 PM (11 years ago)

Author:

mistic100

Message:

allow to add private dailymotion videos, remove videobb support, add tags support

Location:

extensions/gvideo/include

Files:

• functions.inc.php (modified) (12 diffs)
• gvideo.inc.php (modified) (1 diff)
• install.inc.php (modified) (2 diffs)

extensions/gvideo/include/functions.inc.php

@@ -21 +21 @@
       if (empty($url['query']['v'])) return false;
       
-      $video['id'] = $url['query']['v'];
+      $video['video_id'] = $url['query']['v'];
     }
     
@@ -31 +31 @@
         
         $url['path'] = explode('/', $url['path']);
-        $video['id'] = $url['path'][1];
-      }
-      
-      $api_url = 'http://gdata.youtube.com/feeds/api/videos/'.$video['id'].'?v=2&alt=json';
+        $video['video_id'] = $url['path'][1];
+      }
+      
+      $api_url = 'http://gdata.youtube.com/feeds/api/videos/'.$video['video_id'].'?v=2&alt=json';
       $json = download_remote_file($api_url, true);
       if ($json === false or $json == 'file_error') return false;
@@ -40 +40 @@
       $json = json_decode($json, true);
       $video = array_merge($video, array(
-        'url' => 'http://youtube.com/watch?v='.$video['id'],
+        'url' => 'http://youtube.com/watch?v='.$video['video_id'],
         'title' => $json['entry']['title']['$t'],
         'description' => $json['entry']['media$group']['media$description']['$t'],
         'thumbnail' => $json['entry']['media$group']['media$thumbnail'][2]['url'],
         'author' => $json['entry']['author'][0]['name']['$t'],
+        'tags' => null,
         ));
       break;
@@ -55 +56 @@
       
       $url['path'] = explode('/', $url['path']);
-      $video['id'] = $url['path'][1];
-      
-      $api_url = 'http://vimeo.com/api/v2/video/'.$video['id'].'.json';
+      $video['video_id'] = $url['path'][1];
+      
+      $api_url = 'http://vimeo.com/api/v2/video/'.$video['video_id'].'.json';
       $json = download_remote_file($api_url, true);
       if ($json === false or $json == 'file_error') return false;
@@ -63 +64 @@
       $json = json_decode($json, true);
       $video = array_merge($video, array(
-        'url' => 'http://vimeo.com/'.$video['id'],
+        'url' => 'http://vimeo.com/'.$video['video_id'],
         'title' => $json[0]['title'],
         'description' => $json[0]['description'],
         'thumbnail' => $json[0]['thumbnail_large'],
         'author' => $json[0]['user_name'],
+        'tags' => array_map('trim', explode(',', $json[0]['tags'])),
         ));
       break;
@@ -79 +81 @@
       $url['path'] = explode('/', $url['path']);
       if ($url['path'][1] != 'video') return false;
-      $video['id'] = $url['path'][2];
-      
-      $api_url = 'https://api.dailymotion.com/video/'.$video['id'].'?fields=description,id,thumbnail_large_url,title,owner.username'; // DM doesn't accept non secure connection
+      $video['video_id'] = $url['path'][2];
+      
+      $api_url = 'https://api.dailymotion.com/video/'.$video['video_id'].'?fields=description,thumbnail_large_url,title,owner.username,tags'; // DM doesn't accept non secure connection
       $json = download_remote_file($api_url, true);
       if ($json === false or $json == 'file_error') return false;
@@ -89 +91 @@
       
       $video = array_merge($video, array(
-        'id' => $json['id'],
-        'url' => 'http://dailymotion.com/video/'.$json['id'],
+        'url' => 'http://dailymotion.com/video/'.$video['video_id'],
         'title' => $json['title'],
         'description' => $json['description'],
         'thumbnail' => $json['thumbnail_large_url'],
         'author' => $json['owner.username'],
+        'tags' => $json['tags'],
         ));
       break;
@@ -109 +111 @@
       preg_match('#<meta property="og:video" content="http://www.wat.tv/swf2/([^"/>]+)" />#', $html, $matches);
       if (empty($matches[1])) return false;
-      $video['id'] = $matches[1];
+      $video['video_id'] = $matches[1];
       
       $video['url'] = $source_url;
@@ -116 +118 @@
       $video['title'] = $matches[1];
       
-      preg_match('#<p class="description"([^>]*)>(.*?)</p>#s', $html, $matches);
-      $video['description'] = $matches[2];
+      preg_match('#<p class="description"(?:[^>]*)>(.*?)</p>#s', $html, $matches);
+      $video['description'] = $matches[1];
       
       preg_match('#<meta property="og:image" content="([^">]+)" />#', $html, $matches);
@@ -123 +125 @@
       
       $video['author'] = null;
+      
+      preg_match_all('#<meta property="video:tag" content="([^">]+)" />#', $html, $matches);
+      $video['tags'] = $matches[1];
       break;
     }
@@ -132 +137 @@
       
       $url['path'] = explode('/', $url['path']);
-      $video['id'] = rtrim($url['path'][2], '.html');
+      $video['video_id'] = rtrim($url['path'][2], '.html');
       
       $html = download_remote_file($source_url, true);
       if ($html === false or $html == 'file_error') return false;
       
-      $video['url'] = 'http://wideo.fr/video/'.$video['id'].'.html';
+      $video['url'] = 'http://wideo.fr/video/'.$video['video_id'].'.html';
       
       preg_match('#<meta property="og:title" content="([^">]*)" />#', $html, $matches);
@@ -148 +153 @@
       $video['thumbnail'] = $matches[1];
       
-      preg_match('#<li id="li_author">Auteur :  <a href="\#"([^>]*)><span>(.*?)</span></a>#', $html, $matches);
-      $video['author'] = $matches[2];
-      break;
-    }
-      
-    /* videobb */
-    case 'videobb':
-    {
-      $video['type'] = 'videobb';
-      
-      if (!empty($url['query']))
-      {
-        parse_str($url['query'], $url['query']);
-        if (empty($url['query']['v'])) return false;
-        $video['id'] = $url['query']['v'];
-      }
-      else
-      {
-        $url['path'] = explode('/', $url['path']);
-        if ($url['path'][1] != 'video') return false;
-        $video['id'] = $url['path'][2];
-      }
-      
-      $html = download_remote_file($source_url, true);
-      if ($html === false or $html == 'file_error') return false;
-      
-      $video['url'] = 'http://www.videobb.com/video/'.$video['id'];
-      
-      preg_match('#<meta content="videobb - ([^">]*)"  name="title" property="" />#', $html, $matches);
-      $video['title'] = $matches[1];
-      
-      $video['description'] = null;
-      
-      preg_match('#<link rel="image_src" href="([^">]+)" type="image/jpeg" />#', $html, $matches);
-      $video['thumbnail'] = $matches[1];
-      
-      $video['author'] = null;
+      preg_match('#<li id="li_author">Auteur :  <a href=(?:[^>]*)><span>(.*?)</span></a>#', $html, $matches);
+      $video['author'] = $matches[1];
+      
+      preg_match('#<meta name="keywords" content="([^">]+)" />#', $html, $matches);
+      $video['tags'] = array_map('trim', explode(',', $matches[1]));
       break;
     }

extensions/gvideo/include/gvideo.inc.php

@@ -41 +41 @@
   global $page, $picture, $template, $conf;
   
-  $conf['gvideo'] = unserialize($conf['gvideo']);
+  if (is_string($conf['gvideo']))
+  {
+    $conf['gvideo'] = unserialize($conf['gvideo']);
+  }
   
   

extensions/gvideo/include/install.inc.php

@@ -22 +22 @@
       'width' => 640,
       'height' => 360,
+      'sync_description' => 1,
+      'sync_tags' => 1,
       'vimeo' => array(
         'title' => 1,
@@ -36 +38 @@
       'wat' => array(),
       'wideo' => array(),
-      'videobb' => array(),
       ));
     
     conf_update_param('gvideo', $gvideo_default_config);
     $conf['gvideo'] = $gvideo_default_config;
+  }
+  else
+  {
+    if (is_string($conf['gvideo']))
+    {
+      $conf['gvideo'] = unserialize($conf['gvideo']);
+    }
+    
+    if (!isset($conf['gvideo']['sync_description']))
+    {
+      $conf['gvideo']['sync_description'] = 1;
+      $conf['gvideo']['sync_tags'] = 1;
+      
+      conf_update_param('gvideo', serialize($conf['gvideo']));
+    }
   }