pogmommy/rssguard
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed #164 partially.

Browse source
This commit is contained in:
Martin Rotter 2016-02-23 06:37:13 +01:00
parent ad59ac6648
commit 0a4d5fa6c6
10 changed files with 238 additions and 220 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
resources/misc/db_update_mysql_1_2.sql
View file

@ -1,4 +1,4 @@
ALTER TABLE Messages ALTER TABLE Messages
ADD COLUMN is_pdeleted INTEGER(1) NOT NULL DEFAULT 0 CHECK (is_pdeleted >= 0 AND is_pdeleted <= 1); ADD COLUMN is_pdeleted INTEGER(1) NOT NULL DEFAULT 0 CHECK (is_pdeleted >= 0 AND is_pdeleted <= 1);
-- ! -- !
UPDATE Information SET inf_value = '2' WHERE inf_key = 'schema_version'; UPDATE Information SET inf_value = '2' WHERE inf_key = 'schema_version';

8
resources/misc/db_update_mysql_2_3.sql
View file

@ -1,4 +1,4 @@
ALTER TABLE Messages ALTER TABLE Messages
ADD COLUMN enclosures TEXT; ADD COLUMN enclosures TEXT;
-- ! -- !
UPDATE Information SET inf_value = '3' WHERE inf_key = 'schema_version'; UPDATE Information SET inf_value = '3' WHERE inf_key = 'schema_version';

134
resources/misc/db_update_mysql_3_4.sql
View file

@ -1,68 +1,68 @@
CREATE TABLE Accounts ( CREATE TABLE Accounts (
id INTEGER PRIMARY KEY, id INTEGER PRIMARY KEY,
type TEXT NOT NULL type TEXT NOT NULL
); );
-- ! -- !
INSERT INTO Accounts (type) VALUES ('std-rss'); INSERT INTO Accounts (type) VALUES ('std-rss');
-- ! -- !
DROP TABLE IF EXISTS FeedsData; DROP TABLE IF EXISTS FeedsData;
-- ! -- !
CREATE TABLE TtRssAccounts ( CREATE TABLE TtRssAccounts (
id INTEGER, id INTEGER,
username TEXT NOT NULL, username TEXT NOT NULL,
password TEXT, password TEXT,
auth_protected INTEGER(1) NOT NULL CHECK (auth_protected >= 0 AND auth_protected <= 1) DEFAULT 0, auth_protected INTEGER(1) NOT NULL CHECK (auth_protected >= 0 AND auth_protected <= 1) DEFAULT 0,
auth_username TEXT, auth_username TEXT,
auth_password TEXT, auth_password TEXT,
url TEXT NOT NULL, url TEXT NOT NULL,
force_update INTEGER(1) NOT NULL CHECK (force_update >= 0 AND force_update <= 1) DEFAULT 0, force_update INTEGER(1) NOT NULL CHECK (force_update >= 0 AND force_update <= 1) DEFAULT 0,
FOREIGN KEY (id) REFERENCES Accounts (id) FOREIGN KEY (id) REFERENCES Accounts (id)
); );
-- ! -- !
ALTER TABLE Messages ALTER TABLE Messages
ADD COLUMN account_id INTEGER NOT NULL DEFAULT 1; ADD COLUMN account_id INTEGER NOT NULL DEFAULT 1;
-- ! -- !
ALTER TABLE Messages ALTER TABLE Messages
ADD COLUMN custom_id TEXT; ADD COLUMN custom_id TEXT;
-- ! -- !
ALTER TABLE Messages ALTER TABLE Messages
DROP FOREIGN KEY feed; DROP FOREIGN KEY feed;
-- ! -- !
ALTER TABLE Messages ALTER TABLE Messages
MODIFY feed TEXT NOT NULL; MODIFY feed TEXT NOT NULL;
-- ! -- !
ALTER TABLE Messages ALTER TABLE Messages
MODIFY author TEXT; MODIFY author TEXT;
-- ! -- !
ALTER TABLE Messages ALTER TABLE Messages
MODIFY url TEXT; MODIFY url TEXT;
-- ! -- !
ALTER TABLE Feeds ALTER TABLE Feeds
ADD COLUMN account_id INTEGER NOT NULL DEFAULT 1; ADD COLUMN account_id INTEGER NOT NULL DEFAULT 1;
-- ! -- !
ALTER TABLE Feeds ALTER TABLE Feeds
ADD COLUMN custom_id TEXT; ADD COLUMN custom_id TEXT;
-- ! -- !
ALTER TABLE Feeds ALTER TABLE Feeds
MODIFY date_created BIGINT; MODIFY date_created BIGINT;
-- ! -- !
ALTER TABLE Feeds ALTER TABLE Feeds
MODIFY encoding TEXT; MODIFY encoding TEXT;
-- ! -- !
ALTER TABLE Feeds ALTER TABLE Feeds
MODIFY url VARCHAR(100); MODIFY url VARCHAR(100);
-- ! -- !
ALTER TABLE Feeds ALTER TABLE Feeds
MODIFY type INTEGER; MODIFY type INTEGER;
-- ! -- !
ALTER TABLE Categories ALTER TABLE Categories
ADD COLUMN account_id INTEGER NOT NULL DEFAULT 1; ADD COLUMN account_id INTEGER NOT NULL DEFAULT 1;
-- ! -- !
ALTER TABLE Categories ALTER TABLE Categories
ADD COLUMN custom_id TEXT; ADD COLUMN custom_id TEXT;
-- ! -- !
ALTER TABLE Categories ALTER TABLE Categories
MODIFY date_created BIGINT; MODIFY date_created BIGINT;
-- ! -- !
UPDATE Information SET inf_value = '4' WHERE inf_key = 'schema_version'; UPDATE Information SET inf_value = '4' WHERE inf_key = 'schema_version';

40
resources/misc/db_update_mysql_4_5.sql
View file

@ -1,19 +1,23 @@
CREATE TABLE IF NOT EXISTS OwnCloudAccounts ( CREATE TABLE IF NOT EXISTS OwnCloudAccounts (
id INTEGER, id INTEGER,
username TEXT NOT NULL, username TEXT NOT NULL,
password TEXT, password TEXT,
url TEXT NOT NULL, url TEXT NOT NULL,
force_update INTEGER(1) NOT NULL CHECK (force_update >= 0 AND force_update <= 1) DEFAULT 0, force_update INTEGER(1) NOT NULL CHECK (force_update >= 0 AND force_update <= 1) DEFAULT 0,
FOREIGN KEY (id) REFERENCES Accounts (id) FOREIGN KEY (id) REFERENCES Accounts (id)
); );
-- ! -- !
UPDATE Categories UPDATE Categories
SET custom_id = (SELECT id FROM Categories t WHERE t.id = Categories.id) SET custom_id = (SELECT id FROM Categories t WHERE t.id = Categories.id)
WHERE Categories.custom_id IS NULL; WHERE Categories.custom_id IS NULL;
-- ! -- !
UPDATE Feeds UPDATE Feeds
SET custom_id = (SELECT id FROM Feeds t WHERE t.id = Feeds.id) SET custom_id = (SELECT id FROM Feeds t WHERE t.id = Feeds.id)
WHERE Feeds.custom_id IS NULL; WHERE Feeds.custom_id IS NULL;
-- ! -- !
UPDATE Messages
SET custom_id = (SELECT id FROM Messages t WHERE t.id = Messages.id)
WHERE Messages.custom_id IS NULL;
-- !
UPDATE Information SET inf_value = '5' WHERE inf_key = 'schema_version'; UPDATE Information SET inf_value = '5' WHERE inf_key = 'schema_version';

6
resources/misc/db_update_sqlite_1_2.sql
View file

@ -1,4 +1,4 @@
ALTER TABLE Messages ALTER TABLE Messages
ADD COLUMN is_pdeleted INTEGER(1) NOT NULL DEFAULT 0 CHECK (is_pdeleted >= 0 AND is_pdeleted <= 1); ADD COLUMN is_pdeleted INTEGER(1) NOT NULL DEFAULT 0 CHECK (is_pdeleted >= 0 AND is_pdeleted <= 1);
-- ! -- !
UPDATE Information SET inf_value = '2' WHERE inf_key = 'schema_version'; UPDATE Information SET inf_value = '2' WHERE inf_key = 'schema_version';

8
resources/misc/db_update_sqlite_2_3.sql
View file

@ -1,4 +1,4 @@
ALTER TABLE Messages ALTER TABLE Messages
ADD COLUMN enclosures TEXT; ADD COLUMN enclosures TEXT;
-- ! -- !
UPDATE Information SET inf_value = '3' WHERE inf_key = 'schema_version'; UPDATE Information SET inf_value = '3' WHERE inf_key = 'schema_version';

204
resources/misc/db_update_sqlite_3_4.sql
View file

@ -1,103 +1,103 @@
CREATE TABLE Accounts ( CREATE TABLE Accounts (
id INTEGER PRIMARY KEY, id INTEGER PRIMARY KEY,
type TEXT NOT NULL type TEXT NOT NULL
); );
-- ! -- !
INSERT INTO Accounts (type) VALUES ('std-rss'); INSERT INTO Accounts (type) VALUES ('std-rss');
-- ! -- !
DROP TABLE IF EXISTS FeedsData; DROP TABLE IF EXISTS FeedsData;
-- ! -- !
CREATE TABLE TtRssAccounts ( CREATE TABLE TtRssAccounts (
id INTEGER, id INTEGER,
username TEXT NOT NULL, username TEXT NOT NULL,
password TEXT, password TEXT,
auth_protected INTEGER(1) NOT NULL CHECK (auth_protected >= 0 AND auth_protected <= 1) DEFAULT 0, auth_protected INTEGER(1) NOT NULL CHECK (auth_protected >= 0 AND auth_protected <= 1) DEFAULT 0,
auth_username TEXT, auth_username TEXT,
auth_password TEXT, auth_password TEXT,
url TEXT NOT NULL, url TEXT NOT NULL,
force_update INTEGER(1) NOT NULL CHECK (force_update >= 0 AND force_update <= 1) DEFAULT 0, force_update INTEGER(1) NOT NULL CHECK (force_update >= 0 AND force_update <= 1) DEFAULT 0,
FOREIGN KEY (id) REFERENCES Accounts (id) FOREIGN KEY (id) REFERENCES Accounts (id)
); );
-- ! -- !
CREATE TABLE backup_Messages AS SELECT * FROM Messages; CREATE TABLE backup_Messages AS SELECT * FROM Messages;
-- ! -- !
DROP TABLE Messages; DROP TABLE Messages;
-- ! -- !
CREATE TABLE Messages ( CREATE TABLE Messages (
id INTEGER PRIMARY KEY, id INTEGER PRIMARY KEY,
is_read INTEGER(1) NOT NULL CHECK (is_read >= 0 AND is_read <= 1) DEFAULT 0, is_read INTEGER(1) NOT NULL CHECK (is_read >= 0 AND is_read <= 1) DEFAULT 0,
is_deleted INTEGER(1) NOT NULL CHECK (is_deleted >= 0 AND is_deleted <= 1) DEFAULT 0, is_deleted INTEGER(1) NOT NULL CHECK (is_deleted >= 0 AND is_deleted <= 1) DEFAULT 0,
is_important INTEGER(1) NOT NULL CHECK (is_important >= 0 AND is_important <= 1) DEFAULT 0, is_important INTEGER(1) NOT NULL CHECK (is_important >= 0 AND is_important <= 1) DEFAULT 0,
feed TEXT NOT NULL, feed TEXT NOT NULL,
title TEXT NOT NULL CHECK (title != ''), title TEXT NOT NULL CHECK (title != ''),
url TEXT, url TEXT,
author TEXT, author TEXT,
date_created INTEGER NOT NULL CHECK (date_created != 0), date_created INTEGER NOT NULL CHECK (date_created != 0),
contents TEXT, contents TEXT,
is_pdeleted INTEGER(1) NOT NULL CHECK (is_pdeleted >= 0 AND is_pdeleted <= 1) DEFAULT 0, is_pdeleted INTEGER(1) NOT NULL CHECK (is_pdeleted >= 0 AND is_pdeleted <= 1) DEFAULT 0,
enclosures TEXT, enclosures TEXT,
account_id INTEGER NOT NULL, account_id INTEGER NOT NULL,
custom_id TEXT, custom_id TEXT,
FOREIGN KEY (account_id) REFERENCES Accounts (id) FOREIGN KEY (account_id) REFERENCES Accounts (id)
); );
-- ! -- !
INSERT INTO Messages (id, is_read, is_deleted, is_important, feed, title, url, author, date_created, contents, is_pdeleted, enclosures, account_id) INSERT INTO Messages (id, is_read, is_deleted, is_important, feed, title, url, author, date_created, contents, is_pdeleted, enclosures, account_id)
SELECT id, is_read, is_deleted, is_important, feed, title, url, author, date_created, contents, is_pdeleted, enclosures, 1 FROM backup_Messages; SELECT id, is_read, is_deleted, is_important, feed, title, url, author, date_created, contents, is_pdeleted, enclosures, 1 FROM backup_Messages;
-- ! -- !
DROP TABLE backup_Messages; DROP TABLE backup_Messages;
-- ! -- !
CREATE TABLE backup_Feeds AS SELECT * FROM Feeds; CREATE TABLE backup_Feeds AS SELECT * FROM Feeds;
-- ! -- !
DROP TABLE Feeds; DROP TABLE Feeds;
-- ! -- !
CREATE TABLE Feeds ( CREATE TABLE Feeds (
id INTEGER PRIMARY KEY, id INTEGER PRIMARY KEY,
title TEXT NOT NULL CHECK (title != ''), title TEXT NOT NULL CHECK (title != ''),
description TEXT, description TEXT,
date_created INTEGER, date_created INTEGER,
icon BLOB, icon BLOB,
category INTEGER NOT NULL CHECK (category >= -1), category INTEGER NOT NULL CHECK (category >= -1),
encoding TEXT, encoding TEXT,
url TEXT, url TEXT,
protected INTEGER(1) NOT NULL CHECK (protected >= 0 AND protected <= 1), protected INTEGER(1) NOT NULL CHECK (protected >= 0 AND protected <= 1),
username TEXT, username TEXT,
password TEXT, password TEXT,
update_type INTEGER(1) NOT NULL CHECK (update_type >= 0), update_type INTEGER(1) NOT NULL CHECK (update_type >= 0),
update_interval INTEGER NOT NULL CHECK (update_interval >= 5) DEFAULT 15, update_interval INTEGER NOT NULL CHECK (update_interval >= 5) DEFAULT 15,
type INTEGER, type INTEGER,
account_id INTEGER NOT NULL, account_id INTEGER NOT NULL,
custom_id TEXT, custom_id TEXT,
FOREIGN KEY (account_id) REFERENCES Accounts (id) FOREIGN KEY (account_id) REFERENCES Accounts (id)
); );
-- ! -- !
INSERT INTO Feeds (id, title, description, date_created, icon, category, encoding, url, protected, username, password, update_type, update_type, type, account_id) INSERT INTO Feeds (id, title, description, date_created, icon, category, encoding, url, protected, username, password, update_type, update_type, type, account_id)
SELECT id, title, description, date_created, icon, category, encoding, url, protected, username, password, update_type, update_type, type, 1 FROM backup_Feeds; SELECT id, title, description, date_created, icon, category, encoding, url, protected, username, password, update_type, update_type, type, 1 FROM backup_Feeds;
-- ! -- !
DROP TABLE backup_Feeds; DROP TABLE backup_Feeds;
-- ! -- !
CREATE TABLE backup_Categories AS SELECT * FROM Categories; CREATE TABLE backup_Categories AS SELECT * FROM Categories;
-- ! -- !
DROP TABLE Categories; DROP TABLE Categories;
-- ! -- !
CREATE TABLE Categories ( CREATE TABLE Categories (
id INTEGER PRIMARY KEY, id INTEGER PRIMARY KEY,
parent_id INTEGER NOT NULL, parent_id INTEGER NOT NULL,
title TEXT NOT NULL CHECK (title != ''), title TEXT NOT NULL CHECK (title != ''),
description TEXT, description TEXT,
date_created INTEGER, date_created INTEGER,
icon BLOB, icon BLOB,
account_id INTEGER NOT NULL, account_id INTEGER NOT NULL,
custom_id TEXT, custom_id TEXT,
FOREIGN KEY (account_id) REFERENCES Accounts (id) FOREIGN KEY (account_id) REFERENCES Accounts (id)
); );
-- ! -- !
INSERT INTO Categories (id, parent_id, title, description, date_created, icon, account_id) INSERT INTO Categories (id, parent_id, title, description, date_created, icon, account_id)
SELECT id, parent_id, title, description, date_created, icon, 1 FROM backup_Categories; SELECT id, parent_id, title, description, date_created, icon, 1 FROM backup_Categories;
-- ! -- !
DROP TABLE backup_Categories; DROP TABLE backup_Categories;
-- ! -- !
UPDATE Information SET inf_value = '4' WHERE inf_key = 'schema_version'; UPDATE Information SET inf_value = '4' WHERE inf_key = 'schema_version';

40
resources/misc/db_update_sqlite_4_5.sql
View file

@ -1,19 +1,23 @@
CREATE TABLE IF NOT EXISTS OwnCloudAccounts ( CREATE TABLE IF NOT EXISTS OwnCloudAccounts (
id INTEGER, id INTEGER,
username TEXT NOT NULL, username TEXT NOT NULL,
password TEXT, password TEXT,
url TEXT NOT NULL, url TEXT NOT NULL,
force_update INTEGER(1) NOT NULL CHECK (force_update >= 0 AND force_update <= 1) DEFAULT 0, force_update INTEGER(1) NOT NULL CHECK (force_update >= 0 AND force_update <= 1) DEFAULT 0,
FOREIGN KEY (id) REFERENCES Accounts (id) FOREIGN KEY (id) REFERENCES Accounts (id)
); );
-- ! -- !
UPDATE Categories UPDATE Categories
SET custom_id = (SELECT id FROM Categories t WHERE t.id = Categories.id) SET custom_id = (SELECT id FROM Categories t WHERE t.id = Categories.id)
WHERE Categories.custom_id IS NULL; WHERE Categories.custom_id IS NULL;
-- ! -- !
UPDATE Feeds UPDATE Feeds
SET custom_id = (SELECT id FROM Feeds t WHERE t.id = Feeds.id) SET custom_id = (SELECT id FROM Feeds t WHERE t.id = Feeds.id)
WHERE Feeds.custom_id IS NULL; WHERE Feeds.custom_id IS NULL;
-- ! -- !
UPDATE Messages
SET custom_id = (SELECT id FROM Messages t WHERE t.id = Messages.id)
WHERE Messages.custom_id IS NULL;
-- !
UPDATE Information SET inf_value = '5' WHERE inf_key = 'schema_version'; UPDATE Information SET inf_value = '5' WHERE inf_key = 'schema_version';

1
resources/text/CHANGELOG
View file

@ -15,6 +15,7 @@ Added:
Fixed: Fixed:
▪ Some other minor fixes.
▪ Feed list hidden when respective menu item is unchecked. (bug #163) ▪ Feed list hidden when respective menu item is unchecked. (bug #163)
▪ Standard RSS/RDF/ATOM relative URLs in entries should now be correctly loaded. (bug #160) ▪ Standard RSS/RDF/ATOM relative URLs in entries should now be correctly loaded. (bug #160)
▪ Fixed some problems when adding feeds from external web browser like Firefox. (bug #135) ▪ Fixed some problems when adding feeds from external web browser like Firefox. (bug #135)

11
src/gui/dialogs/formsettings.ui
View file

@ -1342,7 +1342,7 @@ Authors of this application are NOT responsible for lost data.</string>
<item> <item>
<widget class="QTabWidget" name="m_tabFeedsMessages"> <widget class="QTabWidget" name="m_tabFeedsMessages">
<property name="currentIndex"> <property name="currentIndex">
<number>0</number> <number>1</number>
</property> </property>
<widget class="QWidget" name="m_tabFeeds"> <widget class="QWidget" name="m_tabFeeds">
<attribute name="title"> <attribute name="title">
@ -1511,9 +1511,18 @@ Authors of this application are NOT responsible for lost data.</string>
</item> </item>
<item row="0" column="1"> <item row="0" column="1">
<widget class="QFontComboBox" name="m_cmbMessageFontStandard"> <widget class="QFontComboBox" name="m_cmbMessageFontStandard">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="editable"> <property name="editable">
<bool>false</bool> <bool>false</bool>
</property> </property>
<property name="sizeAdjustPolicy">
<enum>QComboBox::AdjustToContents</enum>
</property>
</widget> </widget>
</item> </item>
</layout> </layout>