Changeset 7810

Timestamp:

03/11/08 21:43:24 (5 years ago)

Author:

inudog

Message:

lang/php/Services_Blogging_Driver: move function newMediaObject to MetaWeblog? from FC2

Location:

lang/php/Services_Blogging_Driver/trunk/src/Services/Blogging/Driver

Files:

• FC2.php (modified) (3 diffs)
• MetaWeblog.php (modified) (2 diffs)

lang/php/Services_Blogging_Driver/trunk/src/Services/Blogging/Driver/FC2.php

@@ -1 +1 @@
 <?php
 //* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
+
+require_once 'Services/Blogging/Driver/MetaWeblog.php';
 
 /**
@@ -11 +13 @@
  * @author     Taiji Inoue <inudog@gmail.com>
  * @license    http://www.gnu.org/copyleft/lesser.html  LGPL License 2.1
- * @version    SVN: $Id:$
+ * @version    SVN: $Id$
  */
-
-require_once 'Services/Blogging/Driver/MetaWeblog.php';
-
 class Services_Blogging_Driver_FC2 extends Services_Blogging_Driver_MetaWeblog
 {
@@ -29 +28 @@
         parent::__construct($user, $pass, $server, $path);
     }
-
-    /**
-     * Save a new media file into the blog.
-     *
-     * @param  string $file     media file to put online
-     */
-    public function newMediaObject($file)
-    {
-        $file_name   = basename($file);
-        $file_data   = file_get_contents($file);
-        $file = new XML_RPC_Value(
-                                  array(
-                                        'bits' => new XML_RPC_Value($file_data, 'base64'),
-                                        'name' => new XML_RPC_Value($file_name, 'string'),
-                                        ),
-                                  'struct'
-                                  );
-        $request = new XML_RPC_Message("metaWeblog.newMediaObject",
-                                       array(
-                                             $this->userdata['rpc_blogid'],
-                                             $this->userdata['rpc_user'],
-                                             $this->userdata['rpc_pass'],
-                                             $file
-                                             ));
-        $res = Services_Blogging_XmlRpc::sendRequest($request, $this->rpc_client);
-        return $res;
-    }
-
 }
 

lang/php/Services_Blogging_Driver/trunk/src/Services/Blogging/Driver/MetaWeblog.php

@@ -4 +4 @@
 require_once 'Services/Blogging/Post.php';
 require_once 'Services/Blogging/XmlRpc.php';
+require_once 'Services/Blogging/MediaObject.php';
 require_once 'XML/RPC.php';
 
@@ -321 +322 @@
     }//protected function convertPostToStruct($post)
 
+    /**
+     * Save a new media file into the blog.
+     *
+     * @param  Services_Blogging_MediaObject $media   media file to put online
+     */
+    public function newMediaObject(Services_Blogging_MediaObject $media)
+    {
+        if (!is_file($media->filename) || !is_readable($media->filename)) {
+            return false;
+        }
+
+        $media_bits  = file_get_contents($media->filename);
+        $media_name  = $media->name;
+
+        if (!$media_name) {
+            $media_name = basename($media->filename);
+        }
+        $file = new XML_RPC_Value(
+                                  array(
+                                        'bits' => new XML_RPC_Value($media_bits, 'base64'),
+                                        'name' => new XML_RPC_Value($media_name, 'string'),
+                                        ),
+                                  'struct'
+                                  );
+        $request = new XML_RPC_Message("metaWeblog.newMediaObject",
+                                       array(
+                                             $this->userdata['rpc_blogid'],
+                                             $this->userdata['rpc_user'],
+                                             $this->userdata['rpc_pass'],
+                                             $file
+                                             ));
+        $res = Services_Blogging_XmlRpc::sendRequest($request, $this->rpc_client);
+        return $res;
+    }
+
 }//class Services_Blogging_Driver_MetaWeblog extends Services_Blogging_ExtendedDriver
 ?>