Skip to content

Commit c592238

Browse files
martinrottermartinrotter
committed
finalize indexes (?), fix reddit new acc login crash, fetch reddit post flairs as article caegories
1 parent 1163a8a commit c592238

File tree

6 files changed

+41
-30
lines changed

6 files changed

+41
-30
lines changed

‎resources/sql/db_init.sql‎

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -161,16 +161,12 @@ CREATE INDEX idx_Feeds1 ON Feeds (account_id);
161161
CREATE INDEX idx_Feeds2 ON Feeds (account_id, category, ordr);
162162
-- !
163163
-- !
164-
CREATE INDEX idx_Messages1 ON Messages (account_id);
164+
CREATE INDEX idx_Messages1 ON Messages (account_id, is_deleted, is_pdeleted, is_read);
165165
-- !
166-
CREATE INDEX idx_Messages2 ON Messages (feed);
166+
CREATE INDEX idx_Messages2 ON Messages (account_id, is_deleted, is_pdeleted, is_important);
167167
-- !
168-
CREATE INDEX idx_Messages3 ON Messages (custom_id);
168+
CREATE INDEX idx_Messages3 ON Messages (feed, is_deleted, is_pdeleted);
169169
-- !
170-
CREATE INDEX idx_Messages4 ON Messages (account_id, is_deleted, is_pdeleted, is_read);
170+
CREATE INDEX idx_Messages4 ON Messages (custom_id, account_id, feed);
171171
-- !
172-
CREATE INDEX idx_Messages5 ON Messages (account_id, is_deleted, is_pdeleted, is_important);
173-
-- !
174-
CREATE INDEX idx_Messages6 ON Messages (is_important, account_id, is_deleted, is_pdeleted, is_read);
175-
-- !
176-
CREATE INDEX idx_Messages7 ON Messages (feed, is_deleted);
172+
CREATE INDEX idx_Messages5 ON Messages (feed, account_id);

‎resources/sql/wheres.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ account_id, is_deleted, is_pdeleted, is_read
55
account_id, is_deleted, is_pdeleted, title, contents, is_read # whereClauseProbe, customIdsOfMessagesFromProbe, cleanProbedMessages
66
account_id, is_pdeleted # whereClauseAccount
77

8-
is_important, account_id, is_deleted, is_pdeleted # whereClauseImportantArticles, cleanImportantMessages
9-
is_important, account_id, is_deleted, is_pdeleted, is_read # customIdsOfImportantMessages, cleanImportantMessages
8+
account_id, is_deleted, is_pdeleted, is_important # whereClauseImportantArticles, cleanImportantMessages
9+
account_id, is_deleted, is_pdeleted, is_important, is_read # customIdsOfImportantMessages, cleanImportantMessages
1010

1111
feed # whereClauseFeeds, deleteFeed
1212
account_id # getAllGmailRecipients, getMessageCountsForAllLabels, deleteAccount

‎src/librssguard-reddit/src/redditnetworkfactory.cpp‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ void RedditNetworkFactory::initializeOauth() {
6868
Q_UNUSED(expires_in)
6969
Q_UNUSED(access_token)
7070

71-
if (m_service != nullptr && !refresh_token.isEmpty()) {
71+
if (m_service != nullptr && m_service->accountId() > 0 && !refresh_token.isEmpty()) {
7272
QSqlDatabase database = qApp->database()->driver()->connection(metaObject()->className());
7373

7474
DatabaseQueries::storeNewOauthTokens(database, refresh_token, m_service->accountId());
@@ -205,6 +205,9 @@ QList<Feed*> RedditNetworkFactory::subreddits(const QNetworkProxy& custom_proxy)
205205
QNetworkReply::NetworkError::NoError) {
206206
new_sub->setIcon(icon);
207207
}
208+
else {
209+
int a = 5;
210+
}
208211

209212
subs.append(new_sub);
210213
}
@@ -496,6 +499,12 @@ QList<Message> RedditNetworkFactory::hot(const QString& sub_name, const QNetwork
496499
}
497500
}
498501

502+
auto flair_text = msg_obj.value(QSL("link_flair_text")).toString();
503+
504+
if (!flair_text.isEmpty()) {
505+
new_msg.m_categories.append(QSharedPointer<MessageCategory>(new MessageCategory(flair_text)));
506+
}
507+
499508
// auto cmnts = commentsTree(msg_obj.value(QSL("subreddit")).toString(), new_msg.m_customId, custom_proxy);
500509
// new_msg.m_contents += commentsTreeToHtml(cmnts, new_msg.m_title, new_msg.m_url);
501510

‎src/librssguard-standard/src/gui/standardfeeddetails.ui‎

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,9 @@
3636
<property name="toolTip">
3737
<string>Select parent item for your feed.</string>
3838
</property>
39+
<property name="sizeAdjustPolicy">
40+
<enum>QComboBox::SizeAdjustPolicy::AdjustToMinimumContentsLengthWithIcon</enum>
41+
</property>
3942
<property name="iconSize">
4043
<size>
4144
<width>12</width>
@@ -291,28 +294,28 @@
291294
</widget>
292295
<customwidgets>
293296
<customwidget>
294-
<class>LineEditWithStatus</class>
297+
<class>TextEditWithStatus</class>
295298
<extends>QWidget</extends>
296-
<header>lineeditwithstatus.h</header>
299+
<header>texteditwithstatus.h</header>
297300
<container>1</container>
298301
</customwidget>
299-
<customwidget>
300-
<class>MultiFeedEditCheckBox</class>
301-
<extends>QCheckBox</extends>
302-
<header>multifeededitcheckbox.h</header>
303-
</customwidget>
304302
<customwidget>
305303
<class>HelpSpoiler</class>
306304
<extends>QWidget</extends>
307305
<header>helpspoiler.h</header>
308306
<container>1</container>
309307
</customwidget>
310308
<customwidget>
311-
<class>TextEditWithStatus</class>
309+
<class>LineEditWithStatus</class>
312310
<extends>QWidget</extends>
313-
<header>texteditwithstatus.h</header>
311+
<header>lineeditwithstatus.h</header>
314312
<container>1</container>
315313
</customwidget>
314+
<customwidget>
315+
<class>MultiFeedEditCheckBox</class>
316+
<extends>QCheckBox</extends>
317+
<header>multifeededitcheckbox.h</header>
318+
</customwidget>
316319
</customwidgets>
317320
<resources/>
318321
<connections/>

‎src/librssguard/database/databasequeries.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -75,10 +75,10 @@ QString DatabaseQueries::whereClauseBin(int account_id) {
7575
}
7676

7777
QString DatabaseQueries::whereClauseImportantArticles(int account_id) {
78-
return QSL("Messages.is_important = 1 AND "
79-
"Messages.account_id = %1 AND "
78+
return QSL("Messages.account_id = %1 AND "
8079
"Messages.is_deleted = 0 AND "
81-
"Messages.is_pdeleted = 0")
80+
"Messages.is_pdeleted = 0 AND "
81+
"Messages.is_important = 1")
8282
.arg(account_id);
8383
}
8484

‎src/librssguard/services/abstract/gui/formcategorydetails.ui‎

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,9 @@
4242
<property name="toolTip">
4343
<string>Select parent item for your category.</string>
4444
</property>
45+
<property name="sizeAdjustPolicy">
46+
<enum>QComboBox::SizeAdjustPolicy::AdjustToMinimumContentsLengthWithIcon</enum>
47+
</property>
4548
<property name="iconSize">
4649
<size>
4750
<width>13</width>
@@ -170,6 +173,12 @@
170173
</layout>
171174
</widget>
172175
<customwidgets>
176+
<customwidget>
177+
<class>TextEditWithStatus</class>
178+
<extends>QWidget</extends>
179+
<header>texteditwithstatus.h</header>
180+
<container>1</container>
181+
</customwidget>
173182
<customwidget>
174183
<class>LineEditWithStatus</class>
175184
<extends>QWidget</extends>
@@ -181,12 +190,6 @@
181190
<extends>QCheckBox</extends>
182191
<header>multifeededitcheckbox.h</header>
183192
</customwidget>
184-
<customwidget>
185-
<class>TextEditWithStatus</class>
186-
<extends>QWidget</extends>
187-
<header>texteditwithstatus.h</header>
188-
<container>1</container>
189-
</customwidget>
190193
</customwidgets>
191194
<tabstops>
192195
<tabstop>m_buttonBox</tabstop>

0 commit comments

Comments
 (0)