[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    playground/pim/kblogger/src
From:       Antonio Aloisio <antonio.aloisio () gmail ! com>
Date:       2008-05-06 21:07:54
Message-ID: 1210108074.158588.1663.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 804746 by aloisio:

- Add BlogList support to Media::Load
- Update thumbnails regexps: Supports also Wordpress >= 2.5.1

 M  +4 -3      backend/bloglist.cpp  
 M  +0 -1      media/importmediawidget.cpp  
 M  +7 -2      media/medialist.cpp  


--- trunk/playground/pim/kblogger/src/backend/bloglist.cpp #804745:804746
@@ -56,7 +56,7 @@
 blogHash["urlTransformRegExp"] =  QRegExp( \
"(http://.+\\.(blogger|Blogspot.com)\\.com).+" ); // set a general gateway  \
blogHash["urlReplacementString"] = QString( "\\1" ); // no gateway here  \
                blogHash["htmlRegExp"] = QRegExp( \
                "content='blogger'\\s+name='generator'" );
-blogHash["thumbnailRegExp"] = QRegExp( \
"http://[\\d\\w]*\\.blogger\\.com/([\\d\\w]*/){1,4}s320/IMG_\\d*.[\\w]{3,3}" ); \
//TODO TEST IT! +blogHash["thumbnailRegExp"] = QRegExp( \
"(http://[\\d\\w]*\\.blogger\\.com/([\\d\\w]*/){1,4}s320/)?IMG_\\d*.[\\w]{3,3}" ); \
//TODO TEST IT!  
 blogList << blogHash;
 blogHash.clear();
@@ -82,7 +82,7 @@
 blogHash["urlTransformRegExp"] =  QRegExp( "(http://.+\\.wordpress\\.com).+" ); // \
set a general gateway  blogHash["urlReplacementString"] = QString( "\\1/xmlrpc.php" \
);  blogHash["htmlRegExp"] = QRegExp( \
                "name=\"generator\"\\s+content=\"WordPress.com\"" );
-blogHash["thumbnailRegExp"] = \
QRegExp("http://.*.files.wordpress.com/[\\d]{4,4}/[\\d]{2,2}/.*.thumbnail.[\\w]{3,3}"); \
// TODO TEST IT! +blogHash["thumbnailRegExp"] = \
QRegExp("(http://.*.files.wordpress.com/[\\d]{4,4}/[\\d]{2,2}/)?.*(.thumbnail|-[\\d]{,3}x[\\d]{,3}).[\\w]{3}"); \
// TODO TEST IT!  
 blogList << blogHash;
 blogHash.clear();
@@ -160,7 +160,8 @@
 blogHash["urlTransformRegExp"] =  QRegExp( "(http://.+)" ); // set a general gateway \
// TODO  blogHash["urlReplacementString"] = QString( "\\1/xmlrpc.php" );
 blogHash["htmlRegExp"] = QRegExp( \
                "name=\"generator\"\\s+content=\"WordPress\\s+\\d\\.\\d\\.\\d\"" );
-blogHash["thumbnailRegExp"] = \
QRegExp("http://.*/wp-content/uploads/[\\d]{4,4}/[\\d]{2,2}/.*.thumbnail.[\\w]{3,3}"); \
// TESTED +//"http://.*/wp-content/uploads/[\\d]{4,4}/[\\d]{2,2}/.*.thumbnail.[\\w]{3,3}" \
// TESTED with Wordpress < 2.5  +blogHash["thumbnailRegExp"] = \
QRegExp("(http://.*/wp-content/uploads/[\\d]{4,4}/[\\d]{2,2}/)?.*(.thumbnail|-[\\d]{,3}x[\\d]{,3}).[\\w]{3}"); \
//TESTED  
 blogList << blogHash;
 blogHash.clear();
--- trunk/playground/pim/kblogger/src/media/importmediawidget.cpp #804745:804746
@@ -88,7 +88,6 @@
         return false;
     }
 
-    //QRegExp thumbnailUrlRx("thumb");/*TODO Get thumbnailUrlRx from BlogList*/
     QString thumbRegExpString;
     BlogServer blogServ= Backend::self()->blogServer( blogname );
     QRegExp thumbnailUrlRx = \
                blogServ.getBlogServerValue("thumbnailRegExp").toRegExp();
--- trunk/playground/pim/kblogger/src/media/medialist.cpp #804745:804746
@@ -39,6 +39,7 @@
 #include "itemsmanager.h"
 #include "media/media.h"
 #include "mainwidget.h"
+#include "backend/blogserver.h"
 
 #define DIR_TO_SAVE_MEDIA "media/"
 
@@ -319,8 +320,12 @@
         media->setStatus( static_cast<KBlog::BlogMedia::Status>(statusInt) );
         media->setUrl(uploadedMediaUrl);
 
-        //Thumbnail managing //FIXME
-        if ( prev_media && name.contains("thumbnail") ) {
+        //Thumbnail managing
+        //Get thumbnail regexp for this blog server.
+        BlogServer blogServ= Backend::self()->blogServer( blogname() );
+        QRegExp thumbnailUrlRx = \
blogServ.getBlogServerValue("thumbnailRegExp").toRegExp(); +        kDebug() << \
"thumbnailUrlRx pattern:" << thumbnailUrlRx.pattern(); +        if ( prev_media && \
name.contains(thumbnailUrlRx) ) {  prev_media->setThumbnail(media);
             media->setFullSizeImage(prev_media);
             prev_media = 0;


[prev in list] [next in list] [prev in thread] [next in thread]