Katana_mirror/kdelibs
1
0
Fork 0
mirror of https://bitbucket.org/smil3y/kdelibs.git synced 2025-02-24 02:42:48 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

kdecore: never output file:// for local files

Browse source 
there is a fix for that legacy thing

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
This commit is contained in:
Ivailo Monev 2023-06-25 18:15:06 +03:00
parent cb8a624390
commit 40da298881
4 changed files with 41 additions and 46 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
kdecore/io/kurl.cpp
View file

@ -33,7 +33,6 @@
#include <QHostInfo> #include <QHostInfo>
static const char s_kdeUriListMime[] = "application/x-kde4-urilist"; static const char s_kdeUriListMime[] = "application/x-kde4-urilist";
static const char s_kurlLocalFileDelimiter = 'l';
// FIXME: using local files to pass around queries and fragments is totally bonkers, this will make // FIXME: using local files to pass around queries and fragments is totally bonkers, this will make
// sure they are not a thing // sure they are not a thing
@ -43,7 +42,7 @@ static const int kurlDebugArea = 181; // see kdebug.areas
void kCheckLocalFile(const KUrl *kurl) void kCheckLocalFile(const KUrl *kurl)
{ {
if (kurl->isLocalFile() && kurl->queryPairDelimiter() == s_kurlLocalFileDelimiter) { if (kurl->isLocalFile()) {
if (kurl->hasQuery() || kurl->hasFragment()) { if (kurl->hasQuery() || kurl->hasFragment()) {
kFatal(kurlDebugArea) << "Query or fragment detected in" << kurl->prettyUrl(); kFatal(kurlDebugArea) << "Query or fragment detected in" << kurl->prettyUrl();
} }
@ -355,7 +354,6 @@ KUrl::KUrl(const QString &str)
if (!str.isEmpty()) { if (!str.isEmpty()) {
if (str[0] == QLatin1Char('/') || str[0] == QLatin1Char('~')) { if (str[0] == QLatin1Char('/') || str[0] == QLatin1Char('~')) {
setPath(str); setPath(str);
setQueryDelimiters('=', s_kurlLocalFileDelimiter);
} else { } else {
setUrl(str, QUrl::TolerantMode); setUrl(str, QUrl::TolerantMode);
} }
@ -368,7 +366,6 @@ KUrl::KUrl(const char *str)
if (str && str[0]) { if (str && str[0]) {
if (str[0] == '/' || str[0] == '~') { if (str[0] == '/' || str[0] == '~') {
setPath(QString::fromUtf8(str)); setPath(QString::fromUtf8(str));
setQueryDelimiters('=', s_kurlLocalFileDelimiter);
} else { } else {
setUrl(QUrl::fromPercentEncoding(str), QUrl::TolerantMode); setUrl(QUrl::fromPercentEncoding(str), QUrl::TolerantMode);
} }
@ -381,7 +378,6 @@ KUrl::KUrl(const QByteArray &str)
if (!str.isEmpty()) { if (!str.isEmpty()) {
if (str[0] == '/' || str[0] == '~') { if (str[0] == '/' || str[0] == '~') {
setPath(QString::fromUtf8(str.constData(), str.size())); setPath(QString::fromUtf8(str.constData(), str.size()));
setQueryDelimiters('=', s_kurlLocalFileDelimiter);
} else { } else {
setUrl(QUrl::fromPercentEncoding(str), QUrl::TolerantMode); setUrl(QUrl::fromPercentEncoding(str), QUrl::TolerantMode);
} }
@ -445,7 +441,7 @@ bool KUrl::equals(const KUrl &u, const EqualsOptions &options) const
return false; return false;
} }
return (scheme() == u.scheme() && return ((scheme() == u.scheme() || isLocalFile() && u.isLocalFile()) &&
authority() == u.authority() && // user+pass+host+port authority() == u.authority() && // user+pass+host+port
query() == u.query() && fragment() == u.fragment()); query() == u.query() && fragment() == u.fragment());
} }
@ -540,7 +536,7 @@ QString KUrl::url(AdjustPathOption trailing) const
} }
const bool islocalfile = isLocalFile(); const bool islocalfile = isLocalFile();
const QString urlpath = path(trailing); const QString urlpath = path(trailing);
if (islocalfile && queryPairDelimiter() == s_kurlLocalFileDelimiter) { if (islocalfile) {
#ifdef KURL_COMPAT_CHECK #ifdef KURL_COMPAT_CHECK
kCheckLocalFile(this); kCheckLocalFile(this);
#endif #endif
@ -555,9 +551,6 @@ QString KUrl::url(AdjustPathOption trailing) const
} }
return result; return result;
} }
if (islocalfile && (urlpath.isEmpty() || urlpath == QLatin1String("/"))) {
return QString::fromLatin1("file:///");
}
if (trailing == AddTrailingSlash) { if (trailing == AddTrailingSlash) {
return QUrl::toString(QUrl::AddTrailingSlash); return QUrl::toString(QUrl::AddTrailingSlash);
} else if (trailing == RemoveTrailingSlash) { } else if (trailing == RemoveTrailingSlash) {
@ -788,14 +781,22 @@ QString KUrl::relativeUrl(const KUrl &base_url, const KUrl &url)
void KUrl::setPath(const QString &_path) void KUrl::setPath(const QString &_path)
{ {
QString path = KShell::tildeExpand(_path); QString newPath = KShell::tildeExpand(_path);
if (path.isEmpty()) { if (newPath.isEmpty()) {
path = _path; newPath = _path;
}
if (newPath.startsWith(QLatin1String("file://"))) {
newPath.chop(7);
}
if (scheme().isEmpty()) {
if (newPath.isEmpty()) {
// Empty scheme and path - that's null/empty local file URL regardless of query and fragment
QUrl::clear();
return;
} }
if (scheme().isEmpty() && !path.startsWith(QLatin1String("file:/"))) {
setScheme(QLatin1String("file")); setScheme(QLatin1String("file"));
} }
QUrl::setPath(path); QUrl::setPath(newPath);
} }
void KUrl::populateMimeData(QMimeData *mimeData, const MetaDataMap &metaData, MimeDataFlags flags) const void KUrl::populateMimeData(QMimeData *mimeData, const MetaDataMap &metaData, MimeDataFlags flags) const

4
kdecore/tests/kurlmimetest.cpp
View file

@ -57,7 +57,7 @@ void KUrlMimeTest::testURLList()
const QList<QUrl> qurls = mimeData->urls(); const QList<QUrl> qurls = mimeData->urls();
QCOMPARE(qurls.count(), urls.count()); QCOMPARE(qurls.count(), urls.count());
for (int i = 0; i < qurls.count(); ++i ) for (int i = 0; i < qurls.count(); ++i )
QCOMPARE(qurls[i], static_cast<QUrl>(decodedURLs[i])); QCOMPARE(qurls[i].toString(), decodedURLs[i].url());
QVERIFY( !decodedMetaData.isEmpty() ); QVERIFY( !decodedMetaData.isEmpty() );
QCOMPARE( decodedMetaData["key"], QString( "value" ) ); QCOMPARE( decodedMetaData["key"], QString( "value" ) );
@ -133,6 +133,6 @@ void KUrlMimeTest::testMostLocalUrlList()
const QList<QUrl> qurls = mimeData->urls(); const QList<QUrl> qurls = mimeData->urls();
QCOMPARE(qurls.count(), localUrls.count()); QCOMPARE(qurls.count(), localUrls.count());
for (int i = 0; i < qurls.count(); ++i ) for (int i = 0; i < qurls.count(); ++i )
QCOMPARE(qurls[i], static_cast<QUrl>(localUrls[i])); QCOMPARE(qurls[i].toString(), localUrls[i].url());
delete mimeData; delete mimeData;
} }

48
kdecore/tests/kurltest.cpp
View file

@ -59,14 +59,8 @@ void KUrlTest::testHash()
testurl.setQuery(url.query()); testurl.setQuery(url.query());
testurl.setFragment(url.fragment()); testurl.setFragment(url.fragment());
// qDebug() << Q_FUNC_INFO << url << testurl; // qDebug() << Q_FUNC_INFO << url << testurl;
if (testurl.path().isEmpty() || testurl.url().contains(QLatin1String("kde//"))) {
QEXPECT_FAIL("", "The legacy of KUrl::setPath()", Continue);
}
QCOMPARE(url.url(), testurl.url()); QCOMPARE(url.url(), testurl.url());
// qDebug() << qHash(url) << qHash(testurl); // qDebug() << qHash(url) << qHash(testurl);
if (testurl.path().isEmpty() || testurl.url().contains(QLatin1String("kde//"))) {
QEXPECT_FAIL("", "The legacy of KUrl::setPath()", Continue);
}
QCOMPARE(qHash(url), qHash(testurl)); QCOMPARE(qHash(url), qHash(testurl));
} }
@ -228,19 +222,19 @@ void KUrlTest::testUrl_data()
QTest::newRow("local file 1") QTest::newRow("local file 1")
<< KUrl("file:///") << KUrl("file:///")
<< QString::fromLatin1("file:///") << QString::fromLatin1("/")
<< QString::fromLatin1("file:///") << QString::fromLatin1("/")
<< QString::fromLatin1("file:///"); << QString::fromLatin1("/");
QTest::newRow("local file 2") QTest::newRow("local file 2")
<< KUrl("file:///home/kde/") << KUrl("file:///home/kde/")
<< QString::fromLatin1("file:///home/kde/") << QString::fromLatin1("/home/kde/")
<< QString::fromLatin1("file:///home/kde") << QString::fromLatin1("/home/kde")
<< QString::fromLatin1("file:///home/kde/"); << QString::fromLatin1("/home/kde/");
QTest::newRow("local file 3") QTest::newRow("local file 3")
<< KUrl("file:///home/kde//") << KUrl("file:///home/kde//")
<< QString::fromLatin1("file:///home/kde//") << QString::fromLatin1("/home/kde//")
<< QString::fromLatin1("file:///home/kde") << QString::fromLatin1("/home/kde")
<< QString::fromLatin1("file:///home/kde//"); << QString::fromLatin1("/home/kde//");
QTest::newRow("ftp url") QTest::newRow("ftp url")
<< KUrl("ftp://ftp.kde.org/") << KUrl("ftp://ftp.kde.org/")
@ -275,35 +269,35 @@ void KUrlTest::testToStringList()
<< KUrl("ftp://ftp.kde.org/") << KUrl("ftp://ftp.kde.org/")
<< KUrl("ftp://ftp.kde.org///"); << KUrl("ftp://ftp.kde.org///");
//kDebug() << urls.toStringList(KUrl::LeaveTrailingSlash); // kDebug() << urls.toStringList(KUrl::LeaveTrailingSlash);
QCOMPARE( QCOMPARE(
urls.toStringList(KUrl::LeaveTrailingSlash), urls.toStringList(KUrl::LeaveTrailingSlash),
QStringList() QStringList()
<< QLatin1String("file:///") << QLatin1String("/")
<< QLatin1String("file:///home/kde/") << QLatin1String("/home/kde/")
<< QLatin1String("file:///home/kde//") << QLatin1String("/home/kde//")
<< QLatin1String("ftp://ftp.kde.org/") << QLatin1String("ftp://ftp.kde.org/")
<< QLatin1String("ftp://ftp.kde.org///") << QLatin1String("ftp://ftp.kde.org///")
); );
//kDebug() << urls.toStringList(KUrl::RemoveTrailingSlash); // kDebug() << urls.toStringList(KUrl::RemoveTrailingSlash);
QCOMPARE( QCOMPARE(
urls.toStringList(KUrl::RemoveTrailingSlash), urls.toStringList(KUrl::RemoveTrailingSlash),
QStringList() QStringList()
<< QLatin1String("file:///") << QLatin1String("/")
<< QLatin1String("file:///home/kde") << QLatin1String("/home/kde")
<< QLatin1String("file:///home/kde") << QLatin1String("/home/kde")
<< QLatin1String("ftp://ftp.kde.org") << QLatin1String("ftp://ftp.kde.org")
<< QLatin1String("ftp://ftp.kde.org") << QLatin1String("ftp://ftp.kde.org")
); );
//kDebug() << urls.toStringList(KUrl::AddTrailingSlash); // kDebug() << urls.toStringList(KUrl::AddTrailingSlash);
QCOMPARE( QCOMPARE(
urls.toStringList(KUrl::AddTrailingSlash), urls.toStringList(KUrl::AddTrailingSlash),
QStringList() QStringList()
<< QLatin1String("file:///") << QLatin1String("/")
<< QLatin1String("file:///home/kde/") << QLatin1String("/home/kde/")
<< QLatin1String("file:///home/kde//") << QLatin1String("/home/kde//")
<< QLatin1String("ftp://ftp.kde.org/") << QLatin1String("ftp://ftp.kde.org/")
<< QLatin1String("ftp://ftp.kde.org///") << QLatin1String("ftp://ftp.kde.org///")
); );

4
kio/tests/krununittest.cpp
View file

@ -183,9 +183,9 @@ void KRunUnitTest::testProcessDesktopExecNoFile_data()
QTest::newRow("%F l0") << "klauncher4 %F" << l0 << false << klauncher; QTest::newRow("%F l0") << "klauncher4 %F" << l0 << false << klauncher;
QTest::newRow("%F l1") << "klauncher4 %F" << l1 << false << QString(klauncher + " /tmp"); QTest::newRow("%F l1") << "klauncher4 %F" << l1 << false << QString(klauncher + " /tmp");
QTest::newRow("%F l2") << "klauncher4 %F" << l2 << false << QString(kioexec + " 'klauncher4 %F' http://localhost/foo"); QTest::newRow("%F l2") << "klauncher4 %F" << l2 << false << QString(kioexec + " 'klauncher4 %F' http://localhost/foo");
QTest::newRow("%F l3") << "klauncher4 %F" << l3 << false << QString(kioexec + " 'klauncher4 %F' file:///local/file http://remotehost.org/bar"); QTest::newRow("%F l3") << "klauncher4 %F" << l3 << false << QString(kioexec + " 'klauncher4 %F' /local/file http://remotehost.org/bar");
QTest::newRow("%F l1 tempfile") << "klauncher4 %F" << l1 << true << QString(kioexec + " --tempfiles 'klauncher4 %F' file:///tmp"); QTest::newRow("%F l1 tempfile") << "klauncher4 %F" << l1 << true << QString(kioexec + " --tempfiles 'klauncher4 %F' /tmp");
QTest::newRow("sh -c klauncher4 %F") << "sh -c \"klauncher4 \"'\\\"'\"%F\"'\\\"'" QTest::newRow("sh -c klauncher4 %F") << "sh -c \"klauncher4 \"'\\\"'\"%F\"'\\\"'"
<< l1 << false << QString(m_sh + " -c 'klauncher4 \\\"/tmp\\\"'"); << l1 << false << QString(m_sh + " -c 'klauncher4 \\\"/tmp\\\"'");