upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-04-01 15:18:09 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 7
62614 commits 853 branches 1193 tags 6.6 GiB
Commit graph

441 commits

Author SHA1 Message Date
Vincent Petry
78c8e57896
Fix migrators according to exceptions 
Fixed syntax errors.
Removed if condition for copyToFolder since it's void now.
Change signature of setMigratorVersions to also be void.

Signed-off-by: Vincent Petry <vincent@nextcloud.com>
 2022-04-13 16:52:40 +02:00
Côme Chilliet
0fd72f4355
Adapt existing migrators to new API 
Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
 2022-04-13 16:52:40 +02:00
Côme Chilliet
dda51d49d7 Use Migrators id instead of class names 
This will help with UI and means migrators can move in namespaces
 without changing export format.

Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
 2022-04-11 13:59:27 +00:00
Christopher Ng
4750f232eb Extend trashbin migrator 
Signed-off-by: Christopher Ng <chrng8@gmail.com>
 2022-04-08 19:31:22 +00:00
Robin Appelman
90cfa31533 more concise output, code style fixes 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2022-03-30 15:44:02 +02:00
cahogan
dfe045699b Add trashbin:restore occ command 
Signed-off-by: cahogan <caitlin.hogan@swiftsolar.com>
 2022-03-30 15:44:02 +02:00
Côme Chilliet
b984cd1d83
Merge pull request #31575 from nextcloud/enh/add-trashbin-migrator 
Add trashbin migrator to export and import trashbin data
 2022-03-29 14:39:50 +02:00
Côme Chilliet
7fa8b2eef7
Add a guard to check that trashbin folder is a folder 
Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
 2022-03-24 17:31:21 +01:00
Côme Chilliet
ea23523c70
Adapt more code to migration to LoggerInterface 
Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
 2022-03-24 16:21:25 +01:00
Côme Chilliet
ecbcfca98a
Improve wording of output for trashbin migrator 
Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
 2022-03-24 11:04:09 +01:00
Côme Chilliet
53c731d8f9
Rename PATH constants to show if folder or file 
Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
 2022-03-22 09:21:18 +01:00
Côme Chilliet
865ac4b6e0
Rename $insert var to $qb 
Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
 2022-03-17 14:49:29 +01:00
Côme Chilliet
51d228932f
Add trashbin migrator to export and import trashbin data 
Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
 2022-03-17 14:45:56 +01:00
John Molakvoæ
0b01103137
Merge pull request #28438 from csware/issue-1649 2021-12-21 15:10:50 +01:00
Orzu Ionut
33c1c5c91b Show most recently deleted files first in trash can 
Signed-off-by: Orzu Ionut <orzu.ionut@gmail.com>
 2021-11-09 16:59:16 +02:00
Daniel Kesselberg
b0d1ad5777
Add configuration flag to disable the background job for files_trashbin 
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
 2021-10-11 12:30:36 +02:00
Sven Strickroth
1c736abc35 Don't die with LockedException when removing/restoring multiple files from trash 
fixes issue #16491

Signed-off-by: Sven Strickroth <email@cs-ware.de>
 2021-08-19 16:43:44 +02:00
szaimen
98102bfa78 Improve auto expiration hint 
Signed-off-by: szaimen <szaimen@e.mail.de>
Co-Authored-By: Pytal <24800714+Pytal@users.noreply.github.com>
 2021-08-08 20:41:38 +02:00
Robin Appelman
e198dc1b20
rework search api to allow searching on multiple caches at once 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2021-06-14 16:11:22 +02:00
John Molakvoæ (skjnldsv)
215aef3cbd
Update php licenses 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2021-06-04 22:02:41 +02:00
Christoph Wurst
8196420063
Drop \OCP\User 
Inlines and remaining usages and drops the deprecated public API.

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2021-05-21 15:00:34 +02:00
Julius Härtl
bcf38692ae
Use parent wrapper to properly handle moves on the same source/target storage 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2021-05-14 09:41:01 +02:00
Christoph Wurst
99f2fa73d1
Fix usage of rename executeUpdate 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2021-05-05 10:35:25 +02:00
Roeland Jago Douma
8008b33b8d Cleanp execute usage in the trashbin 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2021-03-11 15:39:42 +01:00
Julius Härtl
930b40bd8a
Remove trash items from other trash backends when deleting all 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2021-03-03 14:26:35 +01:00
Robin Appelman
a2ecac7197
Merge pull request #25568 from nextcloud/move-storage-disable-cache 
disable trasbin during the moveFromStorage fallback
 2021-03-02 13:23:58 +00:00
dependabot-preview[bot]
eb502c02ff
Bump nextcloud/coding-standard from 0.3.0 to 0.5.0 
Bumps [nextcloud/coding-standard](https://github.com/nextcloud/coding-standard) from 0.3.0 to 0.5.0.
- [Release notes](https://github.com/nextcloud/coding-standard/releases)
- [Changelog](https://github.com/nextcloud/coding-standard/blob/master/CHANGELOG.md)
- [Commits](https://github.com/nextcloud/coding-standard/compare/v0.3.0...v0.5.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2021-02-18 13:31:24 +01:00
Robin Appelman
b5db4502d0
disable trasbin during the moveFromStorage fallback 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2021-02-17 16:08:57 +01:00
Roeland Jago Douma
a0988281ee Do not obtain userFolder of a federated user 
Federated shares are somewhat special. So we can't move the files from
the main user and we should try to get it from the intialized root
already.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2021-01-22 13:52:43 +01:00
Christoph Wurst
c1d4f8161b
Migrate internal classes to the OCP db col types 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2021-01-12 14:09:13 +01:00
Christoph Wurst
9ce3ea3368
Update license headers 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2020-12-30 14:07:05 +01:00
Vincent Petry
bdbec28a8f
Make oc_files_trash.auto_id a bigint 
Adjusted migration.
Added to occ command to update existing tables.

Signed-off-by: Vincent Petry <vincent@nextcloud.com>
 2020-12-23 17:50:50 +01:00
Christoph Wurst
d89a75be0b
Update all license headers for Nextcloud 21 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2020-12-16 18:48:22 +01:00
Morris Jobke
bf23555b8b
Merge pull request #24094 from nextcloud/bugfix/noid/trash-appdata 
Only attempt to move to trash if a file is not in appdata
 2020-11-19 22:29:23 +01:00
Julius Härtl
f4b036f249
Only attempt to move to trash if a file is not in appdata 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2020-11-13 08:30:35 +01:00
Joas Schilling
8027dcbc6f
Don't leave cursors open when tests fail 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2020-11-09 12:28:17 +01:00
Joas Schilling
e52925c5fb
Use query builder instead of OC_DB in trashbin 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2020-11-06 22:33:59 +01:00
Julius Härtl
2616a784c9
Restrict query when searching for versions of trashbin files 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2020-10-14 16:38:30 +02:00
Christoph Wurst
d9015a8c94
Format code to a single space around binary operators 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2020-10-05 20:25:24 +02:00
Robin Appelman
e0d688c365
dont hold a transaction during the move to trash 
because moving to trash can take a long time, keeping a transaction active for the duration can lead to issues

Signed-off-by: Robin Appelman <robin@icewind.nl>
 2020-09-30 14:30:54 +02:00
Julius Härtl
3c47aaa2b1
Delete files that exceed trashbin size immediately 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2020-09-23 16:58:18 +02:00
Morris Jobke
930c97a0ef
Fix variable name and add spaces around path in info log line 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2020-09-17 08:58:10 +02:00
Christoph Wurst
1f7f93a695
Update license headers for Nextcloud 20 (again) 
There are still lots of outdated headers, so time for another round of
updates.

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2020-09-07 14:37:44 +02:00
Daniel Kesselberg
2513b64602
Change free space calculation 
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
 2020-08-31 23:11:10 +02:00
Christoph Wurst
2a054e6c04
Update the license headers for Nextcloud 20 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2020-08-24 14:54:25 +02:00
blizzz
a3d30bf4a2
Merge pull request #21954 from nextcloud/techdebt/noid/bootstrap-files_trashbin 
Use IBootstrap for the files_trashbin app
 2020-08-07 11:12:09 +00:00
Robin Appelman
c2c9a6a0e1
fix object store trashbin handling 
object stores are "special" given how they interact with the cache on their own

Signed-off-by: Robin Appelman <robin@icewind.nl>
 2020-07-30 16:31:56 +02:00
Morris Jobke
e84504c4d6
Use IBootstrap for the files_trashbin app 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2020-07-23 22:03:14 +02:00
Robin Appelman
fcad692b4a
rollback cache rename if trashbin move fails 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2020-07-23 15:24:48 +02:00
Robin Appelman
5949849322
fix moving files from external storage to object store trashbin 
having the "cache rename" after the "storage move" caused the target
to get the fileid from the source file, without taking care that the object
is stored under the original file id.

By doing the "cache rename" first, we trigger the "update existing file"
logic while moving the file to the object store and the object gets stored for the
correct file id

Signed-off-by: Robin Appelman <robin@icewind.nl>
 2020-07-23 15:24:44 +02:00