Uh oh!
There was an error while loading. Please reload this page.
Fix timestamp detection on external FTP - #33203
Closed
solracsf wants to merge 1 commit into
Closed
Conversation
kesselb
commented
Jul 11, 2022
Contributor
Hi, can you provide some details? ;) |
guijusto
commented
Jul 12, 2022
I can rollback to the original FTP.php and provide some additional logs if you need it. The solution worked great after the modification on the line 358. The error was something like “Call to a member function getTimestamp() on bool”. |
kesselb
commented
Jul 12, 2022
Contributor
Hey @guijusto 👋 Thanks. I think it's good to know what kind of date is the problem here. Index: apps/files_external/lib/Lib/Storage/FTP.php
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================diff --git a/apps/files_external/lib/Lib/Storage/FTP.php b/apps/files_external/lib/Lib/Storage/FTP.php--- a/apps/files_external/lib/Lib/Storage/FTP.php (revision c20d34b2caf6ef030ef52e87311ac96d3fa46931)+++ b/apps/files_external/lib/Lib/Storage/FTP.php (date 1657660464136)@@ -355,8 +355,13 @@
$data = [];
$data['mimetype'] = $isDir ? FileInfo::MIMETYPE_FOLDER : $mimeTypeDetector->detectPath($name);
- $data['mtime'] = \DateTime::createFromFormat('YmdGis', $file['modify'])->getTimestamp();- if ($data['mtime'] === false) {+ $modifyDate = \DateTime::createFromFormat('YmdGis', $file['modify']);+ if ($modifyDate instanceof \DateTime) {+ $data['mtime'] = $modifyDate->getTimestamp();+ } else {+ /** @var \Psr\Log\LoggerInterface $logger */+ $logger = \OC::$server->get(\Psr\Log\LoggerInterface::class);+ $logger->warning('Invalid date. File: ' . $name . ', Date: ' . $file['modify']);
$data['mtime'] = time();
}
if ($isDir) {
Can you patch your system. It should then log the actual file and modify date. |
guijusto
commented
Jul 13, 2022
I'm sorry @kesselb. I was unable to reproduce the error again. I tried your patch, but there was no errors/logs. Then I tried to use the original FTP.php and got no errors too. |
kesselb
commented
Jul 13, 2022
Contributor
Thanks for trying @guijusto 👍 Index: apps/files_external/lib/Lib/Storage/FTP.php
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================diff --git a/apps/files_external/lib/Lib/Storage/FTP.php b/apps/files_external/lib/Lib/Storage/FTP.php--- a/apps/files_external/lib/Lib/Storage/FTP.php (revision c20d34b2caf6ef030ef52e87311ac96d3fa46931)+++ b/apps/files_external/lib/Lib/Storage/FTP.php (date 1657699113172)@@ -355,9 +355,11 @@
$data = [];
$data['mimetype'] = $isDir ? FileInfo::MIMETYPE_FOLDER : $mimeTypeDetector->detectPath($name);
- $data['mtime'] = \DateTime::createFromFormat('YmdGis', $file['modify'])->getTimestamp();- if ($data['mtime'] === false) {- $data['mtime'] = time();+ $modifyDate = \DateTime::createFromFormat('YmdGis', $file['modify']);+ if ($modifyDate === false) {+ $date['mtime'] = time();+ } else {+ $data['mtime'] = $modifyDate->getTimestamp();
}
if ($isDir) {
$data['size'] = -1; //unknown@solracsf would you mind to update your pr like above? Fallback code to handle an invalid date is already here but does not work. strtotime also returns false and the typecast would change it to 0 then. |
solracsf
commented
Jul 15, 2022
MemberAuthor
Done. |
Uh oh!
There was an error while loading. Please reload this page.
kesselb
reviewed
Jul 15, 2022
Uh oh!
There was an error while loading. Please reload this page.
kesselb
approved these changes
Jul 15, 2022
kesselb
requested review from
a team, ArtificialOwl, CarlSchwan and icewind1991
and removed request for
a teamJuly 15, 2022 11:30
solracsf
commented
Jul 17, 2022
MemberAuthor
/backport to stable24 |
solracsf
commented
Jul 17, 2022
MemberAuthor
/backport to stable23 |
solracsf
commented
Jul 17, 2022
MemberAuthor
/backport to stable22 |
icewind1991
commented
Jul 20, 2022
Member
Do we know what the reported time is that failed to parse? |
Merged
szaimen
commented
Nov 13, 2022
Contributor
However seems like some tests fail @kesselb ? |
kesselbforce-pushed
the
fix-ftp-timestamp
branch
from
November 13, 2022 20:48
f1c7e1b to
b83b33dComparekesselb
commented
Nov 13, 2022
Contributor
No idea about the S3 related failure 🤷♂️ |
kesselbforce-pushed
the
fix-ftp-timestamp
branch
from
November 14, 2022 19:51
b83b33d to
127283cCompareguijusto
commented
Nov 22, 2022
Hello @kesselb I hope this helps. |
kesselbforce-pushed
the
fix-ftp-timestamp
branch
from
November 23, 2022 18:41
127283c to
34aa816Comparekesselb
commented
Nov 23, 2022
Contributor
Hi @guijusto, thank you very much 👍
@icewind1991 20220804233459.925 |
kesselb
commented
Nov 23, 2022
Contributor
I guess .925 is the fraction in milliseconds. It should be possible to add some checks for fraction in milliseconds / fraction in microseconds to avoid this warning.
Note the additional |
kesselbforce-pushed
the
fix-ftp-timestamp
branch
from
November 23, 2022 19:50
4bd3b77 to
dc9f850Comparekesselbforce-pushed
the
fix-ftp-timestamp
branch
2 times, most recently
from
December 21, 2022 22:03
da4d799 to
72de893Comparekesselb
commented
Dec 21, 2022
Contributor
Hey @guijusto, I just updated the patch. Can you give it a try? Thanks 👍 |
Uh oh!
There was an error while loading. Please reload this page.
Context: #31510 Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
kesselbforce-pushed
the
fix-ftp-timestamp
branch
from
December 22, 2022 19:35
72de893 to
0f9d58dCompare
Hello @kesselb It is FileZilla Server 1.5.1 |
guijusto
commented
Dec 22, 2022
Now it is working as expected. Thanks a lot for working on this @kesselb |
Merged
Merged
Merged
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment
8 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Context: #31510
Fix#31510