minor changes: port data, misc actions

4 files changed, 53 insertions, 35 deletions

diff --git a/tagit/actions/misc.py b/tagit/actions/misc.py
index 387ed99..b7d0a87 100644
--- a/tagit/actions/misc.py
+++ b/tagit/actions/misc.py
@@ -59,6 +59,7 @@ class ShellDrop(Action):
     text = kp.StringProperty('Shell')
 
     def apply(self):
+        from pprint import pprint as pp
         loc = globals()
         loc.update(locals())
         code.interact(banner='tagit shell', local=loc)
@@ -77,6 +78,7 @@ class OpenExternal(Action):
         return Binding.check(evt, self.cfg('bindings', 'misc', 'open'))
 
     def apply(self):
+        return # FIXME: mb/port
         with self.root.browser as browser:
             if browser.cursor is None:
                 logger.error('No file selected')
diff --git a/tagit/actions/search.py b/tagit/actions/search.py
index 323f53e..ca36a51 100644
--- a/tagit/actions/search.py
+++ b/tagit/actions/search.py
@@ -79,6 +79,7 @@ class Search(Action, StorageAwareMixin, ConfigAwareMixin):
         Cache.remove(self._CACHE_CATEGORY, None)
 
     def on_predicate_modified(self, sender, predicate, objects, diff):
+        Cache.remove(self._CACHE_CATEGORY, None) # clears the whole cache
         self.apply()
         return # FIXME: mb/port
         tbd = set()
diff --git a/tagit/apps/desktop.py b/tagit/apps/desktop.py
index 89fdce2..7b21336 100644
--- a/tagit/apps/desktop.py
+++ b/tagit/apps/desktop.py
@@ -56,41 +56,8 @@ class TagitApp(App):
         store.migrate(required_schema)
 
         # FIXME: debug: add some data to the storage
-        t_hello = store.node(ns.bsfs.Tag, URI('http://example.com/me/tag#hello')).set(ns.bst.label, 'hello')
-        t_world = store.node(ns.bsfs.Tag, URI('http://example.com/me/tag#world')).set(ns.bst.label, 'world')
-        t_foobar = store.node(ns.bsfs.Tag, URI('http://example.com/me/tag#foobar')).set(ns.bst.label, 'foobar')
-        grp = store.node(ns.bsfs.Group, URI('http://example.com/me/group#1234'))
-
-        n0 = store.node(ns.bsfs.File, URI('http://example.com/me/entity#01')) \
-                .set(ns.bse.filename, 'textfile.t') \
-                .set(ns.bse.filesize, 100) \
-                .set(ns.bse.tag, t_hello) \
-                .set(ns.bse.tag, t_foobar) \
-                .set(ns.bse.latitude, 47.374444) \
-                .set(ns.bse.longitude, 8.541111) \
-                .set(ns.bse.group, grp)
-        n1 = store.node(ns.bsfs.File, URI('http://example.com/me/entity#02')) \
-                .set(ns.bse.filename, 'document.pdf') \
-                .set(ns.bse.filesize, 200) \
-                .set(ns.bse.tag, t_world) \
-                .set(ns.bse.tag, t_foobar) \
-                .set(ns.bse.group, grp)
-        n2 = store.node(ns.bsfs.File, URI('http://example.com/me/entity#03')) \
-                .set(ns.bse.filename, 'document.odt') \
-                .set(ns.bse.filesize, 300) \
-                .set(ns.bse.tag, t_world)
-        n3 = store.node(ns.bsfs.File, URI('http://example.com/me/entity#04')) \
-                .set(ns.bse.filename, 'image.jpg') \
-                .set(ns.bse.comment, 'some image') \
-                .set(ns.bse.tag, t_hello) \
-                .set(ns.bse.tag, t_foobar) \
-                .set(ns.bse.group, grp)
-        n4 = store.node(ns.bsfs.File, URI('http://example.com/me/entity#05')) \
-                .set(ns.bse.filename, 'image.png') \
-                .set(ns.bse.comment, 'another image') \
-                .set(ns.bse.tag, t_hello)
-
-        grp.set(ns.bsg.represented_by, n0)
+        from . import port_data
+        port_data.add_port_data(store)
 
         # create widget
         return desktop.MainWindow(cfg, store, None) # FIXME: expects cfg, stor, log arguments
diff --git a/tagit/apps/port_data.py b/tagit/apps/port_data.py
new file mode 100644
index 0000000..1d9f4e6
--- /dev/null
+++ b/tagit/apps/port_data.py
@@ -0,0 +1,48 @@
+import os
+from tagit.utils import ns
+from tagit.utils.bsfs import URI
+
+def add_port_data(store):
+        # tags
+        t_hello = store.node(ns.bsfs.Tag, URI('http://example.com/me/tag#hello')) \
+                .set(ns.bst.label, 'hello')
+        t_world = store.node(ns.bsfs.Tag, URI('http://example.com/me/tag#world')) \
+                .set(ns.bst.label, 'world')
+        t_foobar = store.node(ns.bsfs.Tag, URI('http://example.com/me/tag#foobar')) \
+                .set(ns.bst.label, 'foobar')
+
+        # entities
+        n0 = store.node(ns.bsfs.File, URI('http://example.com/me/entity#01')) \
+                .set(ns.bse.filename, 'textfile.t') \
+                .set(ns.bse.filesize, 100) \
+                .set(ns.bse.tag, t_hello) \
+                .set(ns.bse.tag, t_foobar) \
+                .set(ns.bse.latitude, 47.374444) \
+                .set(ns.bse.longitude, 8.541111)
+        n1 = store.node(ns.bsfs.File, URI('http://example.com/me/entity#02')) \
+                .set(ns.bse.filename, 'document.pdf') \
+                .set(ns.bse.filesize, 200) \
+                .set(ns.bse.tag, t_world) \
+                .set(ns.bse.tag, t_foobar)
+        n2 = store.node(ns.bsfs.File, URI('http://example.com/me/entity#03')) \
+                .set(ns.bse.filename, 'document.odt') \
+                .set(ns.bse.filesize, 300) \
+                .set(ns.bse.tag, t_world)
+        n3 = store.node(ns.bsfs.File, URI('http://example.com/me/entity#04')) \
+                .set(ns.bse.filename, 'image.jpg') \
+                .set(ns.bse.comment, 'some image') \
+                .set(ns.bse.tag, t_hello) \
+                .set(ns.bse.tag, t_foobar)
+        n4 = store.node(ns.bsfs.File, URI('http://example.com/me/entity#05')) \
+                .set(ns.bse.filename, 'image.png') \
+                .set(ns.bse.comment, 'another image') \
+                .set(ns.bse.tag, t_hello)
+
+        # groups
+        grp = store.node(ns.bsfs.Group, URI('http://example.com/me/group#1234'))
+        grp.set(ns.bsg.represented_by, n0)
+        n0.set(ns.bse.group, grp)
+        n1.set(ns.bse.group, grp)
+        n3.set(ns.bse.group, grp)
+
+