mirror of
https://github.com/qbittorrent/qBittorrent.git
synced 2025-12-17 06:01:33 -06:00
Update expected-lite to v0.9.0
* Update expected-lite to v0.9.0 https://github.com/nonstd-lite/expected-lite/releases/tag/v0.9.0 * Add error messages for various RSS processing error * Preserve CRLF endings for expected-lite So that we can verify the hash matches upstream easily. PR #23440. Closes #22950.
This commit is contained in:
3
.gitattributes
vendored
3
.gitattributes
vendored
@@ -8,3 +8,6 @@ core.eol=lf
|
|||||||
|
|
||||||
dist/windows/license.txt text eol=crlf
|
dist/windows/license.txt text eol=crlf
|
||||||
test/testdata/crlf.txt text eol=crlf
|
test/testdata/crlf.txt text eol=crlf
|
||||||
|
|
||||||
|
# disable line endings conversions
|
||||||
|
src/base/3rdparty/expected.hpp -text
|
||||||
|
|||||||
@@ -39,6 +39,7 @@ repos:
|
|||||||
args: ["--fix=lf"]
|
args: ["--fix=lf"]
|
||||||
exclude: |
|
exclude: |
|
||||||
(?x)^(
|
(?x)^(
|
||||||
|
src/base/3rdparty/expected.hpp |
|
||||||
src/webui/www/private/css/lib/.* |
|
src/webui/www/private/css/lib/.* |
|
||||||
src/webui/www/private/scripts/lib/.* |
|
src/webui/www/private/scripts/lib/.* |
|
||||||
dist/windows/license.txt |
|
dist/windows/license.txt |
|
||||||
|
|||||||
7191
src/base/3rdparty/expected.hpp
vendored
7191
src/base/3rdparty/expected.hpp
vendored
File diff suppressed because it is too large
Load Diff
@@ -405,12 +405,16 @@ void Session::loadLegacy()
|
|||||||
const QString feedUrl = Item::relativeName(legacyPath);
|
const QString feedUrl = Item::relativeName(legacyPath);
|
||||||
|
|
||||||
for (const QString &folderPath : asConst(Item::expandPath(parentFolderPath)))
|
for (const QString &folderPath : asConst(Item::expandPath(parentFolderPath)))
|
||||||
addFolder(folderPath);
|
{
|
||||||
|
if (const auto result = addFolder(folderPath); !result)
|
||||||
|
LogMsg(tr("Failed to add RSS folder item. Reason: \"%1\"").arg(result.error()), Log::WARNING);
|
||||||
|
}
|
||||||
|
|
||||||
const QString feedPath = feedAliases[i].isEmpty()
|
const QString feedPath = feedAliases[i].isEmpty()
|
||||||
? legacyPath
|
? legacyPath
|
||||||
: Item::joinPath(parentFolderPath, feedAliases[i]);
|
: Item::joinPath(parentFolderPath, feedAliases[i]);
|
||||||
addFeed(feedUrl, feedPath);
|
if (const auto result = addFeed(feedUrl, feedPath); !result)
|
||||||
|
LogMsg(tr("Failed to add RSS feed item. Reason: \"%1\"").arg(result.error()), Log::WARNING);
|
||||||
++i;
|
++i;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user