Page MenuHomePhorge
Files F16569270

No OneTemporary
Actions

View Options

diff --git a/nepomuk/core/org.kde.nepomuk.ResourceWatcherConnection.xml b/nepomuk/core/org.kde.nepomuk.ResourceWatcherConnection.xml
index 3a452e3fc2..7684c4ab53 100644
--- a/nepomuk/core/org.kde.nepomuk.ResourceWatcherConnection.xml
+++ b/nepomuk/core/org.kde.nepomuk.ResourceWatcherConnection.xml
@@ -1,38 +1,65 @@
<!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN" "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
<node>
<interface name="org.kde.nepomuk.ResourceWatcherConnection">
<signal name="resourceCreated">
<arg name="uri" type="s" direction="out"/>
<arg name="types" type="as" direction="out"/>
</signal>
<signal name="resourceRemoved">
<arg name="uri" type="s" direction="out"/>
<arg name="types" type="as" direction="out"/>
</signal>
<signal name="resourceTypeAdded">
<arg name="resUri" type="s" direction="out"/>
<arg name="type" type="s" direction="out"/>
</signal>
<signal name="resourceTypeRemoved">
<arg name="resUri" type="s" direction="out"/>
<arg name="type" type="s" direction="out"/>
</signal>
<signal name="propertyAdded">
<arg name="resource" type="s" direction="out"/>
<arg name="property" type="s" direction="out"/>
<arg name="value" type="v" direction="out"/>
</signal>
<signal name="propertyRemoved">
<arg name="resource" type="s" direction="out"/>
<arg name="property" type="s" direction="out"/>
<arg name="value" type="v" direction="out"/>
</signal>
<signal name="propertyChanged">
<arg name="resource" type="s" direction="out"/>
<arg name="property" type="s" direction="out"/>
<arg name="oldValues" type="av" direction="out"/>
<arg name="newValues" type="av" direction="out"/>
</signal>
+ <method name="setResources">
+ <arg name="resources" type="as" direction="in"/>
+ </method>
+ <method name="addResource">
+ <arg name="resource" type="s" direction="in"/>
+ </method>
+ <method name="removeResource">
+ <arg name="resource" type="s" direction="in"/>
+ </method>
+ <method name="setProperties">
+ <arg name="properties" type="as" direction="in"/>
+ </method>
+ <method name="addProperty">
+ <arg name="property" type="s" direction="in"/>
+ </method>
+ <method name="removeProperty">
+ <arg name="property" type="s" direction="in"/>
+ </method>
+ <method name="setTypes">
+ <arg name="types" type="as" direction="in"/>
+ </method>
+ <method name="addType">
+ <arg name="type" type="s" direction="in"/>
+ </method>
+ <method name="removeType">
+ <arg name="type" type="s" direction="in"/>
+ </method>
<method name="close" />
</interface>
</node>
diff --git a/nepomuk/core/resourcewatcher.cpp b/nepomuk/core/resourcewatcher.cpp
index 15a59f1c2e..41c0a08a05 100644
--- a/nepomuk/core/resourcewatcher.cpp
+++ b/nepomuk/core/resourcewatcher.cpp
@@ -1,212 +1,249 @@
/*
This file is part of the Nepomuk KDE project.
Copyright (C) 2011 Vishesh Handa <handa.vish@gmail.com>
Copyright (C) 2011 Sebastian Trueg <trueg@kde.org>
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
License as published by the Free Software Foundation; either
version 2.1 of the License, or (at your option) any later version.
This library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public
License along with this library; if not, write to the Free Software
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#include "resourcewatcher.h"
#include "resourcewatcherconnectioninterface.h"
#include "resourcewatchermanagerinterface.h"
#include <QtDBus/QDBusObjectPath>
#include "resource.h"
#include "kurl.h"
#include "kdebug.h"
namespace {
-QList<QUrl> convertUris(const QStringList& uris) {
- QList<QUrl> us;
- foreach(const QString& uri, uris) {
- us << KUrl(uri);
+ QString convertUri(const QUrl& uri) {
+ return KUrl(uri).url();
+ }
+
+ QList<QUrl> convertUris(const QStringList& uris) {
+ QList<QUrl> us;
+ foreach(const QString& uri, uris) {
+ us << KUrl(uri);
+ }
+ return us;
}
- return us;
-}
}
class Nepomuk::ResourceWatcher::Private {
public:
QList<Types::Class> m_types;
QList<Nepomuk::Resource> m_resources;
QList<Types::Property> m_properties;
org::kde::nepomuk::ResourceWatcherConnection * m_connectionInterface;
org::kde::nepomuk::ResourceWatcher * m_watchManagerInterface;
};
Nepomuk::ResourceWatcher::ResourceWatcher(QObject* parent)
: QObject(parent),
d(new Private)
{
d->m_watchManagerInterface
= new org::kde::nepomuk::ResourceWatcher( "org.kde.nepomuk.DataManagement",
"/resourcewatcher",
QDBusConnection::sessionBus() );
d->m_connectionInterface = 0;
}
Nepomuk::ResourceWatcher::~ResourceWatcher()
{
stop();
delete d;
}
bool Nepomuk::ResourceWatcher::start()
{
//
// Convert to list of strings
//
QList<QString> uris;
foreach( const Nepomuk::Resource & res, d->m_resources ) {
- uris << KUrl(res.resourceUri()).url();
+ uris << convertUri(res.resourceUri());
}
QList<QString> props;
foreach( const Types::Property & prop, d->m_properties ) {
- props << KUrl(prop.uri()).url();
+ props << convertUri(prop.uri());
}
QList<QString> types_;
foreach( const Types::Class & cl, d->m_types ) {
- types_ << KUrl(cl.uri()).url();
+ types_ << convertUri(cl.uri());
}
//
// Create the dbus object to watch
//
QDBusPendingReply<QDBusObjectPath> reply = d->m_watchManagerInterface->watch( uris, props, types_ );
QDBusObjectPath path = reply.value();
if(!path.path().isEmpty()) {
d->m_connectionInterface = new org::kde::nepomuk::ResourceWatcherConnection( "org.kde.nepomuk.DataManagement",
path.path(),
QDBusConnection::sessionBus() );
connect( d->m_connectionInterface, SIGNAL(propertyAdded(QString,QString,QDBusVariant)),
this, SLOT(slotPropertyAdded(QString,QString,QDBusVariant)) );
connect( d->m_connectionInterface, SIGNAL(propertyRemoved(QString,QString,QDBusVariant)),
this, SLOT(slotPropertyRemoved(QString,QString,QDBusVariant)) );
connect( d->m_connectionInterface, SIGNAL(resourceCreated(QString,QStringList)),
this, SLOT(slotResourceCreated(QString,QStringList)) );
connect( d->m_connectionInterface, SIGNAL(propertyChanged(QString,QString,QVariantList,QVariantList)),
this, SLOT(slotPropertyChanged(QString,QString,QVariantList,QVariantList)) );
connect( d->m_connectionInterface, SIGNAL(resourceRemoved(QString,QStringList)),
this, SLOT(slotResourceRemoved(QString,QStringList)) );
connect( d->m_connectionInterface, SIGNAL(resourceTypeAdded(QString,QString)),
this, SLOT(slotResourceTypeAdded(QString,QString)) );
connect( d->m_connectionInterface, SIGNAL(resourceTypeRemoved(QString,QString)),
this, SLOT(slotResourceTypeRemoved(QString,QString)) );
return true;
}
else {
return false;
}
}
void Nepomuk::ResourceWatcher::stop()
{
if (d->m_connectionInterface) {
d->m_connectionInterface->close();
delete d->m_connectionInterface;
d->m_connectionInterface = 0;
}
}
void Nepomuk::ResourceWatcher::addProperty(const Nepomuk::Types::Property& property)
{
d->m_properties << property;
+ if(d->m_connectionInterface) {
+ d->m_connectionInterface->addProperty(convertUri(property.uri()));
+ }
}
void Nepomuk::ResourceWatcher::addResource(const Nepomuk::Resource& res)
{
d->m_resources << res;
+ if(d->m_connectionInterface) {
+ d->m_connectionInterface->addResource(convertUri(res.resourceUri()));
+ }
}
void Nepomuk::ResourceWatcher::addType(const Nepomuk::Types::Class& type)
{
d->m_types << type;
+ if(d->m_connectionInterface) {
+ d->m_connectionInterface->addType(convertUri(type.uri()));
+ }
}
QList< Nepomuk::Types::Property > Nepomuk::ResourceWatcher::properties() const
{
return d->m_properties;
}
QList<Nepomuk::Resource> Nepomuk::ResourceWatcher::resources() const
{
return d->m_resources;
}
QList< Nepomuk::Types::Class > Nepomuk::ResourceWatcher::types() const
{
return d->m_types;
}
void Nepomuk::ResourceWatcher::setProperties(const QList< Nepomuk::Types::Property >& properties_)
{
d->m_properties = properties_;
+
+ if(d->m_connectionInterface) {
+ QStringList propertyStrings;
+ foreach(const Nepomuk::Types::Property& p, properties_) {
+ propertyStrings << convertUri(p.uri());
+ }
+ d->m_connectionInterface->setProperties(propertyStrings);
+ }
}
void Nepomuk::ResourceWatcher::setResources(const QList< Nepomuk::Resource >& resources_)
{
d->m_resources = resources_;
+
+ if(d->m_connectionInterface) {
+ QStringList resStrings;
+ foreach(const Nepomuk::Resource& res, resources_) {
+ resStrings << convertUri(res.resourceUri());
+ }
+ d->m_connectionInterface->setResources(resStrings);
+ }
}
void Nepomuk::ResourceWatcher::setTypes(const QList< Nepomuk::Types::Class >& types_)
{
d->m_types = types_;
+
+ if(d->m_connectionInterface) {
+ QStringList typeStrings;
+ foreach(const Nepomuk::Types::Class& t, types_) {
+ typeStrings << convertUri(t.uri());
+ }
+ d->m_connectionInterface->setTypes(typeStrings);
+ }
}
void Nepomuk::ResourceWatcher::slotResourceCreated(const QString &res, const QStringList &types)
{
emit resourceCreated(Nepomuk::Resource::fromResourceUri(KUrl(res)), convertUris(types));
}
void Nepomuk::ResourceWatcher::slotResourceRemoved(const QString &res, const QStringList &types)
{
emit resourceRemoved(KUrl(res), convertUris(types));
}
void Nepomuk::ResourceWatcher::slotResourceTypeAdded(const QString &res, const QString &type)
{
emit resourceTypeAdded(KUrl(res), KUrl(type));
}
void Nepomuk::ResourceWatcher::slotResourceTypeRemoved(const QString &res, const QString &type)
{
emit resourceTypeRemoved(KUrl(res), KUrl(type));
}
void Nepomuk::ResourceWatcher::slotPropertyAdded(const QString& res, const QString& prop, const QDBusVariant& object)
{
emit propertyAdded( Resource::fromResourceUri(KUrl(res)), Types::Property( KUrl(prop) ), object.variant() );
}
void Nepomuk::ResourceWatcher::slotPropertyRemoved(const QString& res, const QString& prop, const QDBusVariant& object)
{
emit propertyRemoved( Resource::fromResourceUri(KUrl(res)), Types::Property( KUrl(prop) ), object.variant() );
}
void Nepomuk::ResourceWatcher::slotPropertyChanged(const QString& res, const QString& prop, const QVariantList& oldObjs, const QVariantList& newObjs)
{
emit propertyChanged( Resource::fromResourceUri(KUrl(res)), Types::Property( KUrl(prop) ),
oldObjs, newObjs );
}
#include "resourcewatcher.moc"

File Metadata

Mime Type
text/x-diff
Expires
Fri, Nov 1, 8:19 AM (1 d, 5 h)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
10074906
Default Alt Text
(11 KB)

Event Timeline