FreshRSS/rssguard
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

make date/time zone detection better to correctly work with GMAIL date/time strings

Browse Source
This commit is contained in:
Martin Rotter 2019-04-09 08:49:25 +02:00
parent f910e98276
commit eeb12394a4
1 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/miscellaneous/textfactory.cpp
View File

@ -57,17 +57,6 @@ QDateTime TextFactory::parseDateTime(const QString& date_time) {
timezone_offset_patterns << QSL("+hh:mm") << QSL("-hh:mm") << QSL("+hhmm") timezone_offset_patterns << QSL("+hh:mm") << QSL("-hh:mm") << QSL("+hhmm")
<< QSL("-hhmm") << QSL("+hh") << QSL("-hh"); << QSL("-hhmm") << QSL("+hh") << QSL("-hh");
if (input_date.size() >= TIMEZONE_OFFSET_LIMIT) {
foreach (const QString& pattern, timezone_offset_patterns) {
time_zone_offset = QTime::fromString(input_date.right(pattern.size()), pattern);
if (time_zone_offset.isValid()) {
positive_time_zone_offset = pattern.at(0) == QL1C('+');
break;
}
}
}
// Iterate over patterns and check if input date/time matches the pattern. // Iterate over patterns and check if input date/time matches the pattern.
foreach (const QString& pattern, date_patterns) { foreach (const QString& pattern, date_patterns) {
dt = locale.toDateTime(input_date.left(pattern.size()), pattern); dt = locale.toDateTime(input_date.left(pattern.size()), pattern);
@ -76,6 +65,20 @@ QDateTime TextFactory::parseDateTime(const QString& date_time) {
// Make sure that this date/time is considered UTC. // Make sure that this date/time is considered UTC.
dt.setTimeSpec(Qt::UTC); dt.setTimeSpec(Qt::UTC);
// We find offset from UTC.
if (input_date.size() >= TIMEZONE_OFFSET_LIMIT) {
QString offset_sanitized = input_date.mid(pattern.size()).replace(QL1S(" "), QString());
foreach (const QString& pattern_t, timezone_offset_patterns) {
time_zone_offset = QTime::fromString(offset_sanitized.left(pattern_t.size()), pattern_t);
if (time_zone_offset.isValid()) {
positive_time_zone_offset = pattern_t.at(0) == QL1C('+');
break;
}
}
}
if (time_zone_offset.isValid()) { if (time_zone_offset.isValid()) {
// Time zone offset was detected. // Time zone offset was detected.
if (positive_time_zone_offset) { if (positive_time_zone_offset) {