summaryrefslogtreecommitdiffstats
path: root/kitchensync/libqopensync
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2010-09-08 01:37:34 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2010-09-08 01:37:34 +0000
commitd4f48636cc2631625434326e146d04f503d0247a (patch)
treea371a2337bddce3de3fa3fcac52275a8204570d9 /kitchensync/libqopensync
parentd8b40941f9d1a221add0b9094eb09405a91a8aab (diff)
downloadtdepim-d4f48636cc2631625434326e146d04f503d0247a.tar.gz
tdepim-d4f48636cc2631625434326e146d04f503d0247a.zip
Reverse OpenSync patch as it causes a build failure on Debian
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1172771 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kitchensync/libqopensync')
-rw-r--r--kitchensync/libqopensync/Makefile.am12
-rw-r--r--kitchensync/libqopensync/callbackhandler.cpp23
-rw-r--r--kitchensync/libqopensync/callbackhandler.h6
-rw-r--r--kitchensync/libqopensync/conversion.cpp17
-rw-r--r--kitchensync/libqopensync/conversion.h6
-rw-r--r--kitchensync/libqopensync/engine.cpp40
-rw-r--r--kitchensync/libqopensync/engine.h11
-rw-r--r--kitchensync/libqopensync/filter.cpp1
-rw-r--r--kitchensync/libqopensync/group.cpp143
-rw-r--r--kitchensync/libqopensync/group.h104
-rw-r--r--kitchensync/libqopensync/member.cpp73
-rw-r--r--kitchensync/libqopensync/member.h21
-rw-r--r--kitchensync/libqopensync/plugin.cpp1
-rw-r--r--kitchensync/libqopensync/plugin.h2
-rw-r--r--kitchensync/libqopensync/result.cpp2
-rw-r--r--kitchensync/libqopensync/syncchange.cpp51
-rw-r--r--kitchensync/libqopensync/syncchange.h5
-rw-r--r--kitchensync/libqopensync/syncmapping.cpp43
-rw-r--r--kitchensync/libqopensync/syncmapping.h6
-rw-r--r--kitchensync/libqopensync/syncupdates.cpp102
-rw-r--r--kitchensync/libqopensync/syncupdates.h41
21 files changed, 386 insertions, 324 deletions
diff --git a/kitchensync/libqopensync/Makefile.am b/kitchensync/libqopensync/Makefile.am
index 772146a47..2e12df6ca 100644
--- a/kitchensync/libqopensync/Makefile.am
+++ b/kitchensync/libqopensync/Makefile.am
@@ -2,20 +2,16 @@ INCLUDES = -I$(top_srcdir)/kitchensync/src \
-I$(top_srcdir)/kitchensync \
-I$(top_srcdir) \
$(OPENSYNC_CFLAGS) \
- $(GLIB_CFLAGS) \
+ $(OPENSYNCENGINE_CFLAGS) \
$(all_includes)
lib_LTLIBRARIES = libqopensync.la
-libqopensync_la_SOURCES = callbackhandler.cpp engine.cpp groupenv.cpp pluginenv.cpp filter.cpp group.cpp \
+libqopensync_la_SOURCES = callbackhandler.cpp conversion.cpp engine.cpp environment.cpp filter.cpp group.cpp \
member.cpp plugin.cpp result.cpp syncmapping.cpp syncupdates.cpp \
syncchange.cpp
-
-# FIXME: -no-undefined break the build for some unkown reason - libopensync broken?!
-#libqopensync_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -no-undefined
-libqopensync_la_LDFLAGS = $(all_libraries) $(KDE_RPATH)
-libqopensync_la_LIBADD = $(LIB_KDEUI) $(OPENSYNC_LIBS)
-
+libqopensync_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -no-undefined
+libqopensync_la_LIBADD = $(LIB_KDEUI) $(OPENSYNC_LIBS) $(OPENSYNCENGINE_LIBS)
METASOURCES = AUTO
diff --git a/kitchensync/libqopensync/callbackhandler.cpp b/kitchensync/libqopensync/callbackhandler.cpp
index 894261b37..504afea99 100644
--- a/kitchensync/libqopensync/callbackhandler.cpp
+++ b/kitchensync/libqopensync/callbackhandler.cpp
@@ -19,12 +19,11 @@
Boston, MA 02110-1301, USA.
*/
-#include <opensync/opensync.h>
-#include <opensync/opensync-engine.h>
+#include <osengine/engine.h>
-#include <tqapplication.h>
+#include <libqopensync/engine.h>
-#include "engine.h"
+#include <tqapplication.h>
#include "callbackhandler.h"
@@ -112,11 +111,11 @@ void CallbackHandler::setEngine( Engine *engine )
{
mEngine = engine;
- osync_engine_set_conflict_callback( engine->mEngine, &conflict_callback, this );
- osync_engine_set_changestatus_callback( engine->mEngine, &change_callback, this );
- osync_engine_set_mappingstatus_callback( engine->mEngine, &mapping_callback, this );
- osync_engine_set_enginestatus_callback( engine->mEngine, &engine_callback, this );
- osync_engine_set_memberstatus_callback( engine->mEngine, &member_callback, this );
+ osengine_set_conflict_callback( engine->mEngine, &conflict_callback, this );
+ osengine_set_changestatus_callback( engine->mEngine, &change_callback, this );
+ osengine_set_mappingstatus_callback( engine->mEngine, &mapping_callback, this );
+ osengine_set_enginestatus_callback( engine->mEngine, &engine_callback, this );
+ osengine_set_memberstatus_callback( engine->mEngine, &member_callback, this );
}
Engine* CallbackHandler::engine() const
@@ -144,7 +143,7 @@ void CallbackHandler::customEvent( TQCustomEvent *event )
}
}
-void CallbackHandler::conflict_callback( OSyncEngine *engine, OSyncMappingEngine *omapping, void *data )
+void CallbackHandler::conflict_callback( OSyncEngine *engine, OSyncMapping *omapping, void *data )
{
SyncMapping mapping( omapping, engine );
@@ -153,7 +152,7 @@ void CallbackHandler::conflict_callback( OSyncEngine *engine, OSyncMappingEngine
TQApplication::postEvent( handler, new ConflictEvent( mapping ) );
}
-void CallbackHandler::change_callback( OSyncChangeUpdate *update, void *data )
+void CallbackHandler::change_callback( OSyncEngine*, OSyncChangeUpdate *update, void *data )
{
SyncChangeUpdate change( update );
@@ -171,7 +170,7 @@ void CallbackHandler::mapping_callback( OSyncMappingUpdate *update, void *data )
TQApplication::postEvent( handler, new MappingEvent( mapping ) );
}
-void CallbackHandler::engine_callback( OSyncEngineUpdate *update, void *data )
+void CallbackHandler::engine_callback( OSyncEngine*, OSyncEngineUpdate *update, void *data )
{
SyncEngineUpdate engine( update );
diff --git a/kitchensync/libqopensync/callbackhandler.h b/kitchensync/libqopensync/callbackhandler.h
index a2a4c6d13..fa6b97c60 100644
--- a/kitchensync/libqopensync/callbackhandler.h
+++ b/kitchensync/libqopensync/callbackhandler.h
@@ -76,10 +76,10 @@ class CallbackHandler : public QObject
class EngineEvent;
class MemberEvent;
- static void conflict_callback( OSyncEngine*, OSyncMappingEngine*, void* );
- static void change_callback( OSyncChangeUpdate*, void* );
+ static void conflict_callback( OSyncEngine*, OSyncMapping*, void* );
+ static void change_callback( OSyncEngine*, OSyncChangeUpdate*, void* );
static void mapping_callback( OSyncMappingUpdate*, void* );
- static void engine_callback( OSyncEngineUpdate*, void* );
+ static void engine_callback( OSyncEngine*, OSyncEngineUpdate*, void* );
static void member_callback( OSyncMemberUpdate*, void* );
Engine* mEngine;
diff --git a/kitchensync/libqopensync/conversion.cpp b/kitchensync/libqopensync/conversion.cpp
index dac027b1c..0be2fdb73 100644
--- a/kitchensync/libqopensync/conversion.cpp
+++ b/kitchensync/libqopensync/conversion.cpp
@@ -20,7 +20,6 @@
*/
#include <opensync/opensync.h>
-#include <opensync/opensync-format.h>
#include "conversion.h"
@@ -44,20 +43,16 @@ TQStringList Conversion::objectTypes() const
{
Q_ASSERT( mEnvironment );
- OSyncError *error = NULL;
- OSyncFormatEnv *formatEnv = osync_format_env_new( &error );
+ OSyncFormatEnv *formatEnv = osync_conv_env_new( mEnvironment );
Q_ASSERT( formatEnv );
- osync_format_env_load_plugins(formatEnv, NULL, &error);
-
TQStringList types;
+ for ( int i = 0; i < osync_conv_num_objtypes( formatEnv ); i++ ) {
+ OSyncObjType *type = osync_conv_nth_objtype( formatEnv, i );
+ types.append( TQString::fromUtf8( osync_objtype_get_name( type ) ) );
+ }
- for (int i = 0; i < osync_format_env_num_objformats(formatEnv); i++) {
- OSyncObjFormat *format = osync_format_env_nth_objformat(formatEnv, i);
- types.append( TQString::fromUtf8( osync_objformat_get_objtype(format) ) );
- }
-
- osync_format_env_free( formatEnv );
+ osync_conv_env_free( formatEnv );
return types;
}
diff --git a/kitchensync/libqopensync/conversion.h b/kitchensync/libqopensync/conversion.h
index 88447dbbe..e4b32c580 100644
--- a/kitchensync/libqopensync/conversion.h
+++ b/kitchensync/libqopensync/conversion.h
@@ -24,13 +24,13 @@
#include <tqstringlist.h>
-class OSyncGroupEnv;
+class OSyncEnv;
namespace QSync {
class Conversion
{
- friend class PluginEnv;
+ friend class Environment;
public:
Conversion();
@@ -47,7 +47,7 @@ class Conversion
TQStringList objectTypes() const;
private:
- OSyncGroupEnv *mGroupEnv;
+ OSyncEnv *mEnvironment;
};
}
diff --git a/kitchensync/libqopensync/engine.cpp b/kitchensync/libqopensync/engine.cpp
index 64a11f0ed..6d48c72ff 100644
--- a/kitchensync/libqopensync/engine.cpp
+++ b/kitchensync/libqopensync/engine.cpp
@@ -20,11 +20,7 @@
*/
#include <opensync/opensync.h>
-#include <opensync/opensync-engine.h>
-
-#include "group.h"
-#include "member.h"
-#include "result.h"
+#include <osengine/engine.h>
#include "engine.h"
@@ -33,21 +29,19 @@ using namespace QSync;
Engine::Engine( const Group &group )
{
OSyncError *error = 0;
- mEngine = osync_engine_new( group.mGroup, &error );
+ mEngine = osengine_new( group.mGroup, &error );
}
Engine::~Engine()
{
- osync_engine_unref( mEngine );
+ osengine_free( mEngine );
mEngine = 0;
}
Result Engine::initialize()
{
- Q_ASSERT( mEngine );
-
OSyncError *error = 0;
- if ( !osync_engine_initialize ( mEngine, &error ) )
+ if ( !osengine_init( mEngine, &error ) )
return Result( &error );
else
return Result();
@@ -55,29 +49,13 @@ Result Engine::initialize()
void Engine::finalize()
{
- Q_ASSERT( mEngine );
-
- OSyncError *error = 0;
- osync_engine_finalize( mEngine , &error );
+ osengine_finalize( mEngine );
}
Result Engine::synchronize()
{
- Q_ASSERT( mEngine );
-
OSyncError *error = 0;
- if ( !osync_engine_synchronize( mEngine, &error ) )
- return Result( &error );
- else
- return Result();
-}
-
-Result Engine::discover( const Member &member )
-{
- Q_ASSERT( mEngine );
-
- OSyncError *error = 0;
- if ( !osync_engine_discover_and_block( mEngine, member.mMember, &error ) )
+ if ( !osengine_synchronize( mEngine, &error ) )
return Result( &error );
else
return Result();
@@ -85,9 +63,5 @@ Result Engine::discover( const Member &member )
void Engine::abort()
{
- Q_ASSERT( mEngine );
-
-// TODO
-// osync_engine_abort( mEngine );
+ osengine_abort( mEngine );
}
-
diff --git a/kitchensync/libqopensync/engine.h b/kitchensync/libqopensync/engine.h
index c7314db47..e62a5f689 100644
--- a/kitchensync/libqopensync/engine.h
+++ b/kitchensync/libqopensync/engine.h
@@ -22,14 +22,12 @@
#ifndef QSYNC_ENGINE_H
#define QSYNC_ENGINE_H
+#include <libqopensync/group.h>
+
class OSyncEngine;
namespace QSync {
-class Group;
-class Member;
-class Result;
-
class Engine
{
friend class CallbackHandler;
@@ -61,11 +59,6 @@ class Engine
Result synchronize();
/**
- Starts the discover process for a certain member.
- */
- Result discover( const Member &member );
-
- /**
Stops the synchronization process.
*/
void abort();
diff --git a/kitchensync/libqopensync/filter.cpp b/kitchensync/libqopensync/filter.cpp
index 35e128968..dc5fe2eee 100644
--- a/kitchensync/libqopensync/filter.cpp
+++ b/kitchensync/libqopensync/filter.cpp
@@ -20,7 +20,6 @@
*/
#include <opensync/opensync.h>
-#include <opensync/opensync-format.h>
#include "filter.h"
diff --git a/kitchensync/libqopensync/group.cpp b/kitchensync/libqopensync/group.cpp
index 46e106098..bc94e2208 100644
--- a/kitchensync/libqopensync/group.cpp
+++ b/kitchensync/libqopensync/group.cpp
@@ -25,18 +25,86 @@
/** hack includes **/
#include <opensync/opensync.h>
-#include <opensync/opensync-group.h>
#include "conversion.h"
-#include "filter.h"
-#include "member.h"
-#include "plugin.h"
-#include "result.h"
-
#include "group.h"
using namespace QSync;
+/**
+ This class is a quick hack for OpenSync 0.19 and 0.20 because
+ the engine doesn't stores the filter settings itself when calling
+ osync_group_set_objtype_enabled(), so we have to store it for every
+ group in a separated config file. This class encapsulates it.
+ */
+GroupConfig::GroupConfig()
+ : mGroup( 0 )
+{
+}
+
+TQStringList GroupConfig::activeObjectTypes() const
+{
+ Q_ASSERT( mGroup );
+
+ const TQString fileName = TQString( "%1/filter.conf" ).arg( osync_group_get_configdir( mGroup ) );
+
+ TQFile file( fileName );
+ if ( !file.open( IO_ReadOnly ) )
+ return TQStringList();
+
+ TQDomDocument document;
+
+ TQString message;
+ if ( !document.setContent( &file, &message ) ) {
+ qDebug( "Error on loading %s: %s", fileName.latin1(), message.latin1() );
+ return TQStringList();
+ }
+ file.close();
+
+ TQStringList objectTypes;
+
+ TQDomElement element = document.documentElement();
+ TQDomNode node = element.firstChild();
+ while ( !node.isNull() ) {
+ TQDomElement childElement = node.toElement();
+ if ( !childElement.isNull() )
+ objectTypes.append( childElement.tagName() );
+
+ node = node.nextSibling();
+ }
+
+ return objectTypes;
+}
+
+void GroupConfig::setActiveObjectTypes( const TQStringList &objectTypes )
+{
+ Q_ASSERT( mGroup );
+
+ TQDomDocument document( "Filter" );
+ document.appendChild( document.createProcessingInstruction(
+ "xml", "version=\"1.0\" encoding=\"UTF-8\"" ) );
+
+ TQDomElement element = document.createElement( "filter" );
+ document.appendChild( element );
+
+ for ( uint i = 0; i < objectTypes.count(); ++i ) {
+ TQDomElement entry = document.createElement( objectTypes[ i ] );
+ element.appendChild( entry );
+ }
+
+ const TQString fileName = TQString( "%1/filter.conf" ).arg( osync_group_get_configdir( mGroup ) );
+
+ TQFile file( fileName );
+ if ( !file.open( IO_WriteOnly ) )
+ return;
+
+ TQTextStream s( &file );
+ s.setEncoding( TQTextStream::UnicodeUTF8 );
+ s << document.toString();
+ file.close();
+}
+
+
Group::Group()
: mGroup( 0 )
{
@@ -51,6 +119,22 @@ bool Group::isValid() const
return ( mGroup != 0 );
}
+Group::Iterator Group::begin()
+{
+ Iterator it( this );
+ it.mPos = 0;
+
+ return it;
+}
+
+Group::Iterator Group::end()
+{
+ Iterator it( this );
+ it.mPos = memberCount();
+
+ return it;
+}
+
void Group::setName( const TQString &name )
{
Q_ASSERT( mGroup );
@@ -104,22 +188,18 @@ Group::LockType Group::lock()
}
}
-void Group::unlock()
+void Group::unlock( bool removeFile )
{
Q_ASSERT( mGroup );
- osync_group_unlock( mGroup );
+ osync_group_unlock( mGroup, removeFile );
}
-Member Group::addMember( const QSync::Plugin &plugin )
+Member Group::addMember()
{
Q_ASSERT( mGroup );
- OSyncError *error = 0;
-
- OSyncMember *omember = osync_member_new( &error );
- osync_group_add_member( mGroup, omember );
- osync_member_set_pluginname( omember, plugin.name().utf8() );
+ OSyncMember *omember = osync_member_new( mGroup );
Member member;
member.mMember = omember;
@@ -189,30 +269,6 @@ Result Group::save()
return Result();
}
-void Group::setUseMerger( bool use )
-{
- Q_ASSERT( mGroup );
- osync_group_set_merger_enabled( mGroup, use );
-}
-
-bool Group::useMerger() const
-{
- Q_ASSERT( mGroup );
- return osync_group_get_merger_enabled( mGroup );
-}
-
-void Group::setUseConverter( bool use )
-{
- Q_ASSERT( mGroup );
- osync_group_set_converter_enabled( mGroup, use );
-}
-
-bool Group::useConverter() const
-{
- Q_ASSERT( mGroup );
- return osync_group_get_converter_enabled( mGroup );
-}
-
void Group::setObjectTypeEnabled( const TQString &objectType, bool enabled )
{
Q_ASSERT( mGroup );
@@ -225,13 +281,12 @@ bool Group::isObjectTypeEnabled( const TQString &objectType ) const
return osync_group_objtype_enabled( mGroup, objectType.utf8() );
}
-Result Group::cleanup() const
+GroupConfig Group::config() const
{
Q_ASSERT( mGroup );
- OSyncError *error = 0;
- if ( !osync_group_delete( mGroup, &error ) )
- return Result( &error );
- else
- return Result();
+ GroupConfig config;
+ config.mGroup = mGroup;
+
+ return config;
}
diff --git a/kitchensync/libqopensync/group.h b/kitchensync/libqopensync/group.h
index 1b1a532c3..750e7c41c 100644
--- a/kitchensync/libqopensync/group.h
+++ b/kitchensync/libqopensync/group.h
@@ -25,22 +25,35 @@
#include <tqdatetime.h>
#include <tqstringlist.h>
+#include <libqopensync/filter.h>
+#include <libqopensync/member.h>
+
class OSyncGroup;
namespace QSync {
-class Filter;
-class Member;
-class Plugin;
-class Result;
-
/**
@internal
*/
+class GroupConfig
+{
+ friend class Group;
+
+ public:
+ GroupConfig();
+
+ TQStringList activeObjectTypes() const;
+ void setActiveObjectTypes( const TQStringList &objectTypes );
+
+ private:
+ OSyncGroup *mGroup;
+};
+
+
class Group
{
friend class Engine;
- friend class GroupEnv;
+ friend class Environment;
public:
enum LockType
@@ -58,6 +71,51 @@ class Group
*/
bool isValid() const;
+ class Iterator
+ {
+ friend class Group;
+
+ public:
+ Iterator( Group *group )
+ : mGroup( group ), mPos( -1 )
+ {
+ }
+
+ Iterator( const Iterator &it )
+ {
+ mGroup = it.mGroup;
+ mPos = it.mPos;
+ }
+
+ Member operator*()
+ {
+ return mGroup->memberAt( mPos );
+ }
+
+ Iterator &operator++() { mPos++; return *this; }
+ Iterator &operator++( int ) { mPos++; return *this; }
+ Iterator &operator--() { mPos--; return *this; }
+ Iterator &operator--( int ) { mPos--; return *this; }
+ bool operator==( const Iterator &it ) { return mGroup == it.mGroup && mPos == it.mPos; }
+ bool operator!=( const Iterator &it ) { return mGroup == it.mGroup && mPos != it.mPos; }
+
+ private:
+ Group *mGroup;
+ int mPos;
+ };
+
+ /**
+ Returns an iterator pointing to the first item in the member list.
+ This iterator equals end() if the member list is empty.
+ */
+ Iterator begin();
+
+ /**
+ Returns an iterator pointing past the last item in the member list.
+ This iterator equals begin() if the member list is empty.
+ */
+ Iterator end();
+
/**
Sets the name of the group.
*/
@@ -87,15 +145,17 @@ class Group
/**
Unlocks the group.
+
+ @param removeFile Whether the lock file shall be removed.
*/
- void unlock();
+ void unlock( bool removeFile = true );
/**
Adds a new member to the group.
@returns the new member.
*/
- Member addMember( const QSync::Plugin &plugin );
+ Member addMember();
/**
Removes a member from the group.
@@ -135,37 +195,19 @@ class Group
bool isObjectTypeEnabled( const TQString &objectType ) const;
/**
- Sets whether this group uses the merger for synchronization.
- */
- void setUseMerger( bool use );
-
- /**
- Returns whether this group uses the merger for synchronization.
- */
- bool useMerger() const;
-
- /**
- Sets whether this group uses the converter for synchronization.
+ Saves the configuration to hard disc.
*/
- void setUseConverter( bool use );
+ Result save();
/**
- Returns whether this group uses the converter for synchronization.
- */
- bool useConverter() const;
+ Returns the config object of this group.
- /**
- Saves the configuration to hard disc.
+ Note: This method is only available for OpenSync 0.19 and 0.20.
*/
- Result save();
+ GroupConfig config() const;
bool operator==( const Group &group ) const { return mGroup == group.mGroup; }
- /**
- Removes all group configurations from the hard disc.
- */
- Result cleanup() const;
-
private:
OSyncGroup *mGroup;
};
diff --git a/kitchensync/libqopensync/member.cpp b/kitchensync/libqopensync/member.cpp
index e56d11829..35cb04632 100644
--- a/kitchensync/libqopensync/member.cpp
+++ b/kitchensync/libqopensync/member.cpp
@@ -20,12 +20,8 @@
*/
#include <opensync/opensync.h>
-#include <opensync/opensync-group.h>
-
#include <stdlib.h>
-#include "result.h"
-
#include "member.h"
using namespace QSync;
@@ -46,9 +42,9 @@ bool Member::isValid() const
if ( !mMember )
return false;
- if ( !osync_member_load( mMember, configurationDirectory().utf8(), &error ) ) {
+ if ( !osync_member_instance_plugin( mMember, pluginName().utf8(), &error ) ) {
qDebug( "Plugin %s is not valid: %s", pluginName().latin1(), osync_error_print( &error ) );
- osync_error_unref( &error );
+ osync_error_free( &error );
return false;
}
@@ -69,6 +65,19 @@ TQString Member::pluginName() const
return TQString::fromLatin1( osync_member_get_pluginname( mMember ) );
}
+Plugin Member::plugin() const
+{
+ Q_ASSERT( mMember );
+
+ Plugin plugin;
+
+ OSyncPlugin *oplugin = osync_member_get_plugin( mMember );
+ if ( oplugin )
+ plugin.mPlugin = oplugin;
+
+ return plugin;
+}
+
int Member::id() const
{
Q_ASSERT( mMember );
@@ -94,28 +103,27 @@ void Member::setConfiguration( const TQByteArray &configurationData )
{
Q_ASSERT( mMember );
- osync_member_set_config( mMember, configurationData.data() );
+ osync_member_set_config( mMember, configurationData.data(), configurationData.size() );
}
Result Member::configuration( TQByteArray &configurationData, bool useDefault )
{
Q_ASSERT( mMember );
- const char *data;
- int size = 0;
+ char *data;
+ int size;
OSyncError *error = 0;
+ osync_bool ok = false;
if ( useDefault )
- data = osync_member_get_config_or_default( mMember, &error );
+ ok = osync_member_get_config_or_default( mMember, &data, &size, &error );
else
- data = osync_member_get_config( mMember, &error );
+ ok = osync_member_get_config( mMember, &data, &size, &error );
-
- if ( !data ) {
+ if ( !ok ) {
return Result( &error );
} else {
- size = strlen(data);
- configurationData.resize( size );
+ configurationData.resize( size );
memcpy( configurationData.data(), data, size );
return Result();
@@ -133,10 +141,10 @@ Result Member::save()
return Result();
}
-Result Member::instance()
+Result Member::instance( const Plugin &plugin )
{
OSyncError *error = 0;
- if ( !osync_member_load( mMember, configurationDirectory().utf8(), &error ) )
+ if ( !osync_member_instance_plugin( mMember, plugin.name().utf8(), &error ) )
return Result( &error );
else
return Result();
@@ -147,13 +155,34 @@ bool Member::operator==( const Member &member ) const
return mMember == member.mMember;
}
-Result Member::cleanup() const
+TQString Member::scanDevices( const TQString &query )
{
Q_ASSERT( mMember );
OSyncError *error = 0;
- if ( !osync_member_delete( mMember, &error ) )
- return Result( &error );
- else
- return Result();
+ char *data = (char*)osync_member_call_plugin( mMember, "scan_devices", const_cast<char*>( query.utf8().data() ), &error );
+ if ( error != 0 ) {
+ osync_error_free( &error );
+ return TQString();
+ } else {
+ TQString xml = TQString::fromUtf8( data );
+ free( data );
+ return xml;
+ }
+}
+
+bool Member::testConnection( const TQString &configuration )
+{
+ Q_ASSERT( mMember );
+
+ OSyncError *error = 0;
+ int *result = (int*)osync_member_call_plugin( mMember, "test_connection", const_cast<char*>( configuration.utf8().data() ), &error );
+ if ( error != 0 ) {
+ osync_error_free( &error );
+ return false;
+ } else {
+ bool value = ( *result == 1 ? true : false );
+ free( result );
+ return value;
+ }
}
diff --git a/kitchensync/libqopensync/member.h b/kitchensync/libqopensync/member.h
index 215b0b148..294c19f15 100644
--- a/kitchensync/libqopensync/member.h
+++ b/kitchensync/libqopensync/member.h
@@ -22,21 +22,19 @@
#ifndef QSYNC_MEMBER_H
#define QSYNC_MEMBER_H
-#include <tqstring.h>
+#include <libqopensync/plugin.h>
+#include <libqopensync/result.h>
+#include <libqopensync/plugin.h>
class OSyncMember;
namespace QSync {
-class Result;
-
class Member
{
friend class Group;
- friend class Engine;
friend class SyncChange;
friend class SyncMemberUpdate;
- friend class SyncChangeUpdate;
public:
Member();
@@ -58,6 +56,11 @@ class Member
TQString pluginName() const;
/**
+ Returns the plugin, the member belongs to.
+ */
+ Plugin plugin() const;
+
+ /**
Returns the id of the plugin.
*/
int id() const;
@@ -99,7 +102,7 @@ class Member
/**
Make this member an instance of the given plugin.
*/
- Result instance();
+ Result instance( const Plugin & );
bool operator==( const Member& ) const;
@@ -116,12 +119,6 @@ class Member
*/
bool testConnection( const TQString &configuration );
-
- /**
- * Deletes the member's information from the hard disc.
- */
- Result cleanup() const;
-
private:
OSyncMember *mMember;
};
diff --git a/kitchensync/libqopensync/plugin.cpp b/kitchensync/libqopensync/plugin.cpp
index a9437f387..acd54447a 100644
--- a/kitchensync/libqopensync/plugin.cpp
+++ b/kitchensync/libqopensync/plugin.cpp
@@ -20,7 +20,6 @@
*/
#include <opensync/opensync.h>
-#include <opensync/opensync-plugin.h>
#include "plugin.h"
diff --git a/kitchensync/libqopensync/plugin.h b/kitchensync/libqopensync/plugin.h
index ddddaadbb..d26c2826c 100644
--- a/kitchensync/libqopensync/plugin.h
+++ b/kitchensync/libqopensync/plugin.h
@@ -30,7 +30,7 @@ namespace QSync {
class Plugin
{
- friend class PluginEnv;
+ friend class Environment;
friend class Member;
public:
diff --git a/kitchensync/libqopensync/result.cpp b/kitchensync/libqopensync/result.cpp
index 13d06e71a..d38c32a3d 100644
--- a/kitchensync/libqopensync/result.cpp
+++ b/kitchensync/libqopensync/result.cpp
@@ -100,7 +100,7 @@ Result::Result( OSyncError **error, bool deleteError )
mMessage = TQString::fromUtf8( osync_error_print( error ) );
if ( deleteError )
- osync_error_unref( error );
+ osync_error_free( error );
}
Result::~Result()
diff --git a/kitchensync/libqopensync/syncchange.cpp b/kitchensync/libqopensync/syncchange.cpp
index d45be2e4a..5dd72d7ff 100644
--- a/kitchensync/libqopensync/syncchange.cpp
+++ b/kitchensync/libqopensync/syncchange.cpp
@@ -19,13 +19,8 @@
Boston, MA 02110-1301, USA.
*/
-#include <stdlib.h>
-
#include <opensync/file.h>
-
#include <opensync/opensync.h>
-#include <opensync/opensync-data.h>
-#include <opensync/opensync-format.h>
#include "syncchange.h"
@@ -69,50 +64,39 @@ TQString SyncChange::hash() const
return TQString::fromUtf8( osync_change_get_hash( mSyncChange ) );
}
-void SyncChange::setData( const TQString &data , OSyncObjFormat *format )
+void SyncChange::setData( const TQString &data )
{
- OSyncError *error = 0;
-
- OSyncData *odata = osync_data_new( const_cast<char*>( data.utf8().data() ), data.utf8().size(), format, &error );
- osync_change_set_data( mSyncChange, odata );
+ osync_change_set_data( mSyncChange, const_cast<char*>( data.utf8().data() ), data.utf8().size(), true );
}
TQString SyncChange::data() const
{
- char *buf;
- unsigned int size;
-
- OSyncData *data = osync_change_get_data( mSyncChange );
-
- osync_data_get_data( data, &buf, &size );
+ int size = osync_change_get_datasize( mSyncChange );
TQString content;
if ( objectFormatName() == "file" ) {
- OSyncFileFormat *format = (OSyncFileFormat*) buf;
+ fileFormat *format = (fileFormat*)osync_change_get_data( mSyncChange );
if ( format )
content = TQString::fromUtf8( format->data, format->size );
} else
- content = TQString::fromUtf8( buf, size );
-
- free( buf );
+ content = TQString::fromUtf8( osync_change_get_data( mSyncChange ), size );
return content;
}
bool SyncChange::hasData() const
{
- return osync_data_has_data( osync_change_get_data( mSyncChange ) );
+ return osync_change_has_data( mSyncChange );
}
TQString SyncChange::objectFormatName() const
{
- OSyncObjFormat *format = osync_data_get_objformat( osync_change_get_data( mSyncChange ) );
+ OSyncObjFormat *format = osync_change_get_objformat( mSyncChange );
Q_ASSERT( format );
return TQString::fromUtf8( osync_objformat_get_name( format ) );
}
-/*
Member SyncChange::member() const
{
OSyncMember *omember = osync_change_get_member( mSyncChange );
@@ -122,7 +106,6 @@ Member SyncChange::member() const
return m;
}
-*/
void SyncChange::setChangeType( Type changeType )
{
@@ -130,20 +113,20 @@ void SyncChange::setChangeType( Type changeType )
switch ( changeType ) {
case AddedChange:
- ochangeType = OSYNC_CHANGE_TYPE_ADDED;
+ ochangeType = CHANGE_ADDED;
break;
case UnmodifiedChange:
- ochangeType = OSYNC_CHANGE_TYPE_UNMODIFIED;
+ ochangeType = CHANGE_UNMODIFIED;
break;
case DeletedChange:
- ochangeType = OSYNC_CHANGE_TYPE_DELETED;
+ ochangeType = CHANGE_DELETED;
break;
case ModifiedChange:
- ochangeType = OSYNC_CHANGE_TYPE_MODIFIED;
+ ochangeType = CHANGE_MODIFIED;
break;
case UnknownChange:
default:
- ochangeType = OSYNC_CHANGE_TYPE_UNKNOWN;
+ ochangeType = CHANGE_UNKNOWN;
break;
}
@@ -155,19 +138,19 @@ SyncChange::Type SyncChange::changeType() const
OSyncChangeType ochangeType = osync_change_get_changetype( mSyncChange );
switch ( ochangeType ) {
- case OSYNC_CHANGE_TYPE_ADDED:
+ case CHANGE_ADDED:
return AddedChange;
break;
- case OSYNC_CHANGE_TYPE_UNMODIFIED:
+ case CHANGE_UNMODIFIED:
return UnmodifiedChange;
break;
- case OSYNC_CHANGE_TYPE_DELETED:
+ case CHANGE_DELETED:
return DeletedChange;
break;
- case OSYNC_CHANGE_TYPE_MODIFIED:
+ case CHANGE_MODIFIED:
return ModifiedChange;
break;
- case OSYNC_CHANGE_TYPE_UNKNOWN:
+ case CHANGE_UNKNOWN:
default:
return UnknownChange;
break;
diff --git a/kitchensync/libqopensync/syncchange.h b/kitchensync/libqopensync/syncchange.h
index 2afaddcc4..53d9c4401 100644
--- a/kitchensync/libqopensync/syncchange.h
+++ b/kitchensync/libqopensync/syncchange.h
@@ -25,7 +25,6 @@
#include <libqopensync/member.h>
class OSyncChange;
-class OSyncObjFormat;
namespace QSync {
@@ -75,7 +74,7 @@ class SyncChange
/**
Sets the data provided by the plugin.
*/
- void setData( const TQString &data, OSyncObjFormat *format );
+ void setData( const TQString &data );
/**
Returns the data provided by the plugin.
@@ -95,7 +94,7 @@ class SyncChange
/**
Returns the parent member of this change.
*/
-// Member member() const;
+ Member member() const;
/**
Sets the change type.
diff --git a/kitchensync/libqopensync/syncmapping.cpp b/kitchensync/libqopensync/syncmapping.cpp
index d716af17a..95939ab85 100644
--- a/kitchensync/libqopensync/syncmapping.cpp
+++ b/kitchensync/libqopensync/syncmapping.cpp
@@ -20,20 +20,19 @@
*/
#include <tqstring.h>
-#include <opensync/opensync.h>
-#include <opensync/opensync-engine.h>
+#include <osengine/engine.h>
#include "syncmapping.h"
using namespace QSync;
SyncMapping::SyncMapping()
- : mEngine( 0 ), mMappingEngine( 0 )
+ : mEngine( 0 ), mMapping( 0 )
{
}
-SyncMapping::SyncMapping( OSyncMappingEngine *mapping, OSyncEngine *engine )
- : mEngine( engine ), mMappingEngine( mapping )
+SyncMapping::SyncMapping( OSyncMapping *mapping, OSyncEngine *engine )
+ : mEngine( engine ), mMapping( mapping )
{
}
@@ -43,64 +42,58 @@ SyncMapping::~SyncMapping()
bool SyncMapping::isValid() const
{
- return ( mEngine != 0 && mMappingEngine != 0 );
+ return ( mEngine != 0 && mMapping != 0 );
}
-/*
long long SyncMapping::id() const
{
- Q_ASSERT( mMappingEngine );
+ Q_ASSERT( mMapping );
- return osync_mapping_engine_get_id( mMappingEngine );
+ return osengine_mapping_get_id( mMapping );
}
-*/
void SyncMapping::duplicate()
{
Q_ASSERT( mEngine );
- Q_ASSERT( mMappingEngine );
-
- OSyncError *error = 0;
+ Q_ASSERT( mMapping );
- osync_mapping_engine_duplicate( mMappingEngine, &error );
+ osengine_mapping_duplicate( mEngine, mMapping );
}
void SyncMapping::solve( const SyncChange &change )
{
Q_ASSERT( mEngine );
- Q_ASSERT( mMappingEngine );
+ Q_ASSERT( mMapping );
Q_ASSERT( change.isValid() );
- OSyncError *error = 0;
-
- osync_mapping_engine_solve( mMappingEngine, change.mSyncChange, &error );
+ osengine_mapping_solve( mEngine, mMapping, change.mSyncChange );
}
void SyncMapping::ignore()
{
Q_ASSERT( mEngine );
- Q_ASSERT( mMappingEngine );
+ Q_ASSERT( mMapping );
//TODO: error should be returned as Result
OSyncError *error = 0;
- osync_mapping_engine_ignore( mMappingEngine, &error );
+ osengine_mapping_ignore_conflict( mEngine, mMapping, &error );
}
int SyncMapping::changesCount() const
{
- Q_ASSERT( mMappingEngine );
+ Q_ASSERT( mMapping );
- return osync_mapping_engine_num_changes( mMappingEngine );
+ return osengine_mapping_num_changes( mMapping );
}
SyncChange SyncMapping::changeAt( int pos )
{
- Q_ASSERT( mMappingEngine );
+ Q_ASSERT( mMapping );
- if ( pos < 0 || pos >= osync_mapping_engine_num_changes( mMappingEngine ) )
+ if ( pos < 0 || pos >= osengine_mapping_num_changes( mMapping ) )
return SyncChange();
- OSyncChange *ochange = osync_mapping_engine_nth_change( mMappingEngine, pos );
+ OSyncChange *ochange = osengine_mapping_nth_change( mMapping, pos );
return SyncChange( ochange );
}
diff --git a/kitchensync/libqopensync/syncmapping.h b/kitchensync/libqopensync/syncmapping.h
index 0351fa9f5..6de67330a 100644
--- a/kitchensync/libqopensync/syncmapping.h
+++ b/kitchensync/libqopensync/syncmapping.h
@@ -25,7 +25,7 @@
#include <libqopensync/syncchange.h>
class OSyncEngine;
-class OSyncMappingEngine;
+class OSyncMapping;
namespace QSync {
@@ -35,7 +35,7 @@ class SyncMapping
public:
SyncMapping();
- SyncMapping( OSyncMappingEngine*, OSyncEngine* );
+ SyncMapping( OSyncMapping*, OSyncEngine* );
~SyncMapping();
bool isValid() const;
@@ -51,7 +51,7 @@ class SyncMapping
private:
OSyncEngine *mEngine;
- OSyncMappingEngine *mMappingEngine;
+ OSyncMapping *mMapping;
};
}
diff --git a/kitchensync/libqopensync/syncupdates.cpp b/kitchensync/libqopensync/syncupdates.cpp
index 3ad273f9f..653ccf7f3 100644
--- a/kitchensync/libqopensync/syncupdates.cpp
+++ b/kitchensync/libqopensync/syncupdates.cpp
@@ -19,8 +19,7 @@
Boston, MA 02110-1301, USA.
*/
-#include <opensync/opensync.h>
-#include <opensync/opensync-engine.h>
+#include <osengine/engine.h>
#include "syncupdates.h"
@@ -33,26 +32,32 @@ SyncMemberUpdate::SyncMemberUpdate()
SyncMemberUpdate::SyncMemberUpdate( OSyncMemberUpdate *update )
{
switch ( update->type ) {
- case OSYNC_CLIENT_EVENT_CONNECTED:
+ case MEMBER_CONNECTED:
mType = Connected;
break;
- case OSYNC_CLIENT_EVENT_DISCONNECTED:
+ case MEMBER_SENT_CHANGES:
+ mType = SentChanges;
+ break;
+ case MEMBER_COMMITTED_ALL:
+ mType = CommittedAll;
+ break;
+ case MEMBER_DISCONNECTED:
mType = Disconnected;
break;
- case OSYNC_CLIENT_EVENT_READ:
- mType = Read;
+ case MEMBER_CONNECT_ERROR:
+ mType = ConnectError;
break;
- case OSYNC_CLIENT_EVENT_WRITTEN:
- mType = Written;
+ case MEMBER_GET_CHANGES_ERROR:
+ mType = GetChangesError;
break;
- case OSYNC_CLIENT_EVENT_SYNC_DONE:
- mType = SyncDone;
+ case MEMBER_COMMITTED_ALL_ERROR:
+ mType = CommittedAllError;
break;
- case OSYNC_CLIENT_EVENT_DISCOVERED:
- mType = Discovered;
+ case MEMBER_SYNC_DONE_ERROR:
+ mType = SyncDoneError;
break;
- case OSYNC_CLIENT_EVENT_ERROR:
- mType = Error;
+ case MEMBER_DISCONNECT_ERROR:
+ mType = DisconnectedError;
break;
}
@@ -89,14 +94,20 @@ SyncChangeUpdate::SyncChangeUpdate()
SyncChangeUpdate::SyncChangeUpdate( OSyncChangeUpdate *update )
{
switch ( update->type ) {
- case OSYNC_CHANGE_EVENT_READ:
- mType = Read;
+ case CHANGE_RECEIVED:
+ mType = Received;
break;
- case OSYNC_CHANGE_EVENT_WRITTEN:
- mType = Written;
+ case CHANGE_RECEIVED_INFO:
+ mType = ReceivedInfo;
break;
- case OSYNC_CHANGE_EVENT_ERROR:
- mType = Error;
+ case CHANGE_SENT:
+ mType = Sent;
+ break;
+ case CHANGE_WRITE_ERROR:
+ mType = WriteError;
+ break;
+ case CHANGE_RECV_ERROR:
+ mType = ReceiveError;
break;
}
@@ -104,7 +115,7 @@ SyncChangeUpdate::SyncChangeUpdate( OSyncChangeUpdate *update )
mResult = Result( &(update->error) );
mChange = SyncChange( update->change );
- mMember.mMember = update->member;
+ mMemberId = update->member_id;
mMappingId = update->mapping_id;
}
@@ -127,9 +138,9 @@ SyncChange SyncChangeUpdate::change() const
return mChange;
}
-Member SyncChangeUpdate::member() const
+int SyncChangeUpdate::memberId() const
{
- return mMember;
+ return mMemberId;
}
int SyncChangeUpdate::mappingId() const
@@ -144,14 +155,14 @@ SyncMappingUpdate::SyncMappingUpdate()
SyncMappingUpdate::SyncMappingUpdate( OSyncMappingUpdate *update, OSyncEngine *engine )
{
switch ( update->type ) {
- case OSYNC_MAPPING_EVENT_SOLVED:
+ case MAPPING_SOLVED:
mType = Solved;
break;
-// case OSYNC_MAPPING_EVENT_SYNCED:
- // mType = Synced;
- // break;
- case OSYNC_MAPPING_EVENT_ERROR:
- mType = Error;
+ case MAPPING_SYNCED:
+ mType = Synced;
+ break;
+ case MAPPING_WRITE_ERROR:
+ mType = WriteError;
break;
}
@@ -160,9 +171,7 @@ SyncMappingUpdate::SyncMappingUpdate( OSyncMappingUpdate *update, OSyncEngine *e
mWinner = update->winner;
mMapping.mEngine = engine;
-
- // TODO PORTING
-// mMapping.mMapping = update->mapping;
+ mMapping.mMapping = update->mapping;
}
SyncMappingUpdate::~SyncMappingUpdate()
@@ -196,33 +205,30 @@ SyncEngineUpdate::SyncEngineUpdate()
SyncEngineUpdate::SyncEngineUpdate( OSyncEngineUpdate *update )
{
switch ( update->type ) {
- case OSYNC_ENGINE_EVENT_CONNECTED:
- mType = Connected;
+ case ENG_ENDPHASE_CON:
+ mType = EndPhaseConnected;
break;
- case OSYNC_ENGINE_EVENT_READ:
- mType = Read;
+ case ENG_ENDPHASE_READ:
+ mType = EndPhaseRead;
break;
- case OSYNC_ENGINE_EVENT_WRITTEN:
- mType = Written;
+ case ENG_ENDPHASE_WRITE:
+ mType = EndPhaseWrite;
break;
- case OSYNC_ENGINE_EVENT_DISCONNECTED:
- mType = Disconnected;
+ case ENG_ENDPHASE_DISCON:
+ mType = EndPhaseDisconnected;
break;
- case OSYNC_ENGINE_EVENT_ERROR:
+ case ENG_ERROR:
mType = Error;
break;
- case OSYNC_ENGINE_EVENT_SUCCESSFUL:
- mType = SyncSuccessful;
+ case ENG_SYNC_SUCCESSFULL:
+ mType = SyncSuccessfull;
break;
- case OSYNC_ENGINE_EVENT_PREV_UNCLEAN:
+ case ENG_PREV_UNCLEAN:
mType = PrevUnclean;
break;
- case OSYNC_ENGINE_EVENT_END_CONFLICTS:
+ case ENG_END_CONFLICTS:
mType = EndConflicts;
break;
- case OSYNC_ENGINE_EVENT_SYNC_DONE:
- mType = SyncDone;
- break;
}
if ( update->error )
diff --git a/kitchensync/libqopensync/syncupdates.h b/kitchensync/libqopensync/syncupdates.h
index 96741b059..14a2d9193 100644
--- a/kitchensync/libqopensync/syncupdates.h
+++ b/kitchensync/libqopensync/syncupdates.h
@@ -42,12 +42,14 @@ class SyncMemberUpdate
public:
enum Type {
Connected,
+ SentChanges,
+ CommittedAll,
Disconnected,
- Read,
- Written,
- SyncDone,
- Discovered,
- Error
+ ConnectError,
+ GetChangesError,
+ CommittedAllError,
+ SyncDoneError,
+ DisconnectedError
};
SyncMemberUpdate();
@@ -70,9 +72,11 @@ class SyncChangeUpdate
public:
enum Type {
- Read = 1,
- Written,
- Error
+ Received = 1,
+ ReceivedInfo,
+ Sent,
+ WriteError,
+ ReceiveError
};
SyncChangeUpdate();
@@ -82,14 +86,14 @@ class SyncChangeUpdate
Type type() const;
Result result() const;
SyncChange change() const;
- Member member() const;
+ int memberId() const;
int mappingId() const;
private:
Type mType;
Result mResult;
SyncChange mChange;
- Member mMember;
+ int mMemberId;
int mMappingId;
};
@@ -100,8 +104,8 @@ class SyncMappingUpdate
public:
enum Type {
Solved = 1,
- //Synced,
- Error
+ Synced,
+ WriteError
};
SyncMappingUpdate();
@@ -126,15 +130,14 @@ class SyncEngineUpdate
public:
enum Type {
- Connected = 1,
- Read,
- Written,
- Disconnected,
+ EndPhaseConnected = 1,
+ EndPhaseRead,
+ EndPhaseWrite,
+ EndPhaseDisconnected,
Error,
- SyncSuccessful,
+ SyncSuccessfull,
PrevUnclean,
- EndConflicts,
- SyncDone
+ EndConflicts
};
SyncEngineUpdate();