diff --git a/src/librssguard/network-web/basenetworkaccessmanager.cpp b/src/librssguard/network-web/basenetworkaccessmanager.cpp index 7338c9c83..e1d18cd3a 100644 --- a/src/librssguard/network-web/basenetworkaccessmanager.cpp +++ b/src/librssguard/network-web/basenetworkaccessmanager.cpp @@ -66,18 +66,15 @@ QNetworkReply* BaseNetworkAccessManager::createRequest(QNetworkAccessManager::Op // new_request.setMaximumRedirectsAllowed(0); new_request.setRawHeader(HTTP_HEADERS_COOKIE, QSL("JSESSIONID= ").toLocal8Bit()); - /* - auto custom_ua = qApp->web()->customUserAgent(); - if (custom_ua.isEmpty()) { - new_request.setRawHeader(HTTP_HEADERS_USER_AGENT, HTTP_COMPLETE_USERAGENT); - } - else { - new_request.setRawHeader(HTTP_HEADERS_USER_AGENT, custom_ua.toLocal8Bit()); - } - */ + auto custom_ua = qApp->web()->customUserAgent(); - new_request.setRawHeader(HTTP_HEADERS_USER_AGENT, " "); + if (custom_ua.isEmpty()) { + new_request.setRawHeader(HTTP_HEADERS_USER_AGENT, HTTP_COMPLETE_USERAGENT); + } + else { + new_request.setRawHeader(HTTP_HEADERS_USER_AGENT, custom_ua.toLocal8Bit()); + } auto reply = QNetworkAccessManager::createRequest(op, new_request, outgoingData); return reply; diff --git a/src/librssguard/services/standard/definitions.h b/src/librssguard/services/standard/definitions.h index a35c27487..484c58977 100644 --- a/src/librssguard/services/standard/definitions.h +++ b/src/librssguard/services/standard/definitions.h @@ -17,6 +17,6 @@ #define ATOM_REGEX_MATCHER "]+type=\"application\\/(?:atom\\+xml|rss\\+xml)\"[^>]*>" #define ATOM_HREF_REGEX_MATCHER "href=\"([^\"]+)\"" -#define GITHUB_URL_REGEX "github\\.com\\/(\\w+)\\/(\\w+)" +#define GITHUB_URL_REGEX "github\\.com\\/([^\\s]+)\\/([^\\s]+)" #endif // STANDARD_DEFINITIONS_H diff --git a/src/librssguard/services/standard/parsers/atomparser.cpp b/src/librssguard/services/standard/parsers/atomparser.cpp index a89785d07..4a842a6a2 100644 --- a/src/librssguard/services/standard/parsers/atomparser.cpp +++ b/src/librssguard/services/standard/parsers/atomparser.cpp @@ -65,6 +65,8 @@ QList AtomParser::discoverFeeds(ServiceRoot* root, const QUrl& ur qDebugNN << LOGSEC_CORE << QUOTE_W_SPACE(my_url) << "is not a direct feed file."; } + IOFactory::writeFile("aaaa", data); + // 2. QRegularExpression rx(QSL(ATOM_REGEX_MATCHER), QRegularExpression::PatternOption::CaseInsensitiveOption); QRegularExpression rx_href(QSL(ATOM_HREF_REGEX_MATCHER), QRegularExpression::PatternOption::CaseInsensitiveOption);