public/tt-rss
1
0
Fork 0
mirror of https://git.tt-rss.org/git/tt-rss.git synced 2025-12-14 05:45:56 +00:00
Code Issues Releases Wiki Activity

implement stop action

Browse Source
This commit is contained in:
Andrew Dolgov
2013-03-31 19:28:36 +04:00
parent 133420aa8d
commit 5e736e4592
6 changed files with 31 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/functions.php
View File

@@ -1,6 +1,6 @@
<?php <?php
define('EXPECTED_CONFIG_VERSION', 26); define('EXPECTED_CONFIG_VERSION', 26);
define('SCHEMA_VERSION', 112); define('SCHEMA_VERSION', 113);
define('LABEL_BASE_INDEX', -1024); define('LABEL_BASE_INDEX', -1024);
define('PLUGIN_FEED_BASE_INDEX', -128); define('PLUGIN_FEED_BASE_INDEX', -128);

7
include/rssfuncs.php
View File

@@ -283,9 +283,11 @@
_debug("update_rss_feed: fetching [$fetch_url] (ts: $cache_timestamp/$last_updated_timestamp)"); _debug("update_rss_feed: fetching [$fetch_url] (ts: $cache_timestamp/$last_updated_timestamp)");
} }
$force_refetch = isset($_REQUEST["force_refetch"]);
$feed_data = fetch_file_contents($fetch_url, false, $feed_data = fetch_file_contents($fetch_url, false,
$auth_login, $auth_pass, false, $no_cache ? 15 : 45, $auth_login, $auth_pass, false, $no_cache ? 15 : 45,
max($last_updated_timestamp, $cache_timestamp)); $force_refetch ? 0 : max($last_updated_timestamp, $cache_timestamp));
if ($debug_enabled) { if ($debug_enabled) {
_debug("update_rss_feed: fetch done."); _debug("update_rss_feed: fetch done.");
@@ -1297,6 +1299,9 @@
if ($filter_match) { if ($filter_match) {
foreach ($filter["actions"] AS $action) { foreach ($filter["actions"] AS $action) {
array_push($matches, $action); array_push($matches, $action);
// if Stop action encountered, perform no further processing
if ($action["type"] == "stop") return $matches;
} }
} }
} }

5
schema/ttrss_schema_mysql.sql
View File

@@ -246,6 +246,9 @@ insert into ttrss_filter_actions (id,name,description) values (6, 'score',
insert into ttrss_filter_actions (id,name,description) values (7, 'label', insert into ttrss_filter_actions (id,name,description) values (7, 'label',
'Assign label'); 'Assign label');
insert into ttrss_filter_actions (id,name,description) values (8, 'stop',
'Stop / Do nothing');
create table ttrss_filters2(id integer primary key auto_increment, create table ttrss_filters2(id integer primary key auto_increment,
owner_uid integer not null, owner_uid integer not null,
match_any_rule boolean not null default false, match_any_rule boolean not null default false,
@@ -293,7 +296,7 @@ create table ttrss_tags (id integer primary key auto_increment,
create table ttrss_version (schema_version int not null) ENGINE=InnoDB DEFAULT CHARSET=UTF8; create table ttrss_version (schema_version int not null) ENGINE=InnoDB DEFAULT CHARSET=UTF8;
insert into ttrss_version values (112); insert into ttrss_version values (113);
create table ttrss_enclosures (id integer primary key auto_increment, create table ttrss_enclosures (id integer primary key auto_increment,
content_url text not null, content_url text not null,

5
schema/ttrss_schema_pgsql.sql
View File

@@ -219,6 +219,9 @@ insert into ttrss_filter_actions (id,name,description) values (6, 'score',
insert into ttrss_filter_actions (id,name,description) values (7, 'label', insert into ttrss_filter_actions (id,name,description) values (7, 'label',
'Assign label'); 'Assign label');
insert into ttrss_filter_actions (id,name,description) values (8, 'stop',
'Stop / Do nothing');
create table ttrss_filters2(id serial not null primary key, create table ttrss_filters2(id serial not null primary key,
owner_uid integer not null references ttrss_users(id) on delete cascade, owner_uid integer not null references ttrss_users(id) on delete cascade,
match_any_rule boolean not null default false, match_any_rule boolean not null default false,
@@ -251,7 +254,7 @@ create index ttrss_tags_post_int_id_idx on ttrss_tags(post_int_id);
create table ttrss_version (schema_version int not null); create table ttrss_version (schema_version int not null);
insert into ttrss_version values (112); insert into ttrss_version values (113);
create table ttrss_enclosures (id serial not null primary key, create table ttrss_enclosures (id serial not null primary key,
content_url text not null, content_url text not null,

8
schema/versions/mysql/113.sql Normal file
View File

@@ -0,0 +1,8 @@
begin;
insert into ttrss_filter_actions (id,name,description) values (8, 'stop',
'Stop / Do nothing');
update ttrss_version set schema_version = 113;
commit;

8
schema/versions/pgsql/113.sql Normal file
View File

@@ -0,0 +1,8 @@
begin;
insert into ttrss_filter_actions (id,name,description) values (8, 'stop',
'Stop / Do nothing');
update ttrss_version set schema_version = 113;
commit;