GitLab

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

Local modules shall be preferred over the ones installed by ECM.
This will fix building kio-extras 20.04 with ECM >= 5.72.

this does cover more dupes and is more in line with how windows would
behave (what with it being case insensitive in general)

CCBUG: 422001

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

Summary:
D27804 broke compilation for me because I have the above flag set ;-)
It showed rather some rather nasty QString -> QByteArray conversions in this code.

Test Plan: Now it builds.

Reviewers: thiago, sitter

Reviewed By: sitter

Subscribers: meven, kde-frameworks-devel, kfm-devel

Tags: #dolphin, #frameworks

Differential Revision: https://phabricator.kde.org/D29149

(cherry picked from commit 02b56633)

this now too is based on the discovery design used for WSD and DNSSD.
advantage being that we can then de-duplicate ALL discovieries through
a single code path.

since smbc technically is meant to be used in a dirent while(){} way I am
pulling some tricks here to get this nicer balanced via the event loop.
ideally smbc would be thread safe or at least allow for multiple contexts,
but currently both scenarios aren't working due to upstream bugs :(
so instead of actually blocking while looping each loop cycle is posted
through the event loop. this gives the other discoverers a chance to
get their signal events in and not get stuck waiting for smbc to do its
thing.

specifically also dnssd/wsd are started before smbc (if applicable anyway)
so they get a head start speed things up quite a bit as previously
they had to wait for smbc to do a full listing.

the discoverer discovers a new smbcdiscovery which isn't terribly
interesting but allows for a much more readable loop logic. furthermore
the readdirplus2 ifdefs have been shuffled a bit, also with the goal
of easing readability.

aids in debugging

they won't resolve to anything and needlessly waste energy. they also
spam logs for no good reason

This allows kio_archive_log to work with kdebugsettings.
Previously the setting for the ioslave did not work and logging level
was the default: Debug.
It is now Info.

BUG: 419566
FIXED-IN: 20.08

Reviewers: vonreth, meven

Reviewed By: meven

Subscribers: sitter, meven, kde-frameworks-devel, kfm-devel

Tags: #dolphin, #frameworks

Differential Revision: https://phabricator.kde.org/D29461

the modern discoveries were conditional on smbc_opendir succeeding but
that is rather silly since smbc can fail on ENOENT if (for example)
netbios is disabled. since top level server discovery may happen through
all or none of NB/DNSSD/WSD that made no sense as even when NB fails
we may be able to produce service listing through one of the other two
discovery services.

this piece of code would actually benefit from major refactoring because
all three discovery systems should actually run at the same time while
currently NB holds up the entire show. alas, too invasive for 20.04...
so, reshuffling it is:

smbc_opendir still runs initially. after that, if the url is browsing
smb:// we'll jump into modern discovery. any errors produced by opendir
will be ignored! authentication errors and the like cannot happen for
smb:// because we aren't yet talking to any one server, which leaves
actual browsing errors which are not fatal considering we have other
options.
for non-top-level urls we'll otherwise jump into error handling (e.g.
server requires auth or something)
at the end if we haven't returned early with an error we'll inject our
`.` entries as per usual

test plan:
- add `disable netbios = yes` to smb.conf
- browse network
- discovers dnssd/wsd servers
- also works with the option removed again

BUG: 421624

FIXED-IN: 20.04.2

Summary:
sftp gives out more relevant errors such as SSH_FX_PERMISSION_DENIED,
let's forward them as KIO errors instead of using the general cannot open
error.

Test Plan: hoping for the best! bad permissions on the remote now actually raise suitable kio errors, functionally that seems to make little difference unfortunately

Reviewers: feverfew

Reviewed By: feverfew

Subscribers: kde-frameworks-devel, kfm-devel

Tags: #dolphin, #frameworks

Differential Revision: https://phabricator.kde.org/D29743

# Conflicts:
#	CMakeLists.txt

Summary:
servers have arbitrary limits that we should stay below. to ensure this
happens use MAX_XFER_BUF_SIZE as maximum size per request. if we read
data large than that, break it apart into multiple requests

(I am mostly guessing here, the rfc doesn't seem to impose any size
 constraint on the write requests themselves, so probably packet
 constraints apply by default)

BUG: 404890
FIXED-IN: 20.04.2

Test Plan:
- fallocate -l 128M file
- sftp to localhost
- copy file from one dir to another
- compare checksums match

- open xls file (via kio-fuse)
- change
- save
- close
- open again
- changes are still there

Reviewers: ngraham, meven, feverfew

Reviewed By: ngraham, meven, feverfew

Subscribers: meven, feverfew, kde-frameworks-devel, kfm-devel

Tags: #dolphin, #frameworks

Differential Revision: https://phabricator.kde.org/D29634

Summary: They are no-ops

Reviewers: dfaure

Reviewed By: dfaure

Subscribers: kossebau, kde-frameworks-devel, kfm-devel, dfaure

Tags: #dolphin, #frameworks

Differential Revision: https://phabricator.kde.org/D29577

as it turns out this is vastly more efficient for our purposes. we already
know that this address should only be a dnssd address, so we can ask our
dnssd daemon directly instead of taking on the entire weight of qhostinfo
and proper DNS resolution.
asking avahi directly reduces successful resolution time down from ~4 s
to ~4 ms (yes, ms!). on resolution failure the timing remains about
the same it seems

Summary:
filenamesearch ioslave needed a stat implementation to be rendered properly in dolphin information panel.

BUG: 420354
FIXED-IN: 20.08

Test Plan: Open filenamsearch:/ in dolphin and search something

Reviewers: #dolphin, #frameworks, ngraham, elvisangelaccio

Reviewed By: #dolphin, elvisangelaccio

Subscribers: kde-frameworks-devel, kfm-devel

Tags: #dolphin, #frameworks

Differential Revision: https://phabricator.kde.org/D29197

proftpd doesn't like zero size writes and returns with an error leading us
to assume that the write failed, when in fact it was fine eitherway because
we didn't write anything one way or the other.
so, instead just break out of the loop early. there's nothing lost by
us not doing that final EOF write since we don't need it from a protocol
POV.
the break occurs just before writing because preceding it is "spin-up" tech
opening the file and so forth. we need to have that run even when putting
a 0b file.

this successfully writes 0B, 1B, and 128M files both with partial markers
enabled and disabled to proftpd 1.3.6c

BUG: 419999
FIXED-IN: 20.04.1

in master we can break the string so it's slightly less rubbish. give it
context for the arguments. throw out the reference to stat since
this may occur from a number of calls. flatten the nested composition of
errno + strerr

otherwise it's annoyingly hard to figure out which error isn't mapped.
this is done through a nested composition so as to not disturb the
localized string in 20.04

this previously was the wrong variable. m_current_url is only set after
url checking while kurl would be the current url under check. this lead
to state confusion was implicit stat() calls from dolphin on host foo would
evaluate the previous host (e.g. bar) for the wsd suffix. this meant we'll
let a foo with suffix pass through the check, and that just mustn't ever
happen.

BUG: 420578
FIXED-IN: 20.04.1