test & apply rules

src/components/settings/rules.tsx

@@ -6,6 +6,8 @@ import { Stack, Label, Dropdown, IDropdownOption, TextField, PrimaryButton, Icon
 import { SourceRule, RuleActions } from "../../scripts/models/rule"
 import { FilterType } from "../../scripts/models/feed"
 import { validateRegex } from "../../scripts/utils"
+import { RSSItem } from "../../scripts/models/item"
+import Parser = require("@yang991178/rss-parser")
 
 const actionKeyMap = {
     "r-true": "article.markRead",
@@ -29,6 +31,9 @@ type RulesTabState = {
     fullSearch: boolean
     match: boolean
     actionKeys: string[]
+    mockTitle: string
+    mockContent: string
+    mockResult: string
 }
 
 class RulesTab extends React.Component<RulesTabProps, RulesTabState> {
@@ -46,7 +51,10 @@ class RulesTab extends React.Component<RulesTabProps, RulesTabState> {
             regex: "",
             fullSearch: false,
             match: true,
-            actionKeys: []
+            actionKeys: [],
+            mockTitle: "",
+            mockContent: "",
+            mockResult: ""
         }
         this.rulesSelection = new Selection({
             getKey: (_, i) => i,
@@ -141,7 +149,10 @@ class RulesTab extends React.Component<RulesTabProps, RulesTabState> {
     }
     onSourceOptionChange = (_, item: IDropdownOption) => {
         this.initRuleEdit()
-        this.setState({ sid: item.key as string, selectedRules: [], editIndex: -1 })
+        this.setState({ 
+            sid: item.key as string, selectedRules: [], editIndex: -1,
+            mockTitle: "", mockContent: "", mockResult: ""
+        })
     }
 
     searchOptions = (): IDropdownOption[] => [
@@ -241,6 +252,19 @@ class RulesTab extends React.Component<RulesTabProps, RulesTabState> {
         return items
     }
 
+    testMockItem = () => {
+        let parsed = { title: this.state.mockTitle }
+        let source = this.props.sources[parseInt(this.state.sid)]
+        let item = new RSSItem(parsed as Parser.Item, source)
+        item.snippet = this.state.mockContent
+        SourceRule.applyAll(this.getSourceRules(), item)
+        let result = []
+        result.push(intl.get(item.hasRead ? "article.markRead" : "article.markUnread"))
+        if (item.starred) result.push(intl.get("article.star"))
+        if (item.hidden) result.push(intl.get("article.hide"))
+        this.setState({ mockResult: result.join(", ") })
+    }
+
     render = () => (
         <div className="tab-body">
             <Stack horizontal tokens={{childrenGap: 16}}>
@@ -331,6 +355,31 @@ class RulesTab extends React.Component<RulesTabProps, RulesTabState> {
                         selection={this.rulesSelection}
                         selectionMode={SelectionMode.multiple} />
                 </MarqueeSelection>
+                <span className="settings-hint up">{intl.get("rules.hint")}</span>
+
+                <Label>{intl.get("rules.test")}</Label>
+                <Stack horizontal>
+                    <Stack.Item grow>
+                        <TextField
+                            name="mockTitle"
+                            placeholder={intl.get("rules.title")}
+                            value={this.state.mockTitle}
+                            onChange={this.handleInputChange} />
+                    </Stack.Item>
+                    <Stack.Item grow>
+                        <TextField
+                            name="mockContent"
+                            placeholder={intl.get("rules.content")}
+                            value={this.state.mockContent}
+                            onChange={this.handleInputChange} />
+                    </Stack.Item>
+                    <Stack.Item>
+                        <PrimaryButton
+                            text={intl.get("confirm")}
+                            onClick={this.testMockItem} />
+                    </Stack.Item>
+                </Stack>
+                <span className="settings-hint up">{this.state.mockResult}</span>
             </>)}
         </div>
     )

src/scripts/i18n/en-US.json

@@ -134,13 +134,16 @@
         "if": "If",
         "then": "Then",
         "title": "Title",
+        "content": "Content",
         "fullSearch": "Title or content",
         "match": "matches",
         "notMatch": "doesn't match",
         "regex": "Regular expression",
         "badRegex": "Invalid regular expression.",
         "action": "Actions",
-        "selectAction": "Select actions"
+        "selectAction": "Select actions",
+        "hint": "Rules will be applied in order. Drag and drop to reorder.",
+        "test": "Test rules"
     },
     "app": {
         "cleanup": "Clean up",

src/scripts/i18n/zh-CN.json

@@ -134,13 +134,16 @@
         "if": "若",
         "then": "则",
         "title": "标题",
+        "content": "正文",
         "fullSearch": "标题或正文",
         "match": "匹配",
         "notMatch": "不匹配",
         "regex": "正则表达式",
         "badRegex": "正则表达式非法",
         "action": "行为",
-        "selectAction": "选择行为"
+        "selectAction": "选择行为",
+        "hint": "规则将按顺序执行，拖拽以排序",
+        "test": "测试规则"
     },
     "app": {
         "cleanup": "清理",

src/scripts/models/source.ts

@@ -58,6 +58,7 @@ export class RSSSource {
                     reject(err)
                 } else if (doc === null) {
                     RSSItem.parseContent(i, item)
+                    if (source.rules) SourceRule.applyAll(source.rules, i)
                     resolve(i)
                 } else {
                     resolve(null)
@@ -367,9 +368,10 @@ export function sourceReducer(
                 case ActionStatus.Success: {
                     let updateMap = new Map<number, number>()
                     for (let item of action.items) {
-                        updateMap.set(
+                        if (!item.hasRead) { updateMap.set(
                             item.source, 
-                            updateMap.has(item.source) ? (updateMap.get(item.source) + 1) : 1)
+                            updateMap.has(item.source) ? (updateMap.get(item.source) + 1) : 1
+                        )}
                     }
                     let nextState = {} as SourceState
                     for (let [s, source] of Object.entries(state)) {