Refactor files trashbin app #39883

danialRahimy · 2023-08-15T12:20:21Z

Summary

I did these items in a single file apps/files_trashbin/lib/Trashbin.php for two reasons:

Pull request hasn't been a lot of changes.
I was not sure about some changes.

Return early
Change the const name for more readability
Add functions' return type
Update doc types

Checklist

Code is properly formatted
Sign-off message is added to all commits
Tests (unit, integration, api and/or acceptance) are included
Screenshots before/after for front-end changes
Documentation (manuals or wiki) has been updated or is not required
Backports requested where applicable (ex: critical bugfixes)

apps/files_trashbin/lib/Trashbin.php

+			if ($owner !== $user) {
+				self::copy_recursive($owner . '/files_versions/' . $ownerPath, $owner . '/files_trashbin/versions/' . static::getTrashFilename(basename($ownerPath), $timestamp), $rootView);
+			}
+			self::move($rootView, $owner . '/files_versions/' . $ownerPath, $user . '/files_trashbin/versions/' . static::getTrashFilename($filename, $timestamp));


apps/files_trashbin/lib/Trashbin.php

 				}
+				self::move($rootView, $owner . '/files_versions' . $v['path'] . '.v' . $v['version'], $user . '/files_trashbin/versions/' . static::getTrashFilename($filename . '.v' . $v['version'], $timestamp));


apps/files_trashbin/lib/Trashbin.php

+		}
+
+		if ($view->is_dir('/files_trashbin/versions/' . $file)) {
+			$rootView->rename(Filesystem::normalizePath($user . '/files_trashbin/versions/' . $file), Filesystem::normalizePath($owner . '/files_versions/' . $ownerPath));


apps/files_trashbin/lib/Trashbin.php

+
+		if ($view->is_dir('/files_trashbin/versions/' . $file)) {
+			$rootView->rename(Filesystem::normalizePath($user . '/files_trashbin/versions/' . $file), Filesystem::normalizePath($owner . '/files_versions/' . $ownerPath));
+		} elseif ($versions = self::getVersionsFromTrash($versionedFile, $timestamp, $user)) {


apps/files_trashbin/lib/Trashbin.php

+		} elseif ($versions = self::getVersionsFromTrash($versionedFile, $timestamp, $user)) {
+			foreach ($versions as $v) {
+				if ($timestamp) {
+					$rootView->rename($user . '/files_trashbin/versions/' . static::getTrashFilename($versionedFile . '.v' . $v, $timestamp), $owner . '/files_versions/' . $ownerPath . '.v' . $v);


apps/files_trashbin/lib/Trashbin.php

+				if ($timestamp) {
+					$rootView->rename($user . '/files_trashbin/versions/' . static::getTrashFilename($versionedFile . '.v' . $v, $timestamp), $owner . '/files_versions/' . $ownerPath . '.v' . $v);
+				} else {
+					$rootView->rename($user . '/files_trashbin/versions/' . $versionedFile . '.v' . $v, $owner . '/files_versions/' . $ownerPath . '.v' . $v);


apps/files_trashbin/lib/Trashbin.php

+		if ($view->is_dir('files_trashbin/versions/' . $file)) {
+			$size += self::calculateSize(new View('/' . $user . '/files_trashbin/versions/' . $file));
+			$view->unlink('files_trashbin/versions/' . $file);
+		} elseif ($versions = self::getVersionsFromTrash($filename, $timestamp, $user)) {


apps/files_trashbin/lib/Trashbin.php

Signed-off-by: Danial Rahimi <48244647+danialRahimy@users.noreply.github.com>

…e psalm analysis Signed-off-by: Danial Rahimi <48244647+danialRahimy@users.noreply.github.com>

apps/files_trashbin/lib/Trashbin.php

…ption on doctype Signed-off-by: Danial Rahimi <48244647+danialRahimy@users.noreply.github.com>

apps/files_trashbin/lib/Trashbin.php

nfebe · 2023-08-19T10:51:19Z

apps/files_trashbin/lib/Trashbin.php

 	 */
-	public static function getLocation($user, $filename, $timestamp) {
+	public static function getLocation($user, $filename, $timestamp): bool|string {


Suggested change

public static function getLocation($user, $filename, $timestamp): bool|string {

public static function getLocation(string $user, string $filename, string $timestamp): bool|string {

apps/files_trashbin/lib/Trashbin.php

nfebe

Since this is just a refactor and no main functional change you can just use build in type hinting for PHP... I left a few examples but not all, most of the functions can use built in type hinting and that would allow you to delete the comment annotations at the top (leaving behind just the exceptions)

Co-authored-by: F. E Noel Nfebe <fenn25.fn@gmail.com> Signed-off-by: danial rahimy <48244647+danialRahimy@users.noreply.github.com>

danialRahimy force-pushed the app_files_trashbin_refactor branch 2 times, most recently from 9d23571 to 24de858 Compare August 15, 2023 12:35

github-advanced-security bot found potential problems Aug 15, 2023

View reviewed changes

szaimen added 3. to review Waiting for reviews technical debt labels Aug 15, 2023

szaimen added this to the Nextcloud 28 milestone Aug 15, 2023

szaimen requested review from a team, icewind1991, blizzz and nfebe and removed request for a team August 15, 2023 12:40

danialRahimy added 7 commits August 16, 2023 08:54

Files trashbin app: Return early in method retainVersions

558c146

Signed-off-by: Danial Rahimi <48244647+danialRahimy@users.noreply.github.com>

Files trashbin app: Change the const name for more readability

81c4780

Signed-off-by: Danial Rahimi <48244647+danialRahimy@users.noreply.github.com>

Files trashbin app: Adding functions' return type

2c298c0

Signed-off-by: Danial Rahimi <48244647+danialRahimy@users.noreply.github.com>

Files trashbin app: Return early

36338e8

Signed-off-by: Danial Rahimi <48244647+danialRahimy@users.noreply.github.com>

Files trashbin app: Remove extra spaces between methods

dfceb76

Signed-off-by: Danial Rahimi <48244647+danialRahimy@users.noreply.github.com>

Files trashbin app: Update doc types

a531255

Signed-off-by: Danial Rahimi <48244647+danialRahimy@users.noreply.github.com>

Files trashbin app: Add remaining return type.

82dd6fa

Signed-off-by: Danial Rahimi <48244647+danialRahimy@users.noreply.github.com>

danialRahimy force-pushed the app_files_trashbin_refactor branch from 24de858 to 82dd6fa Compare August 16, 2023 05:24

Files trashbin app: Add parameter type to the methods according to th…

8bd6a2f

…e psalm analysis Signed-off-by: Danial Rahimi <48244647+danialRahimy@users.noreply.github.com>

nickvergessen reviewed Aug 16, 2023

View reviewed changes

apps/files_trashbin/lib/Trashbin.php Outdated Show resolved Hide resolved

Files trashbin app: Remove unrelated throw tag for clarification exce…

dcfcce8

…ption on doctype Signed-off-by: Danial Rahimi <48244647+danialRahimy@users.noreply.github.com>

nfebe reviewed Aug 19, 2023

View reviewed changes

apps/files_trashbin/lib/Trashbin.php Outdated Show resolved Hide resolved

nfebe reviewed Aug 19, 2023

View reviewed changes

apps/files_trashbin/lib/Trashbin.php Outdated Show resolved Hide resolved

nfebe reviewed Aug 19, 2023

View reviewed changes

apps/files_trashbin/lib/Trashbin.php Outdated Show resolved Hide resolved

nfebe reviewed Aug 19, 2023

View reviewed changes

apps/files_trashbin/lib/Trashbin.php Outdated Show resolved Hide resolved

nfebe reviewed Aug 19, 2023

View reviewed changes

apps/files_trashbin/lib/Trashbin.php Outdated Show resolved Hide resolved

nfebe requested changes Aug 19, 2023

View reviewed changes

Update apps/files_trashbin/lib/Trashbin.php

e1fa130

Co-authored-by: F. E Noel Nfebe <fenn25.fn@gmail.com> Signed-off-by: danial rahimy <48244647+danialRahimy@users.noreply.github.com>

danialRahimy and others added 4 commits August 20, 2023 14:17

Update apps/files_trashbin/lib/Trashbin.php

b55f595

Co-authored-by: F. E Noel Nfebe <fenn25.fn@gmail.com> Signed-off-by: danial rahimy <48244647+danialRahimy@users.noreply.github.com>

Update apps/files_trashbin/lib/Trashbin.php

863dd39

Co-authored-by: F. E Noel Nfebe <fenn25.fn@gmail.com> Signed-off-by: danial rahimy <48244647+danialRahimy@users.noreply.github.com>

Update apps/files_trashbin/lib/Trashbin.php

a766334

Co-authored-by: F. E Noel Nfebe <fenn25.fn@gmail.com> Signed-off-by: danial rahimy <48244647+danialRahimy@users.noreply.github.com>

Update apps/files_trashbin/lib/Trashbin.php

2186f0d

Co-authored-by: F. E Noel Nfebe <fenn25.fn@gmail.com> Signed-off-by: danial rahimy <48244647+danialRahimy@users.noreply.github.com>

skjnldsv mentioned this pull request Nov 1, 2023

chore: 28.0.0 beta 1 #41228

Merged

This was referenced Nov 6, 2023

28.0.0 beta 2 #41314

Merged

28.0.0 beta 3 #41379

Merged

This was referenced Nov 14, 2023

28.0.0 beta 4 #41477

Merged

28.0.0 RC1 #41621

Merged

blizzz modified the milestones: Nextcloud 28, Nextcloud 29 Nov 23, 2023

This was referenced Mar 12, 2024

29.0.0 beta 2 #44152

Merged

29.0.0 beta 3 #44186

Merged

29.0.0 beta 4 #44275

Merged

This was referenced Mar 20, 2024

29.0.0 beta 5 #44361

Merged

29.0.0 beta 6 #44449

Merged

skjnldsv mentioned this pull request Mar 28, 2024

29.0.0 RC1 #44552

Merged

81 tasks

skjnldsv modified the milestones: Nextcloud 29, Nextcloud 30 Mar 28, 2024

skjnldsv added 2. developing Work in progress stale Ticket or PR with no recent activity and removed 3. to review Waiting for reviews labels Jul 27, 2024

This was referenced Jul 30, 2024

30.0.0 beta 2 #46870

Merged

30.0.0 beta 3 #46946

Merged

skjnldsv closed this Aug 3, 2024

skjnldsv removed this from the Nextcloud 30 milestone Aug 14, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Refactor files trashbin app #39883

Refactor files trashbin app #39883

danialRahimy commented Aug 15, 2023 •

edited

Loading

nfebe Aug 19, 2023

nfebe left a comment

		}
		self::move($rootView, $owner . '/files_versions' . $v['path'] . '.v' . $v['version'], $user . '/files_trashbin/versions/' . static::getTrashFilename($filename . '.v' . $v['version'], $timestamp));

	public static function getLocation($user, $filename, $timestamp): bool\|string {
	public static function getLocation(string $user, string $filename, string $timestamp): bool\|string {

Refactor files trashbin app #39883

Refactor files trashbin app #39883

Conversation

danialRahimy commented Aug 15, 2023 • edited Loading

Summary

Checklist

nfebe Aug 19, 2023

Choose a reason for hiding this comment

nfebe left a comment

Choose a reason for hiding this comment

danialRahimy commented Aug 15, 2023 •

edited

Loading