tbabej/taskwiki
1
0
Fork 0
mirror of https://github.com/tbabej/taskwiki.git synced 2025-08-19 06:43:06 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #102 from jbaum98/bugfix-101

Browse source 
Fix #101
This commit is contained in:
Tomas Babej 2016-09-22 17:34:47 +02:00 • committed by GitHub
commit 29446329c8
2 changed files with 14 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

2
taskwiki/viewport.py
View file

@ -73,7 +73,9 @@ class ViewPort(object):
# Get the initial version of the taskfilter args
taskfilter_args = list(constants.DEFAULT_VIEWPORT_VIRTUAL_TAGS)
taskfilter_args += "("
taskfilter_args += util.tw_modstring_to_args(filterstring)
taskfilter_args += ")"
# Process syntactic sugar: Context expansion
detected_contexts = []

24
tests/test_viewport_parsing.py
View file

@ -27,7 +27,7 @@ class TestParsingVimwikiTask(object):
self.cache.buffer[0] = "== Test | project:Home =="
port = self.ViewPort.from_line(0, self.cache)
assert port.taskfilter == list(DEFAULT_VIEWPORT_VIRTUAL_TAGS) + ["project:Home"]
assert port.taskfilter == list(DEFAULT_VIEWPORT_VIRTUAL_TAGS) + ["(", "project:Home", ")"]
assert port.name == "Test"
assert port.sort == DEFAULT_SORT_ORDER
assert port.tw == 'default'
@ -36,7 +36,7 @@ class TestParsingVimwikiTask(object):
self.cache.buffer[0] = "== Test | project:Home | +home =="
port = self.ViewPort.from_line(0, self.cache)
assert port.taskfilter == list(DEFAULT_VIEWPORT_VIRTUAL_TAGS) + ["project:Home"]
assert port.taskfilter == list(DEFAULT_VIEWPORT_VIRTUAL_TAGS) + ["(", "project:Home", ")"]
assert port.name == "Test"
assert port.defaults == {'tags':['home']}
assert port.sort == DEFAULT_SORT_ORDER
@ -46,7 +46,7 @@ class TestParsingVimwikiTask(object):
self.cache.buffer[0] = "== Test | project:Home #T =="
port = self.ViewPort.from_line(0, self.cache)
assert port.taskfilter == list(DEFAULT_VIEWPORT_VIRTUAL_TAGS) + ["project:Home"]
assert port.taskfilter == list(DEFAULT_VIEWPORT_VIRTUAL_TAGS) + ["(", "project:Home", ")"]
assert port.name == "Test"
assert port.sort == DEFAULT_SORT_ORDER
assert port.tw == 'extra'
@ -55,7 +55,7 @@ class TestParsingVimwikiTask(object):
self.cache.buffer[0] = "== Test | project:Home $T =="
port = self.ViewPort.from_line(0, self.cache)
assert port.taskfilter == list(DEFAULT_VIEWPORT_VIRTUAL_TAGS) + ["project:Home"]
assert port.taskfilter == list(DEFAULT_VIEWPORT_VIRTUAL_TAGS) + ["(", "project:Home", ")"]
assert port.name == "Test"
assert port.sort == 'extra'
assert port.tw == 'default'
@ -64,7 +64,7 @@ class TestParsingVimwikiTask(object):
self.cache.buffer[0] = "== Test | project:Home or project:Work $T =="
port = self.ViewPort.from_line(0, self.cache)
assert port.taskfilter == list(DEFAULT_VIEWPORT_VIRTUAL_TAGS) + ["project:Home", "or", "project:Work"]
assert port.taskfilter == list(DEFAULT_VIEWPORT_VIRTUAL_TAGS) + ["(", "project:Home", "or", "project:Work", ")"]
assert port.name == "Test"
assert port.sort == 'extra'
assert port.tw == 'default'
@ -73,7 +73,7 @@ class TestParsingVimwikiTask(object):
self.cache.buffer[0] = "== Test | project:Home #T $T =="
port = self.ViewPort.from_line(0, self.cache)
assert port.taskfilter == list(DEFAULT_VIEWPORT_VIRTUAL_TAGS) + ["project:Home"]
assert port.taskfilter == list(DEFAULT_VIEWPORT_VIRTUAL_TAGS) + ["(", "project:Home", ")"]
assert port.name == "Test"
assert port.sort == 'extra'
assert port.tw == 'extra'
@ -82,7 +82,7 @@ class TestParsingVimwikiTask(object):
self.cache.buffer[0] = "== Test | project:Home | +home #T =="
port = self.ViewPort.from_line(0, self.cache)
assert port.taskfilter == list(DEFAULT_VIEWPORT_VIRTUAL_TAGS) + ["project:Home"]
assert port.taskfilter == list(DEFAULT_VIEWPORT_VIRTUAL_TAGS) + ["(", "project:Home", ")"]
assert port.name == "Test"
assert port.defaults == {'tags':['home']}
assert port.sort == DEFAULT_SORT_ORDER
@ -92,7 +92,7 @@ class TestParsingVimwikiTask(object):
self.cache.buffer[0] = "== Test | project:Home | +home #T $T =="
port = self.ViewPort.from_line(0, self.cache)
assert port.taskfilter == list(DEFAULT_VIEWPORT_VIRTUAL_TAGS) + ["project:Home"]
assert port.taskfilter == list(DEFAULT_VIEWPORT_VIRTUAL_TAGS) + ["(", "project:Home", ")"]
assert port.name == "Test"
assert port.defaults == {'tags':['home']}
assert port.sort == 'extra'
@ -102,7 +102,7 @@ class TestParsingVimwikiTask(object):
self.cache.buffer[0] = "== Test | project:Home !?DELETED =="
port = self.ViewPort.from_line(0, self.cache)
assert port.taskfilter == ["-PARENT", "project:Home"]
assert port.taskfilter == ["-PARENT", "(", "project:Home", ")"]
assert port.name == "Test"
assert port.defaults == {'project':'Home'}
assert port.sort == DEFAULT_SORT_ORDER
@ -112,7 +112,7 @@ class TestParsingVimwikiTask(object):
self.cache.buffer[0] = "== Test | project:Home !+DELETED =="
port = self.ViewPort.from_line(0, self.cache)
assert port.taskfilter == ["+DELETED", "-PARENT", "project:Home"]
assert port.taskfilter == ["+DELETED", "-PARENT", "(", "project:Home", ")"]
assert port.name == "Test"
assert port.defaults == {'project':'Home'}
assert port.sort == DEFAULT_SORT_ORDER
@ -122,7 +122,7 @@ class TestParsingVimwikiTask(object):
self.cache.buffer[0] = "== Test | project:Home !-DELETED =="
port = self.ViewPort.from_line(0, self.cache)
assert port.taskfilter == ["-DELETED", "-PARENT","project:Home"]
assert port.taskfilter == ["-DELETED", "-PARENT", "(", "project:Home", ")"]
assert port.name == "Test"
assert port.defaults == {'project':'Home'}
assert port.sort == DEFAULT_SORT_ORDER
@ -132,7 +132,7 @@ class TestParsingVimwikiTask(object):
self.cache.buffer[0] = "== Test | project:Home +DELETED =="
port = self.ViewPort.from_line(0, self.cache)
assert port.taskfilter == ["-PARENT", "project:Home", "+DELETED"]
assert port.taskfilter == ["-PARENT", "(", "project:Home", "+DELETED", ")"]
assert port.name == "Test"
assert port.defaults == {'project':'Home'}
assert port.sort == DEFAULT_SORT_ORDER