Skip to content

Commit eba15d3

Browse files
created base sieve objects for handlers
1 parent 9c6471a commit eba15d3

34 files changed

Lines changed: 84 additions & 95 deletions

sifter/commands/discard.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
# section 4.4
1212
class CommandDiscard(Command):
1313

14-
RULE_IDENTIFIER = 'DISCARD'
14+
HANDLER_ID = 'DISCARD'
1515

1616
def evaluate(self, message: Message, state: EvaluationState) -> Optional[Actions]:
1717
state.actions.cancel_implicit_keep()

sifter/commands/fileinto.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
# section 4.1
1414
class CommandFileInto(Command):
1515

16-
RULE_IDENTIFIER = 'FILEINTO'
16+
HANDLER_ID = 'FILEINTO'
1717
POSITIONAL_ARGS = [StringList(length=1)]
1818

1919
def evaluate(self, message: Message, state: EvaluationState) -> Optional[Actions]:

sifter/commands/if_cmd.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,12 @@ def evaluate(self, message: Message, state: EvaluationState) -> Optional[Actions
2525

2626
class CommandIf(CommandIfBase):
2727

28-
RULE_IDENTIFIER = 'IF'
28+
HANDLER_ID = 'IF'
2929

3030

3131
class CommandElsIf(CommandIfBase):
3232

33-
RULE_IDENTIFIER = 'ELSIF'
33+
HANDLER_ID = 'ELSIF'
3434

3535
def evaluate(self, message: Message, state: EvaluationState) -> Optional[Actions]:
3636
if state.last_if:
@@ -40,7 +40,7 @@ def evaluate(self, message: Message, state: EvaluationState) -> Optional[Actions
4040

4141
class CommandElse(Command):
4242

43-
RULE_IDENTIFIER = 'ELSE'
43+
HANDLER_ID = 'ELSE'
4444
TESTS_MIN = 0
4545
HAS_BLOCKS = False
4646

sifter/commands/imap4flags.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515

1616
class CommandSetFlag(Command):
1717

18-
RULE_IDENTIFIER = 'SETFLAG'
18+
HANDLER_ID = 'SETFLAG'
1919
POSITIONAL_ARGS = [StringList()]
2020

2121
def evaluate(self, message: Message, state: EvaluationState) -> Optional[Actions]:
@@ -28,7 +28,7 @@ def evaluate(self, message: Message, state: EvaluationState) -> Optional[Actions
2828

2929
class CommandRemoveFlag(Command):
3030

31-
RULE_IDENTIFIER = 'REMOVEFLAG'
31+
HANDLER_ID = 'REMOVEFLAG'
3232
POSITIONAL_ARGS = [StringList()]
3333

3434
def evaluate(self, message: Message, state: EvaluationState) -> Optional[Actions]:
@@ -41,7 +41,7 @@ def evaluate(self, message: Message, state: EvaluationState) -> Optional[Actions
4141

4242
class CommandAddFlag(Command):
4343

44-
RULE_IDENTIFIER = 'ADDFLAG'
44+
HANDLER_ID = 'ADDFLAG'
4545
POSITIONAL_ARGS = [StringList()]
4646

4747
def evaluate(self, message: Message, state: EvaluationState) -> Optional[Actions]:

sifter/commands/keep.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
# section 4.3
1212
class CommandKeep(Command):
1313

14-
RULE_IDENTIFIER = 'KEEP'
14+
HANDLER_ID = 'KEEP'
1515
HAS_BLOCKS = False
1616

1717
def evaluate(self, message: Message, state: EvaluationState) -> Optional[Actions]:

sifter/commands/notify.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
# RFC 5435
1616
class CommandNotify(Command):
1717

18-
RULE_IDENTIFIER = 'NOTIFY'
18+
HANDLER_ID = 'NOTIFY'
1919
TAGGED_ARGS = {
2020
'from': Tag('FROM', (StringList(1),)),
2121
'importance': Tag('IMPORTANCE', (StringList(1),)),

sifter/commands/redirect.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
# section 4.2
2727
class CommandRedirect(Command):
2828

29-
RULE_IDENTIFIER = 'REDIRECT'
29+
HANDLER_ID = 'REDIRECT'
3030
POSITIONAL_ARGS = [StringList(length=1)]
3131

3232
def __init__(

sifter/commands/reject.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
# section 3.2
1414
class CommandReject(Command):
1515

16-
RULE_IDENTIFIER: Text = 'REJECT'
16+
HANDLER_ID: Text = 'REJECT'
1717
POSITIONAL_ARGS = [StringList()]
1818

1919
def evaluate(self, message: Message, state: EvaluationState) -> Optional[Actions]:
@@ -25,4 +25,4 @@ def evaluate(self, message: Message, state: EvaluationState) -> Optional[Actions
2525

2626
class CommandEReject(CommandReject):
2727

28-
RULE_IDENTIFIER: Text = 'EREJECT'
28+
HANDLER_ID: Text = 'EREJECT'

sifter/commands/require.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
# section 3.2
1515
class CommandRequire(Command):
1616

17-
RULE_IDENTIFIER: Text = 'REQUIRE'
17+
HANDLER_ID: Text = 'REQUIRE'
1818
POSITIONAL_ARGS = [StringList()]
1919

2020
def evaluate(self, message: Message, state: EvaluationState) -> Optional[Actions]:

sifter/commands/stop.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
# section 3.3
1212
class CommandStop(Command):
1313

14-
RULE_IDENTIFIER = 'STOP'
14+
HANDLER_ID = 'STOP'
1515

1616
def evaluate(self, message: Message, state: EvaluationState) -> Optional[Actions]:
1717
state.actions.append('stop')

0 commit comments

Comments
 (0)