[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: playground/pim/kblogger/src
From: Christian Weilbach <christian () whiletaker ! homeip ! net>
Date: 2008-02-07 1:44:17
Message-ID: 1202348657.410978.28538.nullmailer () svn ! kde ! org
[Download RAW message or body]
SVN commit 771842 by weilbach:
Some more cleanup. Nothing important. Renaming BlogHash to BlogList as it is a QList \
now, move some files, add comments and fix a connection in BlogJob for fetching \
posts.
M +2 -2 CMakeLists.txt
M +15 -13 backend/backend.cpp
M +1 -1 backend/backend.h
D backend/bloghash.cpp
D backend/bloghash.h
M +2 -23 backend/blogjob.cpp
A backend/bloglist.cpp backend/bloghash.cpp#771739 [License: GPL \
(v2+)] A backend/bloglist.h backend/bloghash.h#771739 [License: GPL \
(v2+)] A backend/blogserver.cpp blogserver.cpp#771739 [License: GPL \
(v2+)] A backend/blogserver.h blogserver.h#771739 [License: GPL (v2+)]
D blogserver.cpp
D blogserver.h
M +1 -1 composer/blogchooser.cpp
M +2 -2 composer/composer.cpp
M +25 -26 composer/weblogstylegetter.cpp
M +12 -16 composer/weblogstylegetter.h
M +1 -1 mainwidget.cpp
M +1 -1 profiles/profileconfigdialog.cpp
--- trunk/playground/pim/kblogger/src/CMakeLists.txt #771841:771842
@@ -36,10 +36,11 @@
post/postslist.cpp
post/post.cpp
profiles/profileconfigdialog.cpp
- backend/bloghash.cpp
+ backend/bloglist.cpp
backend/backend.cpp
backend/blogjob.cpp
backend/blogjobqueue.cpp
+ backend/blogserver.cpp
backend/waitwidget.cpp
backend/waitdialog.cpp
itemsmanager.cpp
@@ -48,7 +49,6 @@
profiles/profilelist.cpp
mainwidget.cpp
configdialog.cpp
- blogserver.cpp
composer/weblogstylegetter.cpp
${plugins_SRCS}
)
--- trunk/playground/pim/kblogger/src/backend/backend.cpp #771841:771842
@@ -29,11 +29,11 @@
#include "itemsmanager.h"
#include "post/post.h"
#include "media/media.h"
-#include "blogserver.h"
+#include "backend/blogserver.h"
#include "mainwindow.h"
#include "profileconfig.h"
#include "backend/blogjob.h"
-#include "backend/bloghash.h"
+#include "backend/bloglist.h"
#include "backend/blogjobqueue.h"
#include "backend/waitdialog.h"
@@ -112,7 +112,7 @@
{
kDebug();
- blogsMap.clear();
+ mBlogsMap.clear();
ProfileConfig *profileConfig = \
ProfileConfig::prefs("THIS_ACCOUNT_DOESNT_EXIST"); QStringList groupList = \
profileConfig->config()->groupList(); @@ -137,13 +137,13 @@
blog.setType( ProfileConfig::prefs(accountName)->type() );
blog.setBlogId( ProfileConfig::prefs(accountName)->blogId() );
- kDebug() << "Added blog to the blogsMap: " << blogname << endl
+ kDebug() << "Added blog to the mBlogsMap: " << blogname << endl
<< "Username=" << blog.username() << endl
<< "url=" << blog.url() << endl
<< "api=" << blog.type() << endl;
kDebug() << "password=" << blog.password() << endl;
- blogsMap.insert(blogname, blog);
+ mBlogsMap.insert(blogname, blog);
}
}
@@ -153,7 +153,7 @@
if (!caller)
caller = mMainWindow;
QVariant n(downloadCount);
- BlogServer blog = blogsMap[blogname];
+ BlogServer blog = mBlogsMap[blogname];
kDebug() << "blogname of blog is" << blog.blogname() << endl;
BlogJob *job = createBlogJob(blog,BlogJob::LIST_RECENT_POSTS,n);
@@ -170,7 +170,7 @@
void Backend::listCategories(const QString& blogname, QWidget *caller)
{
kDebug();
- BlogServer blog = blogsMap[blogname];
+ BlogServer blog = mBlogsMap[blogname];
if (!caller)
caller = mMainWindow;
QVariant n(0);
@@ -198,6 +198,7 @@
if (!caller)
caller = mMainWindow;
+ kDebug() << "\tBlog name:" << kbPost->getBlogName();
kDebug() << "\tPost Title:" << kbPost->title() << endl;
kDebug() << "\tContent:" << kbPost->content() << endl;
kDebug() << "\tCategories:" << kbPost->categories().join(", ") << endl;
@@ -212,7 +213,7 @@
QVariant n;
n.setValue(static_cast<KBlog::BlogPost*>(kbPost));
- BlogServer blog = blogsMap[kbPost->getBlogName()];
+ BlogServer blog = mBlogsMap[kbPost->getBlogName()];
BlogJob *job;
QString statusBarMsg;
if ( QString(kbPost->postId()).isEmpty() ) {
@@ -246,7 +247,7 @@
QVariant n;
n.setValue(static_cast<KBlog::BlogPost*>(kbPost));
- BlogServer blog = blogsMap[kbPost->getBlogName()];
+ BlogServer blog = mBlogsMap[kbPost->getBlogName()];
BlogJob *job = createBlogJob(blog,BlogJob::FETCH_POST,n);
mJobToWidget[job]=caller;
@@ -275,7 +276,7 @@
QVariant n;
n.setValue(static_cast<KBlog::BlogPost*>(kbPost));
- BlogServer blog = blogsMap[kbPost->getBlogName()];
+ BlogServer blog = mBlogsMap[kbPost->getBlogName()];
BlogJob *job = createBlogJob(blog,BlogJob::REMOVE_POST,n);
mRemoveFromTrash[job]=kbPost;
mJobToWidget[job]=caller;
@@ -300,7 +301,7 @@
KBlog::BlogMedia *media = static_cast<KBlog::BlogMedia*>(kbMedia);
QVariant n;
n.setValue(media);
- BlogServer blog = blogsMap[ kbMedia->getBlogname() ];
+ BlogServer blog = mBlogsMap[ kbMedia->getBlogname() ];
BlogJob *job = createBlogJob(blog,BlogJob::CREATE_MEDIA,n);
mJobToWidget[job]=caller;
@@ -359,6 +360,7 @@
post->setPrivate( false ); //NOTE: Metaweblog dooesn't return published var! \
:( // TODO sure?
ItemsManager::self()->addToSentList(static_cast<KBlogger::Post*>(post));
}
+ ItemsManager::self()->getUncachedMediaInThePosts( blogname );
}
void Backend::slotJobsDone()
@@ -419,13 +421,13 @@
BlogServer Backend::blogServer(const QString& blogname)
{
kDebug();
- return blogsMap[blogname];
+ return mBlogsMap[blogname];
}
QList<BlogServer> Backend::blogServers()
{
kDebug();
- return blogsMap.values();
+ return mBlogsMap.values();
}
BlogJob* Backend::createBlogJob( BlogServer &blogServer, BlogJob::BlogAction action, \
QVariant& arg )
--- trunk/playground/pim/kblogger/src/backend/backend.h #771841:771842
@@ -98,7 +98,7 @@
//Vars
static Backend *s_self;
MainWindow *mMainWindow;
- QMap<QString, BlogServer> blogsMap;
+ QMap<QString, BlogServer> mBlogsMap;
BlogJobQueue *mJobsQueue;
WaitDialog* mWaitDialog;
QMap<KJob*,QWidget*> mJobToWidget;
--- trunk/playground/pim/kblogger/src/backend/blogjob.cpp #771841:771842
@@ -37,12 +37,8 @@
#include <klocalizedstring.h>
#include <kmessagebox.h>
-// #include "itemsmanager.h"
-// #include "post/post.h"
-// #include "media/media.h"
+#include "backend/bloglist.h"
-#include "backend/bloghash.h"
-
#define APPLICATION_NAME "KBlogger"
#define APPLICATION_VER "1.0-alpha2"
@@ -56,7 +52,6 @@
BlogAction action,
QVariant& arg,
QObject* parent ): KJob ( parent )
-// mItemsManager( ItemsManager::self() )
{
kDebug();
d_ptr = new BlogJobPrivate();
@@ -186,7 +181,7 @@
post = d_ptr->mArg.value<KBlog::BlogPost*>();
connect(d_ptr->mKBlog, SIGNAL( fetchedPost( KBlog::BlogPost *) ),
- this, SLOT( slotFetchedPost( KBlog::BlogPost *)) );
+ this, SLOT( slotFetchPost( KBlog::BlogPost *)) );
kDebug() << "Running " << d_ptr->mKBlog << "->fetchPost()" << endl;
d_ptr->mKBlog->fetchPost(post);
}
@@ -381,10 +376,8 @@
void BlogJobPrivate::slotListRecentPosts( const QList<KBlog::BlogPost>& posts)
{
kDebug();
-
emit q_ptr->listedRecentPosts( posts );
slotExitSuccess();
-// mItemsManager->getUncachedMediaInThePosts( mBlogServer.blogname() );
}
void BlogJobPrivate::slotListCategories( const QList< QMap<QString, QString> >& \
categories ) @@ -397,44 +390,30 @@
void BlogJobPrivate::slotCreatePost( KBlog::BlogPost *post)
{
kDebug();
-// kDebug() << "blogname=" << mBlogServer.blogname() << endl;
-// kbPost->setBlogName(mBlogServer.blogname());
-// mItemsManager->moveDraftToSentList(kbPost);
slotExitSuccess();
}
void BlogJobPrivate::slotRemovePost( KBlog::BlogPost * post)
{
kDebug();
-// kDebug() << "blogname=" << mBlogServer.blogname() << endl;
-// kbPost->setBlogName(mBlogServer.blogname());
-// mItemsManager->removeTrashedPost(kbPost); //test this
slotExitSuccess();
}
void BlogJobPrivate::slotFetchPost( KBlog::BlogPost *post)
{
kDebug();
-// kDebug() << "blogname=" << mBlogServer.blogname() << endl;
-// kbPost->setBlogName(mBlogServer.blogname());
slotExitSuccess();
}
void BlogJobPrivate::slotModifyPost( KBlog::BlogPost *post)
{
kDebug();
-// kDebug() << "blogname=" << mBlogServer.blogname() << endl;
-// kbPost->setBlogName(mBlogServer.blogname());
-// mItemsManager->moveDraftToSentList(kbPost);
slotExitSuccess();
}
void BlogJobPrivate::slotCreateMedia( KBlog::BlogMedia* media)
{
kDebug();
-// kDebug() << "blogname=" << mBlogServer.blogname() << endl;
-// kbMedia->setBlogname(mBlogServer.blogname());
-// mItemsManager->addMedia(kbMedia);
slotExitSuccess();
}
--- trunk/playground/pim/kblogger/src/composer/blogchooser.cpp #771841:771842
@@ -22,7 +22,7 @@
#include "profileconfig.h"
-#include "blogserver.h"
+#include "backend/blogserver.h"
namespace KBlogger
{
--- trunk/playground/pim/kblogger/src/composer/composer.cpp #771841:771842
@@ -48,11 +48,11 @@
#include "post/postslist.h"
#include "composer/composereditor.h"
#include "itemsmanager.h"
-#include "blogserver.h"
+#include "backend/blogserver.h"
#include "composer/blogchooser.h"
#include "composer/visualeditor.h"
-#include "backend/bloghash.h"
+#include "backend/bloglist.h"
#define MAGIC_KEY 0xA1B2C3D4
#define VERSION 001
--- trunk/playground/pim/kblogger/src/composer/weblogstylegetter.cpp #771841:771842
@@ -1,6 +1,6 @@
/***************************************************************************
- Copyright (C) 2005-2007 by Christian Weilbach <christian_weilbach@web.de>
+ Copyright (C) 2007-2008 by Christian Weilbach <christian_weilbach@web.de>
Copyright (C) 2007 Antonio Aloisio <gnuton@gnuton.org>
This program is free software; you can redistribute it and/or modify
@@ -43,26 +43,27 @@
WeblogStyleGetter::WeblogStyleGetter(const QString &blog, QObject *parent): \
QObject(parent) {
- //Sets cachePath to ~/.kde4/share/apps/kblogger/styles/my_blog_name
- cachePath = KStandardDirs::locateLocal("appdata", DIR_TO_SAVE_ENTRIES + blog + \
'/' , true); + // sets cachePath to \
~/.kde4/share/apps/kblogger/styles/my_blog_name + mCachePath = \
KStandardDirs::locateLocal("appdata", DIR_TO_SAVE_ENTRIES + blog + '/' , true); \
generateRandomPostStrings(); mParent = qobject_cast<QWidget*>(parent);
Q_ASSERT(mParent);
- //1. Create Temp Post
+
+ // create temp post
kDebug();
QStringList categories("");
- tempPost = new Post(blog,
- postTitle, //title
- postContent, //content
- categories, //category
- false, //isPrivate
+ mTempPost = new Post(blog,
+ mPostTitle,
+ mPostContent,
+ categories,
+ false,
\
KDateTime(QDateTime(QDate(2000,1,1),QTime(0,0)))//datetime );
Backend::self()->disconnect(SIGNAL(jobsFinished()));
connect ( Backend::self() , SIGNAL(jobsFinished()), SLOT(slotPostSent()) );
- //2. Send post
- Backend::self()->sendPost(tempPost, mParent);
+ // send post
+ Backend::self()->sendPost(mTempPost, mParent);
Backend::self()->runQueuedJobs();
}
@@ -93,11 +94,9 @@
buffer.append(line);
}
-// QRegExp headRx("<head[\\s]?([\\d\\w]*=\"?[\\d\\w:\\/.]*\"?)?>");
QRegExp titleRx(QString("%1[\\d]*").arg(POST_TITLE));
QRegExp contentRx(QString("%1[\\d]*").arg(POST_CONTENT));
-// buffer.replace(headRx, "<head><base href=\"" + basePath + "\"/>");
buffer.replace(titleRx, title.toUtf8() );
buffer.replace(contentRx, content.toUtf8() );
@@ -109,7 +108,7 @@
kDebug();
Backend::self()->disconnect(SIGNAL(jobsFinished()));
connect ( Backend::self() , SIGNAL(jobsFinished()), SLOT(slotPostFetched()) );
- Backend::self()->fetchPost(tempPost, mParent);
+ Backend::self()->fetchPost(mTempPost, mParent);
Backend::self()->runQueuedJobs();
}
@@ -118,14 +117,14 @@
kDebug();
Backend::self()->disconnect(SIGNAL(jobsFinished()));
- //3.Read post url
- KUrl src(tempPost->link());
+ // read post url
+ KUrl src(mTempPost->link());
kDebug() << "Retrieving" << src;
- //4.Copy post in the cache
- httpGetJob = KIO::storedGet(src, KIO::NoReload, KIO::HideProgressInfo);
+ // copy post in the cache
+ mJob = KIO::storedGet(src, KIO::NoReload, KIO::HideProgressInfo);
- connect( httpGetJob, SIGNAL( result( KJob* ) ),
+ connect( mJob, SIGNAL( result( KJob* ) ),
this, SLOT( slotHtmlCopied( KJob* ) ) );
}
@@ -133,14 +132,14 @@
{
kDebug();
if ( job->error() ) {
- KMessageBox::error( 0,
+ KMessageBox::error( mParent,
i18n("Impossible to get html file,%1", \
job->errorString())); return;
}
QByteArray httpData( qobject_cast<KIO::StoredTransferJob*>(job)->data() );
// KUrl directory() hasn't worked for me, so i do it myself:
- QString href( tempPost->link().url() );
+ QString href( mTempPost->link().url() );
int filenameOffset = href.lastIndexOf( "/" );
href = href.remove( filenameOffset+1, 255 );
QString base( "<base href=\""+href+"\"/>" );
@@ -155,12 +154,12 @@
httpData.insert( headOffset+6, base.toLatin1() );
}
- KUrl dest(cachePath + "index.html");
+ KUrl dest(mCachePath + "index.html");
Q_ASSERT( dest.isValid() );
QFile file(dest.path());
file.open(QIODevice::WriteOnly);
if ( file.write(httpData) == -1 ) {
- KMessageBox::error( 0,
+ KMessageBox::error( mParent,
i18n("Impossible to write data to file %1", \
dest.path())); file.close();
return;
@@ -169,7 +168,7 @@
emit styleFetched();
//Remove temp post from the server.
- Backend::self()->removePost(tempPost, mParent);
+ Backend::self()->removePost(mTempPost, mParent);
Backend::self()->runQueuedJobs();
}
@@ -178,8 +177,8 @@
kDebug();
srand(time(0));
int postRandomNumber = rand();
- postTitle = QString("%1%2").arg(POST_TITLE).arg( postRandomNumber );
- postContent = QString("%1%2").arg(POST_CONTENT).arg( postRandomNumber );
+ mPostTitle = QString("%1%2").arg(POST_TITLE).arg( postRandomNumber );
+ mPostContent = QString("%1%2").arg(POST_CONTENT).arg( postRandomNumber );
}
} //namespace
--- trunk/playground/pim/kblogger/src/composer/weblogstylegetter.h #771841:771842
@@ -1,5 +1,6 @@
/***************************************************************************
+ Copyright (C) 2007-2008 by Christian Weilbach <christian_weilbach@web.de>
Copyright (C) 2007 Antonio Aloisio <gnuton@gnuton.org>
This program is free software; you can redistribute it and/or modify
@@ -25,11 +26,12 @@
#include <QString>
/**
- * This class will
- * 1. Create a temporary post
- * 2. Send post
- * 3. Read the post url
- * 4. Get & Save the html page
+ @brief
+ This class will:
+ 1. Create a temporary post
+ 2. Send post
+ 3. Read the post's url
+ 4. Get & save the html page
*/
namespace KIO
@@ -50,7 +52,6 @@
WeblogStyleGetter(const QString& blog, QObject *parent);
~WeblogStyleGetter();
- //Returns
static QString styledHtml(const QString& blogname,
const QString& title,
const QString& content);
@@ -65,16 +66,11 @@
private:
void generateRandomPostStrings();
- Post *tempPost;
- QString cachePath;
-
- KIO::Job *httpGetJob;
- QByteArray httpData;
- QString httpMimeType;
-
- QString postTitle;
- QString postContent;
-
+ Post *mTempPost;
+ QString mCachePath;
+ KIO::Job *mJob;
+ QString mPostTitle;
+ QString mPostContent;
QWidget *mParent;
};
--- trunk/playground/pim/kblogger/src/mainwidget.cpp #771841:771842
@@ -36,7 +36,7 @@
#include "post/post.h"
#include "media/media.h"
#include "itemsmanager.h"
-#include "blogserver.h"
+#include "backend/blogserver.h"
#include "composer/visualeditor.h"
namespace KBlogger
--- trunk/playground/pim/kblogger/src/profiles/profileconfigdialog.cpp #771841:771842
@@ -36,7 +36,7 @@
#include <kblog/movabletype.h>
#include <kblog/wordpressbuggy.h>
-#include "backend/bloghash.h"
+#include "backend/bloglist.h"
const int TIMEOUT = 45000;
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic