chylex/Nextcloud-Desktop
1
0
Fork 0
mirror of https://github.com/chylex/Nextcloud-Desktop.git synced 2026-08-21 15:46:15 +02:00
Code Activity
6,445 Commits 4 Branches 173 Tags
v1.7.0-beta4
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Klaas Freitag 21c8e65d13 csync tests: Fix test after db changes. 2014-10-21 11:26:04 +02:00
Klaas Freitag 26f068bcab SocketApi: Properly manage the database connections. 
Removed the fishy closeDb() method of SqlQuery again.
 2014-10-20 17:31:33 +02:00
Klaas Freitag 04b62b139d Fix compile error and add warning. 2014-10-20 17:10:34 +02:00
Klaas Freitag 2f20f3c65d SocketApi: Instanziate Object to call QFileInfo::exists 
QFileInfo on Qt4 does not have static members.
 2014-10-20 17:05:14 +02:00
Klaas Freitag 53b3e5af1b SocketAPI: Use new class SqlQuery to cache the sql queries. 
This results in better handling of the BUSY condition through SqlQuery.
 2014-10-20 16:55:37 +02:00
Klaas Freitag 3fcb0d2d6b SocketAPI: Properly release precompiled statements. Use sqlite3_close 
rather than its v2 equivalent. That should make it compile on older
linux platforms.
 2014-10-20 10:51:03 +02:00
Klaas Freitag 2dfe0ed42e Remove unused variable, fixes compile warning. 2014-10-20 10:51:03 +02:00
Klaas Freitag b5736fb5a7 Sql: Handle SQLITE_BUSY properly for sqlite3_step and sqlite3_prepare. 
Repeat the statements a couple of times and sleep in between.
 2014-10-18 16:16:29 +02:00
Klaas Freitag 7822a6b000 csync_statedb: Finalize the precompiled statements after discovery. 
As described in http://www.sqlite.org/cvstrac/wiki?p=MultiThreading precompiled
statements should not be used across thread borders. However, the reconcile
phase would reuse the statements if defined (it calls statedb function from
a different thread) so it is saver to finalize them at the end of the
update run.
 2014-10-18 14:18:11 +02:00
Klaas Freitag c66c01245b Beautified some debug logging strings. 2014-10-17 11:35:06 +02:00
Klaas Freitag 2f740fe471 tests: Added unicode read an write testcase for ownsql. 2014-10-16 21:21:47 +02:00
Klaas Freitag 36eaff92e5 JournalDb: Some Sql statement fixes, make t7 work again. 
plus some minor fixes.
 2014-10-16 11:22:57 +02:00
Klaas Freitag e51c299937 ownSql: create an null value of an empty string in bindValue. 2014-10-16 11:20:50 +02:00
Klaas Freitag 8c7953a47c ownSql: Proper initialization of result value plus assert on it. 2014-10-16 11:20:21 +02:00
Klaas Freitag ee8a93ae9a ownSql: Proper initialization of errId 2014-10-16 10:39:10 +02:00
Klaas Freitag 89c51e7649 ownsql: Implement the transaction functions. 2014-10-15 19:47:25 +02:00
Klaas Freitag 6c92076ec3 tx.pl: Adopt test t6.pl to the new way of handling precondition failed. 2014-10-15 19:25:34 +02:00
Klaas Freitag 336c95ce5b ownsql: Cleanups: In modern C++, we use 0 instead of NULL 2014-10-15 16:46:39 +02:00
Klaas Freitag babe891242 SyncEngine: Show a warning if post update script can not be exec. 2014-10-15 16:43:58 +02:00
Klaas Freitag eeb5ca42e0 ownsql: Added some paranthisis to make clear whats happening. 2014-10-15 13:29:25 +02:00
Klaas Freitag 74ec90c725 tx.pl: Fix sharing api url, some whitespace fixes. 2014-10-15 13:28:53 +02:00
Klaas Freitag 0094c1ecf5 Make the sync work with new sql implementation. 2014-10-14 20:51:51 +02:00
Klaas Freitag 6b5fcf53eb Test module for the new sql implementation. 2014-10-14 20:51:34 +02:00
Klaas Freitag 357c08c5b3 NewSQL: minor fixes to get stuff going 2014-10-14 12:18:33 +02:00
Klaas Freitag e7d9ec50dc Merge branch 'sqlite_capi' of github.com:owncloud/mirall into sqlite_capi 
Conflicts:
	src/mirall/socketapi.cpp
 2014-10-14 11:43:10 +02:00
Klaas Freitag 09b0ba31ef Sql: New implementation of ownSql class to go away from Qt's own Sql 2014-10-14 11:14:57 +02:00
Klaas Freitag 26ffa078ef SocketAPI: Cache database conections and statements 2014-10-13 17:31:40 +02:00
Klaas Freitag dd28a645a1 SocketAPI: Cleanup, removed helper namespace, added as private methods. 2014-10-13 15:38:57 +02:00
Klaas Freitag 561e3c780d socketapi: if the filename is empty, it's actually / 2014-10-13 15:36:13 +02:00
Klaas Freitag 8371e34d87 Nautilus overlay: minor cleanups 2014-10-13 14:59:23 +02:00
Klaas Freitag 46fd79604d JournalDb: Do not use static variable for path. 2014-10-13 14:49:53 +02:00
Klaas Freitag d08c2de619 Use sqlite C api. 2014-10-13 14:14:43 +02:00
Klaas Freitag ab40ba2f75 owncloudcmd: Handle trust ssl switch correctly by overwriting trustssl 
method in a subclass of HTTPCredentials.
 2014-10-11 17:17:43 +02:00
Klaas Freitag bbcb8ba3e7 credentials: Allow to trust ssl certs in subclasses of HTTPCredentials. 
This allows to handle the --trust option in owncloudcmd. In the
owncloudcmd subclass of the httpcredentials, we allow to manually trust
the ssl certificate through a command line switch.
 2014-10-11 17:17:43 +02:00
Klaas Freitag 2f5cea0e73 owncloudcmd: Add a custom ssl verification callback for neon. 
That fixes the SSL related problems we had with ci.owncloud.org
 2014-10-11 15:55:37 +02:00
Klaas Freitag d491663143 owncloudcmd: Fix some slash screwup, to make the split succeed bug #2211 2014-10-11 15:14:07 +02:00
Klaas Freitag 8eaeba6486 owncloudcmd: Fix url handling with csync, make owncloudcmd sync again. 
This fixes mirall issue #2211
 2014-10-11 12:21:26 +02:00
Klaas Freitag 9bb89dced5 Less offensive logging, only use error if there was one. 2014-10-10 10:16:59 +02:00
Klaas Freitag 61967f6e1b csync tests: conform to read only db. 2014-10-09 17:45:20 +02:00
Klaas Freitag 32fea6523f Use climits for ULONG_MAX rather than modern C++ option 2014-10-09 11:03:07 +02:00
Klaas Freitag d1c1a18226 SyncJournal: Use precompiled statement in blacklist query. 2014-10-09 10:05:20 +02:00
Klaas Freitag 04558beabe SyncJournal: Use the NOCASE Collate for blacklist query. 2014-10-09 10:05:20 +02:00
Klaas Freitag 425d0d77c5 Two little typo fixes. 2014-10-09 10:05:20 +02:00
Klaas Freitag edf7cd29dd csync statedb: Set PRAGMA synchronous to NORMAL for read only db. 2014-10-09 10:05:20 +02:00
Klaas Freitag 27318dded6 csync statedb: Issue a warning if sqlite is not compiled thread safe. 2014-10-09 10:05:20 +02:00
Klaas Freitag 11fe0c5b4b csync statedb: Open the statedb in read only mode and with mutex set. 
For that, sqlite3_open_v2 is used with the appropiate flags.
 2014-10-09 10:05:20 +02:00
Klaas Freitag 12b09fab67 CaseClash: more defensive logging on Windows. 2014-10-03 11:54:32 +02:00
Klaas Freitag ed5a8ab090 Push version to beta3 2014-10-03 11:37:00 +02:00
Klaas Freitag 41fa562dce blacklisting: disable broken remove stale entries function for now. 2014-10-03 11:35:18 +02:00
Klaas Freitag 6c2ce06fea tx.pl: Set the SSL relaxing env variable. 2014-10-03 10:33:30 +02:00
Klaas Freitag fee18dd457 Push version to beta2 2014-10-01 21:04:13 +02:00
Klaas Freitag 81d3ce8257 cmake: Commented setting of the INSTALL_PREFIX var on Mac 2014-10-01 20:55:39 +02:00
Klaas Freitag dff1f77dfa SocketAPI: remove nonsense FIXME's. 2014-09-30 17:12:07 +02:00
Klaas Freitag 29987ca2aa Overlays Linux: Add the state to the cache to save calls to add_emblem 
The SocketAPI sends status updates for files without being asked for.
And in order to not draw the emblem again if it had not changed, the
state is compared before calling add_emblem
 2014-09-30 13:57:06 +02:00
Klaas Freitag 479b340d75 Folderman: Check if socketApi member is non zero, no crashes. 2014-09-30 12:33:51 +02:00
Klaas Freitag 06c48f58cc SyncEngine: Use proper start indicator, max unit64. 
This avoids a warning.
 2014-09-30 12:29:24 +02:00
Klaas Freitag 0ee81a2865 SocketAPI: Set permission of the socket Directory. 
Set that to be accessible by the owner only.
 2014-09-30 11:23:49 +02:00
Klaas Freitag e78c251832 SocketAPI: Split up for specific linux and mac implementation. 2014-09-30 11:23:49 +02:00
Klaas Freitag efbc495f79 overlays Nautilus: Adopt to the use a local unix socket not TCP. 
Also, use the appname to find the correct branded icons.
 2014-09-30 11:17:05 +02:00
Klaas Freitag 788c27bf2f cmake: Fix installation of overlay icons on linux 2014-09-29 16:08:49 +02:00
Klaas Freitag b1c842373d Add OWNCLOUDSYNC_EXPORT to make building on windows. 2014-09-26 10:07:50 +02:00
Klaas Freitag 98d9f7924d SocketAPI: Before reporting something new check for parent permissions. 
In case it is not allowed to create files or dirs because of missing
permissions in shares, the socket API has to report an error state
rather than the NEW state.

As discussed in mirall issue #1931
 2014-09-25 21:52:20 +02:00
Klaas Freitag 172295289e Permissions: If a top level shared dir is removed, do not restore files in it 
A top level shared dir can always be removed on the client, even if it is
read only shared. In that case, the removal means "unsharing". Fixed the
permission check accordingly.

See bug #1918 for more information.
 2014-09-25 15:39:14 +02:00
Klaas Freitag 8ba08d7e87 Activity View: honor error string even if no warning 
that allows to specify a more specific user message to be displayed.
 2014-09-25 15:03:54 +02:00
Klaas Freitag 8915f94931 Mac Overlays: handle filenames with slashes properly. 
There are filenames with slashes on MacOSX, they can be created
in Finder. Internally they are converted to colons.
 2014-09-25 12:24:32 +02:00
Klaas Freitag 31bf844452 DownloadJob: Refresh the FileInfo after renaming the target file. 
Otherwise the activity view reports file size 0.
 2014-09-25 10:59:08 +02:00
Klaas Freitag 2e12acdf32 doc: add a memo about the issue that defines the permission flags. 2014-09-24 16:35:50 +02:00
Klaas Freitag 2c67a7ca71 progress: Set a clear start indication in the progress. 
Before, 0 was used to indicate the sync start which wipes the activity
window. However, if there _are_ no synced items but only ignored items
the overall counter stays zero which wipes the list all the time.

This fixes bug #2171
 2014-09-23 15:58:06 +02:00
Klaas Freitag 688b8dcc38 MacOverlays: Pass isDir flag to isRegisteredPath method 
With that, a path can be added to directories to also detect the
sync top directory.

This fixes bug #2053
 2014-09-23 10:25:11 +02:00
Klaas Freitag 280edee1db cmake: fix typo 2014-09-23 10:25:11 +02:00
Klaas Freitag 8f8265b219 Mac Installer: Add file name quoting. 2014-09-22 16:45:33 +02:00
Klaas Freitag 00ae3c3120 Mac Installer: Rename the final package to branded. 2014-09-22 16:38:51 +02:00
Klaas Freitag 1e49f152be Mac create pkg: Adjust background image path 2014-09-22 16:25:23 +02:00
Klaas Freitag f72ca4d83e Mac installer: Use template value for bundle name 2014-09-22 16:18:30 +02:00
Klaas Freitag 5b10a9f3a7 Minor: Remove unused definition 2014-09-22 13:47:45 +02:00
Klaas Freitag d0fb1acebb Win32: Define HANDLE variable, make win compile again. 2014-09-22 13:47:17 +02:00
Klaas Freitag 09be4d22ee Nautilus: Renamed nautilus plugin script to make it branding friendly 2014-09-22 12:24:06 +02:00
Klaas Freitag 11a64320f0 git: fix entry in .gitattributes to not export binary dir. 2014-09-22 11:24:24 +02:00
Klaas Freitag fc36e7eccf tests: Add a csync exclude test to check toplevel excludes. 2014-09-18 15:34:24 +02:00
Klaas Freitag 0cc2bbf5d9 csync exclude: Export the csync_exclude_add function in debug mode 2014-09-18 15:34:24 +02:00
Klaas Freitag e9248066df SyncJournal: Better error report for sql statements in updateDbStructure 
Also, even if the updateDatabaseStructure fails, precompile the sql
statements.

This will help to debug and maybe solve bug #2106
 2014-09-18 12:02:28 +02:00
Klaas Freitag 7ce2a93c63 Merge remote-tracking branch 'origin/reuse_oc_config' into 1.7 
Conflicts:
	src/CMakeLists.txt
	src/mirall/folderman.cpp
	src/mirall/folderman.h
	src/mirall/owncloudtheme.h
 2014-08-29 20:23:07 +02:00
Klaas Freitag 4d33773cef Nautilus Overlays: Rename icons according to branding. 
Added a script that renames the icons and patches the python file for
nautilus.
 2014-08-29 20:02:52 +02:00
Klaas Freitag 7f1d707d23 ownCloud Theme: Do not have the oCSetupTop custom media, see #1445 2014-08-28 18:10:53 +02:00
Klaas Freitag f1fb36bcb8 Tests: Get rid of the Carp package that ogoffart does not have. 
Recommendation: Use a decent distribution! But anyway....
 2014-08-28 18:10:53 +02:00
Klaas Freitag cc6aa66ab0 JournalDB: Do prepare the queries even if the db update failed. 
Also, add more logging in case SQL errors happen while db structure
update.
 2014-08-27 14:01:33 +02:00
Klaas Freitag d2e1489fe7 Propagator: Set the chunk size to 20MB as requested by Matt. 2014-08-27 10:35:58 +02:00
Klaas Freitag eb898646bc Create Mac Pack: Copy the creator script to the build directory. 2014-08-26 18:13:43 +02:00
Klaas Freitag 6025b3a91b Bump version to beta1 2014-08-21 14:33:03 +02:00
Klaas Freitag c473428be6 Merge pull request #2084 from owncloud/contextless_exclude 
Contextless exclude, @ogoffart reviewed, I'll merge.
 2014-08-21 13:15:18 +02:00
Klaas Freitag e06e5fe55f Excludes: Fix unit tests for the new exclude load interface. 
Also removed some commented lines.
 2014-08-21 13:12:05 +02:00
Klaas Freitag dc8f437b31 Excludes: Add an context free implementation of exclude file loading. 
So that we are more thread safe.
 2014-08-21 12:43:04 +02:00
Klaas Freitag 54e2b9345b GUI: on Mac do not call slotUpdateAccountIcon 2014-08-21 11:00:57 +02:00
Klaas Freitag fef0d0b31c Overlays Nautilus: Handle UNREGISTER_PATH and do proper reconnect. 
This is needed to fix #2073
 2014-08-20 17:33:48 +02:00
Klaas Freitag 75101a0319 Application: Unload all folders when shutting down. 
That sends a proper UNREGISTER message via socket API.
 2014-08-20 17:33:48 +02:00
Klaas Freitag d1a660ce20 SocketAPI: Add parameter to enable wait for the socket write. 
This is needed to wait until the UNREGISTER message is sent to the
shell code when mirall shuts down.
 2014-08-20 17:33:48 +02:00
Klaas Freitag 4356005c5a FolderMan: Do not remove the folder icon too early from the map. 
Otherwise, method unloadFolder can not do important frees.

This is one part of the fix for #2073 because now the socketapi will
send the UNREGISTER_PATH message over the socket.
 2014-08-20 17:33:48 +02:00
Klaas Freitag 988fe70771 Merge pull request #2075 from owncloud/use_folder_paused 
Rework of the status icons in FolderMan and Folder objects.
 2014-08-20 10:50:28 +02:00
Klaas Freitag d02175210b Status Icon: Set a proper icon if no sync is configured. 
This fixes bug #1956
 2014-08-19 17:47:28 +02:00
Klaas Freitag 617887a0c6 Propagator: If the sync was interrupted by pausing, do not show error. 
Handle problems which happen because of pausing the sync as soft errors
rather than normal errors which are blacklisted and displayed in the
gui.

This fixes bug #1959
 2014-08-19 14:21:59 +02:00