wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
42249 commits 157 branches 562 tags 714 MiB
Commit graph

358 commits

Author SHA1 Message Date
Morris Jobke
97c216ea06
Merge pull request #8071 from nextcloud/remove-silly-code 
Cleanup unused code
 2018-01-26 15:47:06 +01:00
Morris Jobke
4c38d1ed01
Merge pull request #8054 from nextcloud/substr-use-index 
Use index based string access for substr with length of 1
 2018-01-26 15:40:44 +01:00
Morris Jobke
c005fc6755
Cleanup unused code 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-01-26 15:25:19 +01:00
Morris Jobke
9ff51aafc5
Use index based string access for substr with length of 1 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-01-26 13:38:34 +01:00
Morris Jobke
6bbea33133
Simplify ternary operator statements 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-01-26 12:36:25 +01:00
Joas Schilling
c2b1bd92d6
Merge pull request #8063 from nextcloud/inline-value 
Return value immediately instead of assigning to a one-time variable
 2018-01-26 10:15:39 +01:00
Roeland Jago Douma
5a7a5e5352
Merge pull request #8058 from nextcloud/useless-return 
Remove useless return statements
 2018-01-26 09:51:26 +01:00
Morris Jobke
0a56d2185e
Return value immediately instead of assigning to a one-time variable 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-01-26 00:02:03 +01:00
Morris Jobke
16a558871c
Use proper code flow instead of not needed else branch 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-01-25 23:01:03 +01:00
Morris Jobke
4dbee99b7b
Remove useless return statements 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-01-25 22:50:40 +01:00
Roeland Jago Douma
4537faa5da
Merge pull request #7918 from nextcloud/properly-log-exceptions 
Properly log the full exception instead of only the message
 2018-01-23 11:56:02 +01:00
Morris Jobke
2a38605545
Properly log the full exception instead of only the message 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-01-23 10:57:21 +01:00
Morris Jobke
5c360a41e9
Merge pull request #7858 from nextcloud/fix-local-storage 
Use fallback path if data dir is not available for Storage/Local.php
 2018-01-23 10:52:41 +01:00
Morris Jobke
bcba1a97ad
Use fallback path if data dir is not available for Storage/Local.php 
Found while testing strict types for PHP7+.

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2018-01-18 16:38:01 +01:00
Robin Appelman
326d55db81
Support arbitrary number of arguments for d:or and d:and in search queries 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2018-01-16 13:22:28 +01:00
Roeland Jago Douma
8a41d05761
Remove deprecated \OCP\Config 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-01-13 14:25:04 +01:00
Morris Jobke
01040daf02
Fix call to clearstatcache to actually use the file path 
* found while adding the strict_typing for PHP 7+ migration
* first argument is a boolean - second one is the path
* see http://php.net/manual/en/function.clearstatcache.php

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-01-12 13:59:58 +01:00
Robin Appelman
34ced4dd97
add option to use legacy v2 auth with s3 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-12-19 11:54:55 +01:00
Morris Jobke
d2d73f1ce8
Also replace all other occurences 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-12-18 20:57:11 +01:00
Robin Appelman
4f0d03e172
additional debug logging on smb copy/rename failures 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-12-18 13:59:58 +01:00
Robin Appelman
05d2f61a59
handle not found mounts when cleaning avatars 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-12-11 16:56:10 +01:00
Roeland Jago Douma
e47137c7d4
Merge pull request #6682 from nextcloud/dav-mimetype-fallback 
Fallback to filename based detection if the remote dav server doesn't…
 2017-12-11 15:28:05 +01:00
Morris Jobke
c32cb6b4b7
Merge pull request #7385 from nextcloud/shared-delay-root 
delay calculating the shared cache root until it's used
 2017-12-06 15:14:48 +01:00
Robin Appelman
046eb0c635
add retry wrapper when reading files from swift 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-12-04 16:34:53 +01:00
Robin Appelman
c87d689253
delay calculating the shared cache root until it's used 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-12-04 15:16:39 +01:00
Morris Jobke
be4e921306
Use basename() instead of self implementation 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-11-23 12:35:47 +01:00
Morris Jobke
106d932e8f
Merge pull request #7137 from nextcloud/shared-jailed-source-root 
Use the correct root for shared jail when the source storage is also a jail
 2017-11-23 12:03:36 +01:00
Bjoern Schiessle
1ade6b0817
only create the file cache entry after the empty file was created successfully, otherwise file_exists() call on the initial file_put_content() will indicate that the file already exists 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2017-11-17 12:45:46 +01:00
Björn Schießle
c225bbd021
Merge pull request #7113 from nextcloud/s3-download-stream-fix 
Fix s3 download and touch
 2017-11-14 20:38:50 +01:00
Robin Appelman
56fd462718
Use the correct root for shared jail when the source storage is also a jail 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-11-10 17:03:27 +01:00
Morris Jobke
5d8421135e
Merge pull request #7014 from nextcloud/rename-locks 
Unlock files even if an exception occurs while renaming
 2017-11-09 09:47:36 +01:00
Lukas Reschke
989a8a3668
Merge pull request #6220 from nextcloud/cached-mount-info-filepath 
Allow getting the filepath when getting cached mounts by fileid
 2017-11-09 00:04:25 +01:00
Robin Appelman
c566b2854b
Use non empty files for object store touch 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-11-08 17:51:02 +01:00
Robin Appelman
70a4860ccb
Fix contructing headers for s3 download 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-11-08 17:50:46 +01:00
Morris Jobke
19069f2b9c
Merge pull request #6988 from starypatyk/stable12-mount-cache-performance 
Improve performance of UserMountCache with external storage folders
 2017-11-07 17:32:06 +01:00
Morris Jobke
4866314ce0
Run updated license header updater 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-11-07 13:47:42 +01:00
Morris Jobke
31c5c2a592
Change @georgehrke's email 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-11-06 20:38:59 +01:00
Morris Jobke
da6c2c9da1
Merge pull request #7083 from nextcloud/update-license-headers 
Update license headers
 2017-11-06 18:48:04 +01:00
Morris Jobke
0eebff152a
Update license headers 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-11-06 16:56:19 +01:00
Morris Jobke
8b763ea0f7
Better error message for invalid bucket names 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-11-06 09:48:41 +01:00
korelstar
c7482402b8 Unlock files even if an exception occurs 
Signed-off-by: Kristof Hamann <korelstar@users.noreply.github.com>
 2017-11-03 18:29:04 +01:00
Roeland Jago Douma
687c92bfd3
Merge pull request #6974 from nextcloud/fix-fseek-on-objectstorage 
Fix seeking on object storage
 2017-11-02 14:56:51 +01:00
Dariusz Olszewski
07016a1e5b Improve performance of UserMountCache with external storage folders 2017-11-01 21:11:39 +01:00
Joas Schilling
3e0789aa94
Merge pull request #6958 from nextcloud/improved-mimetype-detection-for-object-storage 
Improve mimetype detection for object storages
 2017-11-01 11:04:15 +01:00
Joas Schilling
defc4bf6a8
Merge pull request #6975 from nextcloud/s3-read-object-fopen 
use fopen directly when reading objects from s3
 2017-11-01 10:57:56 +01:00
Joas Schilling
94f3fc63bc
Use ::class and fix missing doc 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-10-28 11:49:36 +02:00
Robin Appelman
3f0cb13042
Allow getting the filepath when getting cached mounts by fileid 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-10-27 14:35:34 +02:00
Robin Appelman
f9a7294807
use fopen directly when reading objects from s3 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-10-27 12:58:19 +02:00
Morris Jobke
de912385e0
Fix seeking on object storage 
Seeking is not needed if the $from is 0, because then the pointer is already at the correct position. Additionally another fallback is added, that if the fseek fails it just uses an fread to skip the beginning of the file until it is at the correct position. This skipping is done with a chunked fread.

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-10-27 12:16:28 +02:00
Morris Jobke
405bbc1c61
Improve mimetype detection for object storages 
Object storage instances always fall back to the content based mimetype detection, because the file name for object storage was always random due to the fact that it was temporarily storage in a generated temp file. This patch adds a check before that to make sure to use the original file name for this purpose and also remove possible other extensions like the versioning or part file extension.

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-10-26 16:31:59 +02:00