From 19a2e11bcf922eb7a786b1bae1e5e6a4f4301216 Mon Sep 17 00:00:00 2001
From: parg <parg@users.noreply.github.com>
Date: Sun, 28 Feb 2021 11:50:58 +0000
Subject: [PATCH] 1.7: Allow filter testing when bean disabled

---
 ChangeLog.txt                               | 1 +
 org/kmallan/azureus/rssfeed/FilterBean.java | 9 ++++++---
 org/kmallan/azureus/rssfeed/Scheduler.java  | 2 +-
 org/kmallan/azureus/rssfeed/View.java       | 2 +-
 plugin.properties                           | 2 +-
 5 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/ChangeLog.txt b/ChangeLog.txt
index 9417df2..ee68c15 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -1,5 +1,6 @@
 RSSFEED CHANGELOG - Changes by parg@users.sourceforge.net
 ---------------------------------------------
+1.7    - Allow testing of filters when filter is disabled [Parg]
 1.6.9  - Fail feed updates if forced-bind address is missing [Parg]
 1.6.8  - Change to using Tree instead of TableTree as deprecated and not working on Linux [Parg] 
 1.6.7  - Fix internationalisation issue with config save [Parg]
diff --git a/org/kmallan/azureus/rssfeed/FilterBean.java b/org/kmallan/azureus/rssfeed/FilterBean.java
index 48f7f29..1194b0b 100644
--- a/org/kmallan/azureus/rssfeed/FilterBean.java
+++ b/org/kmallan/azureus/rssfeed/FilterBean.java
@@ -343,9 +343,12 @@ public void setEnabled(boolean enabled) {
     this.enabled = enabled;
   }
 
-  public boolean matches(long urlId, String title, String link) {
-    if(!getEnabled()) return false;
-    if(getFeed() != 0 && urlId != getFeed()) return false;
+  public boolean matches(long urlId, String title, String link, boolean testOnly) {
+    if ( !testOnly){
+	  if(!getEnabled()) return false;
+	
+	  if(getFeed() != 0 && urlId != getFeed()) return false;
+    }
 
     boolean matched = false;
     if((getMatchTitle()) && (match(title))) matched = true;
diff --git a/org/kmallan/azureus/rssfeed/Scheduler.java b/org/kmallan/azureus/rssfeed/Scheduler.java
index 15cd00d..c0b05b6 100644
--- a/org/kmallan/azureus/rssfeed/Scheduler.java
+++ b/org/kmallan/azureus/rssfeed/Scheduler.java
@@ -503,7 +503,7 @@ public void run() {
       for(int i = 0; i < view.rssfeedConfig.getFilterCount(); i++) {
         curFilter = view.rssfeedConfig.getFilter(i);
         if(curFilter == null) continue;
-        if(curFilter.matches(urlBean.getID(), titleTest, linkTest)) {
+        if(curFilter.matches(urlBean.getID(), titleTest, linkTest, false)) {
           if(curFilter.getModeIndex() == FilterBean.MODE_PASS ) {
             state = ListBean.DOWNLOAD_INCL;
           } else {
diff --git a/org/kmallan/azureus/rssfeed/View.java b/org/kmallan/azureus/rssfeed/View.java
index f856244..568f381 100644
--- a/org/kmallan/azureus/rssfeed/View.java
+++ b/org/kmallan/azureus/rssfeed/View.java
@@ -1228,7 +1228,7 @@ private void filtTest() {
     String testStr = filtTestMatch.getText();
     if(testStr != null) {
       testStr = testStr.toLowerCase();
-      boolean match = FilterTableItem.save(null, thisView).matches(0, testStr, testStr);
+      boolean match = FilterTableItem.save(null, thisView).matches(0, testStr, testStr,true);
       Color green = display.getSystemColor(SWT.COLOR_GREEN);
       Color red = display.getSystemColor(SWT.COLOR_RED);
       filtTestMatch.setBackground(match?green:red);
diff --git a/plugin.properties b/plugin.properties
index c9f8d07..7e77d9b 100644
--- a/plugin.properties
+++ b/plugin.properties
@@ -1,5 +1,5 @@
 plugin.id=rssfeed
 plugin.name=RSSFeed Scanner
-plugin.version=1.6.9
 plugin.class=org.kmallan.azureus.rssfeed.Plugin
 plugin.langfile=org.kmallan.resource.lang.Messages
+plugin.version=1.7