Skip to content

prefer using dir instead of allinfo for getting smb file info - #10803

Merged
MorrisJobke merged 4 commits into
masterfrom
smb-dir-instead-of-allinfo
Aug 24, 2018
Merged

prefer using dir instead of allinfo for getting smb file info#10803
MorrisJobke merged 4 commits into
masterfrom
smb-dir-instead-of-allinfo

Conversation

@icewind1991

@icewind1991icewind1991 commented Aug 22, 2018

Copy link
Copy Markdown
Member

some windows server setups don't seem to like the allinfo command use the dir command instead to get the file info where possible.

Also includes some improvements for the timezone detection to properly handle cases where the command errors out.

@icewind1991icewind1991 added the 3. to review Waiting for reviews label Aug 22, 2018
@icewind1991icewind1991 added this to the Nextcloud 14 milestone Aug 22, 2018
}

// fallback to server timezone
$this->timeZone = date_default_timezone_get();

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This will just overwrite the stuff above...

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed 🙈

Signed-off-by: Robin Appelman <robin@icewind.nl>
Signed-off-by: Robin Appelman <robin@icewind.nl>
@icewind1991
icewind1991force-pushed the smb-dir-instead-of-allinfo branch from 4de5ded to bf7fb2bCompareAugust 23, 2018 14:14

@rullzerrullzer left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🐘

@MorrisJobke

Copy link
Copy Markdown
Member

As this is in 3rdparty: shouldn't upstream be updated first?

@MorrisJobkeMorrisJobke added 4. to release Ready to be released and/or waiting for tests to finish and removed 3. to review Waiting for reviews labels Aug 24, 2018
@MorrisJobke

Copy link
Copy Markdown
Member

Triggered CI again: https://drone.nextcloud.com/nextcloud/server/9856

@rullzer

Copy link
Copy Markdown
Member

Signed-off-by: Robin Appelman <robin@icewind.nl>
@MorrisJobke
MorrisJobke merged commit b1410df into masterAug 24, 2018
@MorrisJobke
MorrisJobke deleted the smb-dir-instead-of-allinfo branch August 24, 2018 17:30
@rullzerrullzer mentioned this pull request Aug 24, 2018
3 tasks
@MorrisJobkeMorrisJobke mentioned this pull request Aug 24, 2018
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

4. to releaseReady to be released and/or waiting for tests to finish

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants

@icewind1991@MorrisJobke@rullzer