Falkon/falkonOfficial
Falkon/falkonOfficial
1
Fork 0
mirror of https://invent.kde.org/network/falkon.git synced 2024-12-20 02:36:34 +01:00
Code Releases Activity

Fixed adding control characters at the end of url in bookmarks import

Browse Source 
closes #499
This commit is contained in:
nowrep 2012-08-11 14:53:47 +02:00
parent 0f98af2001
commit 119c23f630
3 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/lib/bookmarksimport/chromeimporter.cpp
View File

@ -71,8 +71,8 @@ QList<BookmarksModel::Bookmark> ChromeImporter::exportBookmarks()
parsedString = "(" + parsedString + ")";
if (scriptEngine->canEvaluate(parsedString)) {
QScriptValue object = scriptEngine->evaluate(parsedString);
QString name = object.property("name").toString();
QUrl url = QUrl::fromEncoded(object.property("url").toString().toUtf8());
QString name = object.property("name").toString().trimmed();
QUrl url = QUrl::fromEncoded(object.property("url").toString().trimmed().toUtf8());
if (name.isEmpty() || url.isEmpty()) {
continue;

7
src/lib/bookmarksimport/htmlimporter.cpp
View File

@ -66,7 +66,6 @@ QList<BookmarksModel::Bookmark> HtmlImporter::exportBookmarks()
QString bookmarks = QString::fromUtf8(m_file.readAll());
m_file.close();
// Converting tags to lower case -,-
// For some reason Qt::CaseInsensitive is not everytime insensitive :-D
@ -106,7 +105,7 @@ QList<BookmarksModel::Bookmark> HtmlImporter::exportBookmarks()
rx.indexIn(string);
// QString arguments = rx.cap(1);
QString folderName = rx.cap(2);
QString folderName = rx.cap(2).trimmed();
folders.append(folderName);
@ -127,13 +126,13 @@ QList<BookmarksModel::Bookmark> HtmlImporter::exportBookmarks()
rx.indexIn(string);
QString arguments = rx.cap(1);
QString linkName = rx.cap(2);
QString linkName = rx.cap(2).trimmed();
QRegExp rx2("href=\"(.*)\"");
rx2.setMinimal(true);
rx2.indexIn(arguments);
QUrl url = QUrl::fromEncoded(rx2.cap(1).toUtf8());
QUrl url = QUrl::fromEncoded(rx2.cap(1).trimmed().toUtf8());
start += posOfLink + rx.cap(0).size();

4
src/lib/bookmarksimport/operaimporter.cpp
View File

@ -61,11 +61,11 @@ QList<BookmarksModel::Bookmark> OperaImporter::exportBookmarks()
QRegExp rx2("NAME=(.*)\\n");
rx2.setMinimal(true);
rx2.indexIn(string);
QString name = rx2.cap(1);
QString name = rx2.cap(1).trimmed();
rx2.setPattern("URL=(.*)\\n");
rx2.indexIn(string);
QUrl url = QUrl::fromEncoded(rx2.cap(1).toUtf8());
QUrl url = QUrl::fromEncoded(rx2.cap(1).trimmed().toUtf8());
if (name.isEmpty() || url.isEmpty()) {
continue;