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

revert to older dt recognition

This commit is contained in:
Martin Rotter 2024-04-16 08:17:05 +02:00
parent 9e2a370e0c
commit 86eaa3f965
6 changed files with 12 additions and 2818 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2529
src/librssguard/3rd-party/qdatetimeparser/qdatetimeparser.cpp vendored
View File

File diff suppressed because it is too large Load Diff

261
src/librssguard/3rd-party/qdatetimeparser/qdatetimeparser.h vendored
View File

@ -1,261 +0,0 @@
// Copyright (C) 2021 The Qt Company Ltd.
// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
#ifndef QDATETIMEPARSER_P_H
#define QDATETIMEPARSER_P_H
//
// W A R N I N G
// -------------
//
// This file is not part of the Qt API. It exists purely as an
// implementation detail. This header file may change from version to
// version without notice, or even be removed.
//
// We mean it.
//
#include <QCalendar>
#include <QDateTime>
#include <QMetaType>
#define QDATETIMEEDIT_TIME_MIN QTime(0, 0) // Prefer QDate::startOfDay()
#define QDATETIMEEDIT_TIME_MAX QTime(23, 59, 59, 999) // Prefer QDate::endOfDay()
#define QDATETIMEEDIT_DATE_MIN QDate(100, 1, 1)
#define QDATETIMEEDIT_COMPAT_DATE_MIN QDate(1752, 9, 14)
#define QDATETIMEEDIT_DATE_MAX QDate(9999, 12, 31)
#define QDATETIMEEDIT_DATE_INITIAL QDate(2000, 1, 1)
class QDateTimeParser {
public:
enum Context {
FromString,
DateTimeEdit
};
QDateTimeParser(QMetaType::Type t, Context ctx, const QCalendar& cal = QCalendar())
: parserType(t), context(ctx), calendar(cal) {
defaultLocale = QLocale::system();
first.type = FirstSection;
first.pos = -1;
first.count = -1;
first.zeroesAdded = 0;
last.type = LastSection;
last.pos = -1;
last.count = -1;
last.zeroesAdded = 0;
none.type = NoSection;
none.pos = -1;
none.count = -1;
none.zeroesAdded = 0;
}
virtual ~QDateTimeParser();
enum Section {
NoSection = 0x00000,
AmPmSection = 0x00001,
MSecSection = 0x00002,
SecondSection = 0x00004,
MinuteSection = 0x00008,
Hour12Section = 0x00010,
Hour24Section = 0x00020,
TimeZoneSection = 0x00040,
HourSectionMask = (Hour12Section | Hour24Section),
TimeSectionMask = (MSecSection | SecondSection | MinuteSection | HourSectionMask | AmPmSection | TimeZoneSection),
DaySection = 0x00100,
MonthSection = 0x00200,
YearSection = 0x00400,
YearSection2Digits = 0x00800,
YearSectionMask = YearSection | YearSection2Digits,
DayOfWeekSectionShort = 0x01000,
DayOfWeekSectionLong = 0x02000,
DayOfWeekSectionMask = DayOfWeekSectionShort | DayOfWeekSectionLong,
DaySectionMask = DaySection | DayOfWeekSectionMask,
DateSectionMask = DaySectionMask | MonthSection | YearSectionMask,
Internal = 0x10000,
FirstSection = 0x20000 | Internal,
LastSection = 0x40000 | Internal,
CalendarPopupSection = 0x80000 | Internal,
NoSectionIndex = -1,
FirstSectionIndex = -2,
LastSectionIndex = -3,
CalendarPopupIndex = -4
}; // extending qdatetimeedit.h's equivalent
Q_DECLARE_FLAGS(Sections, Section)
struct SectionNode {
Section type;
mutable int pos;
int count; // (used as Case(count) indicator for AmPmSection)
int zeroesAdded;
static QString name(Section s);
QString name() const {
return name(type);
}
QString format() const;
int maxChange() const;
};
enum State { // duplicated from QValidator
Invalid,
Intermediate,
Acceptable
};
struct StateNode {
StateNode() : state(Invalid), padded(0), conflicts(false) {}
StateNode(const QDateTime& val, State ok = Acceptable, int pad = 0, bool bad = false)
: value(val), state(ok), padded(pad), conflicts(bad) {}
QDateTime value;
State state;
int padded;
bool conflicts;
};
enum AmPm {
AmText,
PmText
};
StateNode parse(const QString& input, int position, const QDateTime& defaultValue, bool fixup) const;
bool fromString(const QString& text, QDate* date, QTime* time) const;
bool fromString(const QString& text, QDateTime* datetime) const;
bool parseFormat(QStringView format);
enum FieldInfoFlag {
Numeric = 0x01,
FixedWidth = 0x02,
AllowPartial = 0x04,
Fraction = 0x08
};
Q_DECLARE_FLAGS(FieldInfo, FieldInfoFlag)
FieldInfo fieldInfo(int index) const;
void setDefaultLocale(const QLocale& loc) {
defaultLocale = loc;
}
virtual QString displayText() const {
return m_text;
}
void setCalendar(const QCalendar& calendar);
private:
int sectionMaxSize(Section s, int count) const;
QString sectionText(const QString& text, int sectionIndex, int index) const;
StateNode scanString(const QDateTime& defaultValue, bool fixup) const;
struct ParsedSection {
int value;
int used;
int zeroes;
State state;
constexpr ParsedSection(State ok = Invalid, int val = 0, int read = 0, int zs = 0)
: value(ok == Invalid ? -1 : val), used(read), zeroes(zs), state(ok) {}
};
ParsedSection parseSection(const QDateTime& currentValue, int sectionIndex, int offset) const;
int findMonth(const QString& str1,
int monthstart,
int sectionIndex,
int year,
QString* monthName = nullptr,
int* used = nullptr) const;
int findDay(const QString& str1,
int intDaystart,
int sectionIndex,
QString* dayName = nullptr,
int* used = nullptr) const;
ParsedSection findUtcOffset(QStringView str, int mode) const;
ParsedSection findTimeZoneName(QStringView str, const QDateTime& when) const;
ParsedSection findTimeZone(QStringView str, const QDateTime& when, int maxVal, int minVal, int mode) const;
enum AmPmFinder {
Neither = -1,
AM = 0,
PM = 1,
PossibleAM = 2,
PossiblePM = 3,
PossibleBoth = 4
};
AmPmFinder findAmPm(QString& str, int index, int* used = nullptr) const;
bool potentialValue(QStringView str, int min, int max, int index, const QDateTime& currentValue, int insert) const;
bool potentialValue(const QString& str, int min, int max, int index, const QDateTime& currentValue, int insert)
const {
return potentialValue(QStringView(str), min, max, index, currentValue, insert);
}
enum Case {
NativeCase,
LowerCase,
UpperCase
};
QString getAmPmText(AmPm ap, Case cs) const;
friend class QDTPUnitTestParser;
protected: // for the benefit of QDateTimeEditPrivate
int sectionSize(int index) const;
int sectionMaxSize(int index) const;
int sectionPos(int index) const;
int sectionPos(const SectionNode& sn) const;
const SectionNode& sectionNode(int index) const;
Section sectionType(int index) const;
QString sectionText(int sectionIndex) const;
int getDigit(const QDateTime& dt, int index) const;
bool setDigit(QDateTime& t, int index, int newval) const;
int absoluteMax(int index, const QDateTime& value = QDateTime()) const;
int absoluteMin(int index) const;
bool skipToNextSection(int section, const QDateTime& current, QStringView sectionText) const;
bool skipToNextSection(int section, const QDateTime& current, const QString& sectionText) const {
return skipToNextSection(section, current, QStringView(sectionText));
}
QString stateName(State s) const;
virtual QDateTime getMinimum() const;
virtual QDateTime getMaximum() const;
virtual int cursorPosition() const {
return -1;
}
virtual QLocale locale() const {
return defaultLocale;
}
mutable int currentSectionIndex = int(NoSectionIndex);
Sections display;
/*
This stores the most recently selected day.
It is useful when considering the following scenario:
1. Date is: 31/01/2000
2. User increments month: 29/02/2000
3. User increments month: 31/03/2000
At step 1, cachedDay stores 31. At step 2, the 31 is invalid for February, so the cachedDay is not updated.
At step 3, the month is changed to March, for which 31 is a valid day. Since 29 < 31, the day is set to
cachedDay. This is good for when users have selected their desired day and are scrolling up or down in the month
or year section and do not want smaller months (or non-leap years) to alter the day that they chose.
*/
mutable int cachedDay = -1;
mutable QString m_text;
QList<SectionNode> sectionNodes;
SectionNode first, last, none, popup;
QStringList separators;
QString displayFormat;
QLocale defaultLocale;
QMetaType::Type parserType;
bool fixday = false;
Context context;
QCalendar calendar;
};
Q_DECLARE_OPERATORS_FOR_FLAGS(QDateTimeParser::Sections)
Q_DECLARE_OPERATORS_FOR_FLAGS(QDateTimeParser::FieldInfo)
#endif // QDATETIME_P_H

5
src/librssguard/CMakeLists.txt
View File

@ -446,11 +446,6 @@ list(APPEND SOURCES
3rd-party/boolinq/boolinq.h
)
list(APPEND SOURCES
3rd-party/qdatetimeparser/qdatetimeparser.cpp
3rd-party/qdatetimeparser/qdatetimeparser.h
)
# Add sqlite.
if(USE_SYSTEM_SQLITE)
find_package(SQLite3)

1
src/librssguard/miscellaneous/application.cpp
View File

@ -10,7 +10,6 @@
#include "3rd-party/sqlite/sqlite3.h"
#endif
#include "3rd-party/qdatetimeparser/qdatetimeparser.h"
#include "core/feedsmodel.h"
#include "dynamic-shortcuts/dynamicshortcuts.h"
#include "exceptions/applicationexception.h"

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

@ -3,7 +3,6 @@
#include "miscellaneous/textfactory.h"
#include "3rd-party/boolinq/boolinq.h"
#include "3rd-party/qdatetimeparser/qdatetimeparser.h"
#include "3rd-party/sc/simplecrypt.h"
#include "definitions/definitions.h"
#include "exceptions/applicationexception.h"
@ -90,23 +89,14 @@ QDateTime TextFactory::parseDateTime(const QString& date_time, QString* used_dt_
QDateTime dt;
QTime time_zone_offset;
// const QLocale locale(QLocale::Language::C);
const QLocale locale(QLocale::Language::C);
bool positive_time_zone_offset = false;
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");
/*
QString tst = locale.toString(QDateTime(QDate(2024, 3, 20), QTime(16, 17, 0)), "ddd, dd MMM yy HH:mm:ss");
QDateTime tst2 = locale.toDateTime(tst, "ddd, dd MMM yy HH:mm:ss");
QString tst3 = tst2.toString("ddd, dd MMM yy HH:mm:ss");
*/
static QStringList timezone_offset_patterns = tzOffsetPatterns();
// Iterate over patterns and check if input date/time matches the pattern.
for (const QString& pattern : std::as_const(date_patterns)) {
/*
QString input_date_chopped = input_date.left(pattern.size());
#if QT_VERSION >= 0x060700 // Qt >= 6.7.0
@ -114,15 +104,6 @@ QDateTime TextFactory::parseDateTime(const QString& date_time, QString* used_dt_
#else
dt = locale.toDateTime(input_date_chopped, pattern);
#endif
*/
// NOTE: We use QDateTimeParser class extracted/modified from Qt sources to allow
// matching only prefixes of input date strings.
//
// Built-in parser only matches if the WHOLE input strings matches.
QDateTimeParser par(QMetaType::QDateTime, QDateTimeParser::FromString, QCalendar());
par.setDefaultLocale(QLocale::c());
par.parseFormat(pattern);
par.fromString(input_date, &dt);
if (dt.isValid()) {
// Make sure that this date/time is considered UTC.
@ -191,6 +172,14 @@ QStringList TextFactory::dateTimePatterns() {
return FROM_STD_LIST(QStringList, std_pat);
}
QStringList TextFactory::tzOffsetPatterns() {
QStringList pat;
pat << QSL("+hh:mm") << QSL("-hh:mm") << QSL("+hhmm") << QSL("-hhmm") << QSL("+hh") << QSL("-hh");
return pat;
}
QString TextFactory::encrypt(const QString& text, quint64 key) {
return SimpleCrypt(key == 0 ? initializeSecretEncryptionKey() : key).encryptToString(text);
}

1
src/librssguard/miscellaneous/textfactory.h
View File

@ -32,6 +32,7 @@ class RSSGUARD_DLLSPEC TextFactory {
// NOTE: This method tries to always return time in UTC.
static QDateTime parseDateTime(qint64 milis_from_epoch);
static QStringList dateTimePatterns();
static QStringList tzOffsetPatterns();
static QString encrypt(const QString& text, quint64 key = 0);
static QString decrypt(const QString& text, quint64 key = 0);
static QString newline();