FreshRSS
/
rssguard
mirror of https://github.com/martinrotter/rssguard.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix some broken datetimes in gmail messages

This commit is contained in:
Martin Rotter 2022-08-19 08:54:04 +02:00
parent 65e232d2d2
commit 54fa6134ec
2 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
resources/desktop/com.github.rssguard.appdata.xml
View File

@ -26,7 +26,7 @@
<url type="donation">https://github.com/sponsors/martinrotter</url>
<content_rating type="oars-1.1" />
<releases>
<release version="4.2.3" date="2022-08-15"/>
<release version="4.2.3" date="2022-08-19"/>
</releases>
<content_rating type="oars-1.0">
<content_attribute id="violence-cartoon">none</content_attribute>

19
src/librssguard/miscellaneous/textfactory.cpp
View File

@ -72,8 +72,8 @@ QDateTime TextFactory::parseDateTime(const QString& date_time) {
static QStringList date_patterns = dateTimePatterns();
QStringList timezone_offset_patterns;
timezone_offset_patterns << QSL("+hh:mm") << QSL("-hh:mm") << QSL("+hhmm")
<< QSL("-hhmm") << QSL("+hh") << QSL("-hh");
timezone_offset_patterns << QSL("+hh:mm") << QSL("-hh:mm") << QSL("+hhmm") << QSL("-hhmm") << QSL("+hh")
<< QSL("-hh");
// Iterate over patterns and check if input date/time matches the pattern.
for (const QString& pattern : qAsConst(date_patterns)) {
@ -124,12 +124,12 @@ QDateTime TextFactory::parseDateTime(qint64 milis_from_epoch) {
}
QStringList TextFactory::dateTimePatterns() {
return QStringList() << QSL("yyyy-MM-ddTHH:mm:ss") << QSL("MMM dd yyyy hh:mm:ss") <<
QSL("MMM d yyyy hh:mm:ss") << QSL("ddd, dd MMM yyyy HH:mm:ss") << QSL("ddd, d MMM yyyy HH:mm:ss") <<
QSL("dd MMM yyyy") << QSL("yyyy-MM-dd HH:mm:ss.z") << QSL("yyyy-MM-dd") <<
QSL("yyyy") << QSL("yyyy-MM") << QSL("yyyy-MM-dd") << QSL("yyyy-MM-ddThh:mm") <<
QSL("yyyy-MM-ddThh:mm:ss") << QSL("d MMM yyyy HH:mm:ss") << QSL("hh:mm:ss") <<
QSL("h:m:s AP") << QSL("h:mm") << QSL("H:mm") << QSL("h:m") << QSL("h.m");
return QStringList() << QSL("yyyy-MM-ddTHH:mm:ss") << QSL("MMM dd yyyy hh:mm:ss") << QSL("MMM d yyyy hh:mm:ss")
<< QSL("ddd, dd MMM yyyy HH:mm:ss") << QSL("ddd, d MMM yyyy HH:mm:ss")
<< QSL("dd MMM yyyy hh:mm:ss") << QSL("dd MMM yyyy") << QSL("yyyy-MM-dd HH:mm:ss.z")
<< QSL("yyyy-MM-dd") << QSL("yyyy") << QSL("yyyy-MM") << QSL("yyyy-MM-dd")
<< QSL("yyyy-MM-ddThh:mm") << QSL("yyyy-MM-ddThh:mm:ss") << QSL("d MMM yyyy HH:mm:ss")
<< QSL("hh:mm:ss") << QSL("h:m:s AP") << QSL("h:mm") << QSL("H:mm") << QSL("h:m") << QSL("h.m");
}
QString TextFactory::encrypt(const QString& text, quint64 key) {
@ -228,8 +228,7 @@ quint64 TextFactory::initializeSecretEncryptionKey() {
IOFactory::writeFile(encryption_file_path, QString::number(s_encryptionKey).toLocal8Bit());
}
catch (ApplicationException& ex) {
qCriticalNN << LOGSEC_CORE
<< "Failed to write newly generated encryption key to file, error"
qCriticalNN << LOGSEC_CORE << "Failed to write newly generated encryption key to file, error"
<< QUOTE_W_SPACE_DOT(ex.message())
<< " Now, your passwords won't be readable after you start this application again.";
}