From 580caf6f5c9b795f9c38b9c970efce12d006ce1d Mon Sep 17 00:00:00 2001 From: Matthias Baumgartner Date: Fri, 17 Feb 2023 08:25:44 +0100 Subject: New UI design * Moved style definitions to its own file (themes/default) * Updated the desktop.kv to the new UI design * Removed planes * Adjusted port config --- tagit/apps/port-config.yaml | 79 ++++++++++++++++++++++----------------------- 1 file changed, 38 insertions(+), 41 deletions(-) (limited to 'tagit/apps') diff --git a/tagit/apps/port-config.yaml b/tagit/apps/port-config.yaml index a9907b7..323d616 100644 --- a/tagit/apps/port-config.yaml +++ b/tagit/apps/port-config.yaml @@ -7,9 +7,9 @@ session: backend: SparqlStore: {} user: 'http://example.com/me' - script: + script: [] #- ShowBrowsing - - [AddToken, 'hello'] + #- [AddToken, 'hello'] storage: index: preview_size: @@ -18,8 +18,11 @@ storage: - 400 ui: standalone: - plane: browsing + window_size: [1024, 768] + maximize: True keytriggers: + #- ClipboardCopy + #- ClipboardPaste - CreateGroup - DissolveGroup - AddToGroup @@ -55,17 +58,37 @@ ui: - OpenExternal - ShowHelp browser: + cols: 4 + rows: 3 maxcols: 8 maxrows: 8 + #gridmode: 'list' buttondocks: + navigation_left: + - MoveCursorFirst + - PreviousPage + - ScrollUp + navigation_right: + - NextPage + - ScrollDown + - MoveCursorLast + filter: + - GoBack + - GoForth + status: + - ZoomIn + - ZoomOut + #- RotateLeft + #- DeleteObject + #- RotateRight sidebar_left: - Menu - - ShowDashboard - - AddToken - AddTag - EditTag - - CreateGroup - - DissolveGroup + - ShowSelected + - RemoveSelected + #- CreateGroup + #- DissolveGroup - SelectAll - SelectNone - SelectInvert @@ -74,16 +97,13 @@ ui: - SelectSingle - SelectMulti - SelectRange - - ShellDrop - filter: - - AddToken - - EditToken context: app: - - ShowSettings + - LoadSession - ShowHelp - ShowConsole - - ShowBrowsing + - ShellDrop + - ShowSettings browser: - ZoomIn - ZoomOut @@ -96,11 +116,11 @@ ui: - AddToGroup # - RepresentGroup # - RemoveFromGroup - root: - - LoadSession - # search: - # - ShowSelected - # - RemoveSelected + search: + - ShowSelected + - RemoveSelected + - GoForth + - GoBack select: - SelectAll - SelectNone @@ -127,28 +147,5 @@ ui: - camera - attributes tiledocks: - dashboard: {} - #Buttons: - # buttons: - # - ShowBrowsing - # - CreateSession - # - CreateTempSession - # - LoadSession - # - ReloadSession - # - ImportObjects - # - ItemExport - # - UpdateSelectedObjects - # - ShowHelp - # - ShowSettings - #Hints: {} - #LibSummary: {} - #Searchtree: {} - #TagHistogram: {} - #Tagcloud: {} sidebar_right: Info: {} - CursorTags: {} - BrowserTags: {} - #SelectionTags: {} - #Geo: {} - window_size: 1024x768 -- cgit v1.2.3 From 6889cff096d30e76cc5379ee68da42b555895eed Mon Sep 17 00:00:00 2001 From: Matthias Baumgartner Date: Fri, 17 Feb 2023 08:32:27 +0100 Subject: info tile update and port data loading --- tagit/apps/port_data.py | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'tagit/apps') diff --git a/tagit/apps/port_data.py b/tagit/apps/port_data.py index cda2d63..fc11b4d 100644 --- a/tagit/apps/port_data.py +++ b/tagit/apps/port_data.py @@ -1,8 +1,20 @@ + +# standard imports import os +import pickle + +# tagit imports from tagit.utils import ns from tagit.utils.bsfs import URI +# load data def add_port_data(store): + with open(os.path.join(os.path.dirname(__file__), 'port-data.pkl'), 'rb') as ifile: + for triple in pickle.load(ifile): + store._backend._graph.add(triple) + + +def add_port_data2(store): # tags t_hello = store.node(ns.bsfs.Tag, URI('http://example.com/me/tag#hello')) \ .set(ns.bst.label, 'hello') -- cgit v1.2.3 From 141cfeade2750e0255ca010079421efce4abeca2 Mon Sep 17 00:00:00 2001 From: Matthias Baumgartner Date: Sat, 4 Mar 2023 14:16:00 +0100 Subject: namespace updates --- tagit/apps/port-schema.nt | 81 +++++++++++++++++++++++++---------------------- tagit/apps/port_data.py | 40 +++++++++++------------ 2 files changed, 64 insertions(+), 57 deletions(-) (limited to 'tagit/apps') diff --git a/tagit/apps/port-schema.nt b/tagit/apps/port-schema.nt index 7569052..2e70cad 100644 --- a/tagit/apps/port-schema.nt +++ b/tagit/apps/port-schema.nt @@ -5,57 +5,59 @@ prefix xsd: prefix schema: # common bsfs prefixes -prefix bsfs: -prefix bse: -prefix bst: -prefix bsg: -prefix bsp: +prefix bsfs: +prefix bsl: +prefix bsn: +prefix bse: +prefix bst: +prefix bsg: +prefix bsp: # essential nodes -bsfs:Entity rdfs:subClassOf bsfs:Node . -bsfs:Preview rdfs:subClassOf bsfs:Node . -bsfs:File rdfs:subClassOf bsfs:Entity . -bsfs:Tag rdfs:subClassOf bsfs:Node . -bsfs:Group rdfs:subClassOf bsfs:Node . +bsn:Entity rdfs:subClassOf bsfs:Node . +bsn:Preview rdfs:subClassOf bsfs:Node . +bsn:Tag rdfs:subClassOf bsfs:Node . +bsn:Group rdfs:subClassOf bsfs:Node . # common definitions -bsfs:BinaryBlob rdfs:subClassOf bsfs:Literal . -bsfs:URI rdfs:subClassOf bsfs:Literal . -bsfs:Number rdfs:subClassOf bsfs:Literal . -bsfs:Time rdfs:subClassOf bsfs:Literal . -bsfs:JPEG rdfs:subClassOf bsfs:BinaryBlob . +bsl:BinaryBlob rdfs:subClassOf bsfs:Literal . +bsl:URI rdfs:subClassOf bsfs:Literal . +bsl:Number rdfs:subClassOf bsfs:Literal . +bsl:Time rdfs:subClassOf bsfs:Literal . + rdfs:subClassOf bsl:BinaryBlob . xsd:string rdfs:subClassOf bsfs:Literal . -xsd:integer rdfs:subClassOf bsfs:Number . +xsd:integer rdfs:subClassOf bsl:Number . +xsd:float rdfs:subClassOf bsl:Number . bse:filename rdfs:subClassOf bsfs:Predicate ; - rdfs:domain bsfs:File ; + rdfs:domain bsn:Entity ; rdfs:range xsd:string ; rdfs:label "File name"^^xsd:string ; schema:description "Filename of entity in some filesystem."^^xsd:string ; bsfs:unique "true"^^xsd:boolean . bse:filesize rdfs:subClassOf bsfs:Predicate ; - rdfs:domain bsfs:File ; + rdfs:domain bsn:Entity ; rdfs:range xsd:integer ; rdfs:label "File size"^^xsd:string ; schema:description "File size of entity in some filesystem."^^xsd:string ; bsfs:unique "true"^^xsd:boolean . bse:mime rdfs:subClassOf bsfs:Predicate ; - rdfs:domain bsfs:File ; + rdfs:domain bsn:Entity ; rdfs:range xsd:string ; bsfs:unique "true"^^xsd:boolean . bse:preview rdfs:subClassOf bsfs:Predicate ; - rdfs:domain bsfs:Entity ; - rdfs:range bsfs:Preview . + rdfs:domain bsn:Entity ; + rdfs:range bsn:Preview . bse:tag rdfs:subClassOf bsfs:Predicate ; - rdfs:domain bsfs:File ; - rdfs:range bsfs:Tag . + rdfs:domain bsn:Entity ; + rdfs:range bsn:Tag . bst:label rdfs:subClassOf bsfs:Predicate ; - rdfs:domain bsfs:Tag ; + rdfs:domain bsn:Tag ; rdfs:range xsd:string ; bsfs:unique "true"^^xsd:boolean . @@ -64,45 +66,50 @@ bse:comment rdfs:subClassOf bsfs:Predicate ; rdfs:range xsd:string . bse:group rdfs:subClassOf bsfs:Predicate ; - rdfs:domain bsfs:Entity ; - rdfs:range bsfs:Group . + rdfs:domain bsn:Entity ; + rdfs:range bsn:Group . + +bsg:label rdfs:subClassOf bsfs:Predicate ; + rdfs:domain bsn:Group ; + rdfs:range xsd:string ; + bsfs:unique "true"^^xsd:boolean . bsg:represented_by rdfs:subClassOf bsfs:Predicate ; - rdfs:domain bsfs:Group ; - rdfs:range bsfs:File ; + rdfs:domain bsn:Group ; + rdfs:range bsn:Entity ; bsfs:unique "true"^^xsd:boolean . bse:longitude rdfs:subClassOf bsfs:Predicate ; - rdfs:domain bsfs:File ; - rdfs:range xsd:integer ; + rdfs:domain bsn:Entity ; + rdfs:range xsd:float ; bsfs:unique "true"^^xsd:boolean . bse:latitude rdfs:subClassOf bsfs:Predicate ; - rdfs:domain bsfs:File ; - rdfs:range xsd:integer ; + rdfs:domain bsn:Entity ; + rdfs:range xsd:float ; bsfs:unique "true"^^xsd:boolean . ## preview nodes bsp:width rdfs:subClassOf bsfs:Predicate ; - rdfs:domain bsfs:Preview ; + rdfs:domain bsn:Preview ; rdfs:range xsd:integer ; bsfs:unique "true"^^xsd:boolean . bsp:height rdfs:subClassOf bsfs:Predicate ; - rdfs:domain bsfs:Preview ; + rdfs:domain bsn:Preview ; rdfs:range xsd:integer ; bsfs:unique "true"^^xsd:boolean . bsp:orientation rdfs:subClassOf bsfs:Predicate ; - rdfs:domain bsfs:Preview ; + rdfs:domain bsn:Preview ; rdfs:range xsd:integer ; bsfs:unique "true"^^xsd:boolean . bsp:asset rdfs:subClassOf bsfs:Predicate ; - rdfs:domain bsfs:Preview ; - rdfs:range bsfs:JPEG ; + rdfs:domain bsn:Preview ; + rdfs:range ; bsfs:unique "true"^^xsd:boolean . diff --git a/tagit/apps/port_data.py b/tagit/apps/port_data.py index fc11b4d..11faaef 100644 --- a/tagit/apps/port_data.py +++ b/tagit/apps/port_data.py @@ -16,42 +16,42 @@ def add_port_data(store): def add_port_data2(store): # tags - t_hello = store.node(ns.bsfs.Tag, URI('http://example.com/me/tag#hello')) \ + t_hello = store.node(ns.bsn.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')) \ + t_world = store.node(ns.bsn.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')) \ + t_foobar = store.node(ns.bsn.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')) \ + n0 = store.node(ns.bsn.Entity, 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')) \ + n1 = store.node(ns.bsn.Entity, 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')) \ + n2 = store.node(ns.bsn.Entity, 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')) \ + n3 = store.node(ns.bsn.Entity, 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')) \ + n4 = store.node(ns.bsn.Entity, 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 = store.node(ns.bsn.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) @@ -60,77 +60,77 @@ def add_port_data2(store): # previews base = os.path.join(os.path.dirname(__file__), 'port-data') n0.set(ns.bse.preview, - store.node(ns.bsfs.Preview, URI('http://example.com/me/preview#ent01_w100_h100')) \ + store.node(ns.bsn.Preview, URI('http://example.com/me/preview#ent01_w100_h100')) \ .set(ns.bsp.width, 100) \ .set(ns.bsp.height, 100) \ .set(ns.bsp.orientation, 1) \ .set(ns.bsp.asset, open(os.path.join(base, 'ent01_w100_h100.jpg'), 'rb').read()) ) n0.set(ns.bse.preview, - store.node(ns.bsfs.Preview, str('http://example.com/me/preview#ent01_w400_h200')) \ + store.node(ns.bsn.Preview, str('http://example.com/me/preview#ent01_w400_h200')) \ .set(ns.bsp.width, 200) \ .set(ns.bsp.height, 400) \ .set(ns.bsp.orientation, 1) \ .set(ns.bsp.asset, open(os.path.join(base, 'ent01_w400_h200.jpg'), 'rb').read()) ) n0.set(ns.bse.preview, - store.node(ns.bsfs.Preview, URI('http://example.com/me/preview#ent01_w400_h400')) \ + store.node(ns.bsn.Preview, URI('http://example.com/me/preview#ent01_w400_h400')) \ .set(ns.bsp.width, 400) \ .set(ns.bsp.height, 400) \ .set(ns.bsp.orientation, 1) \ .set(ns.bsp.asset, open(os.path.join(base, 'ent01_w400_h400.jpg'), 'rb').read()) ) n1.set(ns.bse.preview, - store.node(ns.bsfs.Preview, URI('http://example.com/me/preview#ent02_w100_h100')) \ + store.node(ns.bsn.Preview, URI('http://example.com/me/preview#ent02_w100_h100')) \ .set(ns.bsp.width, 100) \ .set(ns.bsp.height, 100) \ .set(ns.bsp.orientation, 1) \ .set(ns.bsp.asset, open(os.path.join(base, 'ent02_w100_h100.jpg'), 'rb').read()) ) n1.set(ns.bse.preview, - store.node(ns.bsfs.Preview, URI('http://example.com/me/preview#ent02_w400_h200')) \ + store.node(ns.bsn.Preview, URI('http://example.com/me/preview#ent02_w400_h200')) \ .set(ns.bsp.width, 200) \ .set(ns.bsp.height, 400) \ .set(ns.bsp.orientation, 1) \ .set(ns.bsp.asset, open(os.path.join(base, 'ent02_w400_h200.jpg'), 'rb').read()) ) n2.set(ns.bse.preview, - store.node(ns.bsfs.Preview, URI('http://example.com/me/preview#ent03_w100_h100')) \ + store.node(ns.bsn.Preview, URI('http://example.com/me/preview#ent03_w100_h100')) \ .set(ns.bsp.width, 100) \ .set(ns.bsp.height, 100) \ .set(ns.bsp.orientation, 1) \ .set(ns.bsp.asset, open(os.path.join(base, 'ent03_w100_h100.jpg'), 'rb').read()) ) n2.set(ns.bse.preview, - store.node(ns.bsfs.Preview, URI('http://example.com/me/preview#ent03_w400_h200')) \ + store.node(ns.bsn.Preview, URI('http://example.com/me/preview#ent03_w400_h200')) \ .set(ns.bsp.width, 200) \ .set(ns.bsp.height, 400) \ .set(ns.bsp.orientation, 1) \ .set(ns.bsp.asset, open(os.path.join(base, 'ent03_w400_h200.jpg'), 'rb').read()) ) n3.set(ns.bse.preview, - store.node(ns.bsfs.Preview, URI('http://example.com/me/preview#ent04_w100_h100')) \ + store.node(ns.bsn.Preview, URI('http://example.com/me/preview#ent04_w100_h100')) \ .set(ns.bsp.width, 100) \ .set(ns.bsp.height, 100) \ .set(ns.bsp.orientation, 1) \ .set(ns.bsp.asset, open(os.path.join(base, 'ent04_w100_h100.png'), 'rb').read()) ) n3.set(ns.bse.preview, - store.node(ns.bsfs.Preview, URI('http://example.com/me/preview#ent04_w400_h200')) \ + store.node(ns.bsn.Preview, URI('http://example.com/me/preview#ent04_w400_h200')) \ .set(ns.bsp.width, 200) \ .set(ns.bsp.height, 400) \ .set(ns.bsp.orientation, 1) \ .set(ns.bsp.asset, open(os.path.join(base, 'ent04_w400_h200.png'), 'rb').read()) ) n4.set(ns.bse.preview, - store.node(ns.bsfs.Preview, URI('http://example.com/me/preview#ent05_w100_h100')) \ + store.node(ns.bsn.Preview, URI('http://example.com/me/preview#ent05_w100_h100')) \ .set(ns.bsp.width, 100) \ .set(ns.bsp.height, 100) \ .set(ns.bsp.orientation, 1) \ .set(ns.bsp.asset, open(os.path.join(base, 'ent05_w100_h100.jpg'), 'rb').read()) ) n4.set(ns.bse.preview, - store.node(ns.bsfs.Preview, URI('http://example.com/me/preview#ent05_w400_h200')) \ + store.node(ns.bsn.Preview, URI('http://example.com/me/preview#ent05_w400_h200')) \ .set(ns.bsp.width, 200) \ .set(ns.bsp.height, 400) \ .set(ns.bsp.orientation, 1) \ -- cgit v1.2.3 From 02002942a3ea0172538ce3e9a636ea4a089ba870 Mon Sep 17 00:00:00 2001 From: Matthias Baumgartner Date: Sat, 4 Mar 2023 15:19:43 +0100 Subject: integrate tagit script into bsfs.apps --- tagit/apps/__init__.py | 43 ++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 42 insertions(+), 1 deletion(-) (limited to 'tagit/apps') diff --git a/tagit/apps/__init__.py b/tagit/apps/__init__.py index 4c64128..6b4986c 100644 --- a/tagit/apps/__init__.py +++ b/tagit/apps/__init__.py @@ -1,10 +1,51 @@ -""" +#!/usr/bin/env python3 +"""The tagit applications. Part of the tagit module. A copy of the license is provided with the project. Author: Matthias Baumgartner, 2022 """ +# standard imports +import argparse +import typing + +# tagit imports +import tagit + # inner-module imports from .desktop import main as desktop +# exports +__all__: typing.Sequence[str] = ( + 'desktop', + ) + +# config +apps = { + 'desktop' : desktop, + } + + +## code ## + +def main(argv=None): + """The BSFS browser, focused on image tagging.""" + parser = argparse.ArgumentParser(description=main.__doc__, prog='tagit') + # version + parser.add_argument('--version', action='version', + version='%(prog)s {}.{}.{}'.format(*tuple(tagit.version_info))) # pylint: disable=C0209 + # application selection + parser.add_argument('app', choices=apps.keys(), nargs='?', default='desktop', + help='Select the application to run.') + # dangling args + parser.add_argument('rest', nargs=argparse.REMAINDER) + # parse + args = parser.parse_args() + # run application + apps[args.app](args.rest) + +if __name__ == '__main__': + import sys + main(sys.argv[1:]) + ## EOF ## -- cgit v1.2.3 From b5746fd9d49ade49ea77f10010bbabe8da8656d0 Mon Sep 17 00:00:00 2001 From: Matthias Baumgartner Date: Sat, 4 Mar 2023 15:24:18 +0100 Subject: minor fixes --- tagit/apps/__init__.py | 1 + 1 file changed, 1 insertion(+) (limited to 'tagit/apps') diff --git a/tagit/apps/__init__.py b/tagit/apps/__init__.py index 6b4986c..84d0bf1 100644 --- a/tagit/apps/__init__.py +++ b/tagit/apps/__init__.py @@ -18,6 +18,7 @@ from .desktop import main as desktop # exports __all__: typing.Sequence[str] = ( 'desktop', + 'main', ) # config -- cgit v1.2.3 From 9bdf4d104a299577634061bcf698d1c9e5708cce Mon Sep 17 00:00:00 2001 From: Matthias Baumgartner Date: Sat, 4 Mar 2023 15:58:43 +0100 Subject: config loading --- tagit/apps/desktop.py | 8 +-- tagit/apps/port-config.yaml | 151 -------------------------------------------- 2 files changed, 3 insertions(+), 156 deletions(-) delete mode 100644 tagit/apps/port-config.yaml (limited to 'tagit/apps') diff --git a/tagit/apps/desktop.py b/tagit/apps/desktop.py index 7b21336..b02c8f1 100644 --- a/tagit/apps/desktop.py +++ b/tagit/apps/desktop.py @@ -36,12 +36,10 @@ class TagitApp(App): # set title self.title = 'tagit v2.0' - # FIXME: mb/port - # load essentials + # load config + from tagit.config.loader import load_settings, TAGITRC + cfg = load_settings(TAGITRC, 0) - #from tagit.config.loader import load_settings, TAGITRC - #cfg = load_settings(TAGITRC, 0) - cfg = config.Settings.Open(os.path.join(os.path.dirname(__file__), 'port-config.yaml')) # FIXME: mb/port/bsfs # open BSFS storage diff --git a/tagit/apps/port-config.yaml b/tagit/apps/port-config.yaml deleted file mode 100644 index 323d616..0000000 --- a/tagit/apps/port-config.yaml +++ /dev/null @@ -1,151 +0,0 @@ -session: - first_start: false - paths: - searchlog: ~/.tagit.log - bsfs: # FIXME: mb/port: rename to storage, but that space is currently polluted - Graph: - backend: - SparqlStore: {} - user: 'http://example.com/me' - script: [] - #- ShowBrowsing - #- [AddToken, 'hello'] -storage: - index: - preview_size: - - 50 - - 200 - - 400 -ui: - standalone: - window_size: [1024, 768] - maximize: True - keytriggers: - #- ClipboardCopy - #- ClipboardPaste - - CreateGroup - - DissolveGroup - - AddToGroup - - MoveCursorUp - - MoveCursorDown - - MoveCursorLeft - - MoveCursorRight - - MoveCursorLast - - MoveCursorFirst - - NextPage - - PreviousPage - - ScrollDown - - ScrollUp - - ZoomIn - - ZoomOut - - Select - - SelectAll - - SelectNone - - SelectMulti - - SelectRange - - AddToken - - GoBack - - GoForth - - SearchByAddressOnce - - SearchmodeSwitch - - AddTag - - EditTag - - OpenGroup - #- RepresentGroup - - Search - - ShowSelected - - RemoveSelected - - OpenExternal - - ShowHelp - browser: - cols: 4 - rows: 3 - maxcols: 8 - maxrows: 8 - #gridmode: 'list' - buttondocks: - navigation_left: - - MoveCursorFirst - - PreviousPage - - ScrollUp - navigation_right: - - NextPage - - ScrollDown - - MoveCursorLast - filter: - - GoBack - - GoForth - status: - - ZoomIn - - ZoomOut - #- RotateLeft - #- DeleteObject - #- RotateRight - sidebar_left: - - Menu - - AddTag - - EditTag - - ShowSelected - - RemoveSelected - #- CreateGroup - #- DissolveGroup - - SelectAll - - SelectNone - - SelectInvert - - SelectAdditive - - SelectSubtractive - - SelectSingle - - SelectMulti - - SelectRange - context: - app: - - LoadSession - - ShowHelp - - ShowConsole - - ShellDrop - - ShowSettings - browser: - - ZoomIn - - ZoomOut - # clipboard: - # - ClipboardCopy - # - ClipboardPaste - grouping: - - CreateGroup - - DissolveGroup - - AddToGroup - # - RepresentGroup - # - RemoveFromGroup - search: - - ShowSelected - - RemoveSelected - - GoForth - - GoBack - select: - - SelectAll - - SelectNone - - SelectInvert - - SelectSingle - - SelectMulti - - SelectRange - - SelectAdditive - - SelectSubtractive - tagging: - - AddTag - - EditTag - # - SetRank1 - # - SetRank3 - # - SetRank5 - search: - sort_blacklist: - - entity - - flash - - latitude - - longitude - - mime - - author - - camera - - attributes - tiledocks: - sidebar_right: - Info: {} -- cgit v1.2.3 From 01a4c2fc4bcbcce26c29dc9771dedeef5256156b Mon Sep 17 00:00:00 2001 From: Matthias Baumgartner Date: Sat, 4 Mar 2023 16:00:46 +0100 Subject: schema requirements checking --- tagit/apps/desktop.py | 17 +++---- tagit/apps/port-schema.nt | 115 ---------------------------------------------- 2 files changed, 6 insertions(+), 126 deletions(-) delete mode 100644 tagit/apps/port-schema.nt (limited to 'tagit/apps') diff --git a/tagit/apps/desktop.py b/tagit/apps/desktop.py index b02c8f1..d934649 100644 --- a/tagit/apps/desktop.py +++ b/tagit/apps/desktop.py @@ -10,6 +10,7 @@ import typing # kivy imports from kivy.app import App +from kivy.resources import resource_find from kivy.uix.settings import SettingsWithSidebar # tagit imports @@ -41,21 +42,15 @@ class TagitApp(App): cfg = load_settings(TAGITRC, 0) - # FIXME: mb/port/bsfs # open BSFS storage store = bsfs.Open(cfg('session', 'bsfs')) # check storage schema - # FIXME: Move somewhere else?! - with open(os.path.join(os.path.dirname(__file__), 'port-schema.nt'), 'rt') as ifile: + with open(resource_find('required_schema.nt'), 'rt') as ifile: required_schema = bsfs.schema.from_string(ifile.read()) - # FIXME: Since the store isn't persistent, we migrate to the required one here. - #if not required_schema <= store.schema: - # raise Exception('') - store.migrate(required_schema) - - # FIXME: debug: add some data to the storage - from . import port_data - port_data.add_port_data(store) + if not required_schema.consistent_with(store.schema): + raise Exception("The storage's schema is incompatible with tagit's requirements") + if not required_schema <= store.schema: + store.migrate(required_schema | store.schema) # create widget return desktop.MainWindow(cfg, store, None) # FIXME: expects cfg, stor, log arguments diff --git a/tagit/apps/port-schema.nt b/tagit/apps/port-schema.nt deleted file mode 100644 index 2e70cad..0000000 --- a/tagit/apps/port-schema.nt +++ /dev/null @@ -1,115 +0,0 @@ -# common external prefixes -prefix rdf: -prefix rdfs: -prefix xsd: -prefix schema: - -# common bsfs prefixes -prefix bsfs: -prefix bsl: -prefix bsn: -prefix bse: -prefix bst: -prefix bsg: -prefix bsp: - -# essential nodes -bsn:Entity rdfs:subClassOf bsfs:Node . -bsn:Preview rdfs:subClassOf bsfs:Node . -bsn:Tag rdfs:subClassOf bsfs:Node . -bsn:Group rdfs:subClassOf bsfs:Node . - -# common definitions -bsl:BinaryBlob rdfs:subClassOf bsfs:Literal . -bsl:URI rdfs:subClassOf bsfs:Literal . -bsl:Number rdfs:subClassOf bsfs:Literal . -bsl:Time rdfs:subClassOf bsfs:Literal . - rdfs:subClassOf bsl:BinaryBlob . -xsd:string rdfs:subClassOf bsfs:Literal . -xsd:integer rdfs:subClassOf bsl:Number . -xsd:float rdfs:subClassOf bsl:Number . - -bse:filename rdfs:subClassOf bsfs:Predicate ; - rdfs:domain bsn:Entity ; - rdfs:range xsd:string ; - rdfs:label "File name"^^xsd:string ; - schema:description "Filename of entity in some filesystem."^^xsd:string ; - bsfs:unique "true"^^xsd:boolean . - -bse:filesize rdfs:subClassOf bsfs:Predicate ; - rdfs:domain bsn:Entity ; - rdfs:range xsd:integer ; - rdfs:label "File size"^^xsd:string ; - schema:description "File size of entity in some filesystem."^^xsd:string ; - bsfs:unique "true"^^xsd:boolean . - -bse:mime rdfs:subClassOf bsfs:Predicate ; - rdfs:domain bsn:Entity ; - rdfs:range xsd:string ; - bsfs:unique "true"^^xsd:boolean . - -bse:preview rdfs:subClassOf bsfs:Predicate ; - rdfs:domain bsn:Entity ; - rdfs:range bsn:Preview . - -bse:tag rdfs:subClassOf bsfs:Predicate ; - rdfs:domain bsn:Entity ; - rdfs:range bsn:Tag . - -bst:label rdfs:subClassOf bsfs:Predicate ; - rdfs:domain bsn:Tag ; - rdfs:range xsd:string ; - bsfs:unique "true"^^xsd:boolean . - -bse:comment rdfs:subClassOf bsfs:Predicate ; - rdfs:domain bsfs:Node ; - rdfs:range xsd:string . - -bse:group rdfs:subClassOf bsfs:Predicate ; - rdfs:domain bsn:Entity ; - rdfs:range bsn:Group . - -bsg:label rdfs:subClassOf bsfs:Predicate ; - rdfs:domain bsn:Group ; - rdfs:range xsd:string ; - bsfs:unique "true"^^xsd:boolean . - -bsg:represented_by rdfs:subClassOf bsfs:Predicate ; - rdfs:domain bsn:Group ; - rdfs:range bsn:Entity ; - bsfs:unique "true"^^xsd:boolean . - -bse:longitude rdfs:subClassOf bsfs:Predicate ; - rdfs:domain bsn:Entity ; - rdfs:range xsd:float ; - bsfs:unique "true"^^xsd:boolean . - -bse:latitude rdfs:subClassOf bsfs:Predicate ; - rdfs:domain bsn:Entity ; - rdfs:range xsd:float ; - bsfs:unique "true"^^xsd:boolean . - - -## preview nodes - -bsp:width rdfs:subClassOf bsfs:Predicate ; - rdfs:domain bsn:Preview ; - rdfs:range xsd:integer ; - bsfs:unique "true"^^xsd:boolean . - -bsp:height rdfs:subClassOf bsfs:Predicate ; - rdfs:domain bsn:Preview ; - rdfs:range xsd:integer ; - bsfs:unique "true"^^xsd:boolean . - -bsp:orientation rdfs:subClassOf bsfs:Predicate ; - rdfs:domain bsn:Preview ; - rdfs:range xsd:integer ; - bsfs:unique "true"^^xsd:boolean . - -bsp:asset rdfs:subClassOf bsfs:Predicate ; - rdfs:domain bsn:Preview ; - rdfs:range ; - bsfs:unique "true"^^xsd:boolean . - - -- cgit v1.2.3 From 123477ea13f061e4c4898303726811f7965c91dd Mon Sep 17 00:00:00 2001 From: Matthias Baumgartner Date: Sat, 4 Mar 2023 16:01:35 +0100 Subject: misc minor fixes --- tagit/apps/desktop.py | 7 ++----- tagit/apps/port_data.py | 2 ++ 2 files changed, 4 insertions(+), 5 deletions(-) (limited to 'tagit/apps') diff --git a/tagit/apps/desktop.py b/tagit/apps/desktop.py index d934649..b64bf7e 100644 --- a/tagit/apps/desktop.py +++ b/tagit/apps/desktop.py @@ -35,7 +35,7 @@ class TagitApp(App): self.settings_cls = SettingsWithSidebar # set title - self.title = 'tagit v2.0' + self.title = 'tagit v0.23.03' # load config from tagit.config.loader import load_settings, TAGITRC @@ -53,15 +53,12 @@ class TagitApp(App): store.migrate(required_schema | store.schema) # create widget - return desktop.MainWindow(cfg, store, None) # FIXME: expects cfg, stor, log arguments + return desktop.MainWindow(cfg, store, None) # FIXME: mb/port: expects log arguments def on_start(self): # trigger startup operations self.root.on_startup() - # FIXME: mb/port - #def on_stop(self): - # self.root.session.storage.close() def main(argv): """Start the tagit GUI. Opens a window to browse images.""" diff --git a/tagit/apps/port_data.py b/tagit/apps/port_data.py index 11faaef..2e4161b 100644 --- a/tagit/apps/port_data.py +++ b/tagit/apps/port_data.py @@ -9,6 +9,8 @@ from tagit.utils.bsfs import URI # load data def add_port_data(store): + with open(os.path.join(os.path.dirname(__file__), 'port-schema.pkl'), 'rb') as ifile: + store._backend._schema = pickle.load(ifile) with open(os.path.join(os.path.dirname(__file__), 'port-data.pkl'), 'rb') as ifile: for triple in pickle.load(ifile): store._backend._graph.add(triple) -- cgit v1.2.3 From cc28b964c0379b9d5da2320a387c0c01e69f0ec1 Mon Sep 17 00:00:00 2001 From: Matthias Baumgartner Date: Sat, 4 Mar 2023 16:15:44 +0100 Subject: load data hook --- tagit/apps/desktop.py | 23 +++++++- tagit/apps/port_data.py | 141 ------------------------------------------------ 2 files changed, 21 insertions(+), 143 deletions(-) delete mode 100644 tagit/apps/port_data.py (limited to 'tagit/apps') diff --git a/tagit/apps/desktop.py b/tagit/apps/desktop.py index b64bf7e..913f922 100644 --- a/tagit/apps/desktop.py +++ b/tagit/apps/desktop.py @@ -27,6 +27,26 @@ __all__: typing.Sequence[str] = ( ## code ## +def load_data_hook(cfg, store): + """Data loading hook to circumvent non-persistent storage.""" + import pickle + import os + # fetch data_hook config flags + schema_path = cfg('session', 'data_hook', 'schema') + triples_path = cfg('session', 'data_hook', 'triples') + # load data if present + if os.path.exists(schema_path) and os.path.exists(triples_path): + with open(schema_path, 'rb') as ifile: + store._backend._schema = pickle.load(ifile) + with open(triples_path, 'rb') as ifile: + for triple in pickle.load(ifile): + store._backend._graph.add(triple) + return store + +config.declare(('session', 'data_hook', 'schema'), config.String(), '') +config.declare(('session', 'data_hook', 'triples'), config.String(), '') + + class TagitApp(App): """The tagit main application.""" @@ -41,9 +61,8 @@ class TagitApp(App): from tagit.config.loader import load_settings, TAGITRC cfg = load_settings(TAGITRC, 0) - # open BSFS storage - store = bsfs.Open(cfg('session', 'bsfs')) + store = load_data_hook(cfg, bsfs.Open(cfg('session', 'bsfs'))) # FIXME: mb/port: data hook # check storage schema with open(resource_find('required_schema.nt'), 'rt') as ifile: required_schema = bsfs.schema.from_string(ifile.read()) diff --git a/tagit/apps/port_data.py b/tagit/apps/port_data.py deleted file mode 100644 index 2e4161b..0000000 --- a/tagit/apps/port_data.py +++ /dev/null @@ -1,141 +0,0 @@ - -# standard imports -import os -import pickle - -# tagit imports -from tagit.utils import ns -from tagit.utils.bsfs import URI - -# load data -def add_port_data(store): - with open(os.path.join(os.path.dirname(__file__), 'port-schema.pkl'), 'rb') as ifile: - store._backend._schema = pickle.load(ifile) - with open(os.path.join(os.path.dirname(__file__), 'port-data.pkl'), 'rb') as ifile: - for triple in pickle.load(ifile): - store._backend._graph.add(triple) - - -def add_port_data2(store): - # tags - t_hello = store.node(ns.bsn.Tag, URI('http://example.com/me/tag#hello')) \ - .set(ns.bst.label, 'hello') - t_world = store.node(ns.bsn.Tag, URI('http://example.com/me/tag#world')) \ - .set(ns.bst.label, 'world') - t_foobar = store.node(ns.bsn.Tag, URI('http://example.com/me/tag#foobar')) \ - .set(ns.bst.label, 'foobar') - - # entities - n0 = store.node(ns.bsn.Entity, 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.bsn.Entity, 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.bsn.Entity, 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.bsn.Entity, 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.bsn.Entity, 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.bsn.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) - - # previews - base = os.path.join(os.path.dirname(__file__), 'port-data') - n0.set(ns.bse.preview, - store.node(ns.bsn.Preview, URI('http://example.com/me/preview#ent01_w100_h100')) \ - .set(ns.bsp.width, 100) \ - .set(ns.bsp.height, 100) \ - .set(ns.bsp.orientation, 1) \ - .set(ns.bsp.asset, open(os.path.join(base, 'ent01_w100_h100.jpg'), 'rb').read()) - ) - n0.set(ns.bse.preview, - store.node(ns.bsn.Preview, str('http://example.com/me/preview#ent01_w400_h200')) \ - .set(ns.bsp.width, 200) \ - .set(ns.bsp.height, 400) \ - .set(ns.bsp.orientation, 1) \ - .set(ns.bsp.asset, open(os.path.join(base, 'ent01_w400_h200.jpg'), 'rb').read()) - ) - n0.set(ns.bse.preview, - store.node(ns.bsn.Preview, URI('http://example.com/me/preview#ent01_w400_h400')) \ - .set(ns.bsp.width, 400) \ - .set(ns.bsp.height, 400) \ - .set(ns.bsp.orientation, 1) \ - .set(ns.bsp.asset, open(os.path.join(base, 'ent01_w400_h400.jpg'), 'rb').read()) - ) - n1.set(ns.bse.preview, - store.node(ns.bsn.Preview, URI('http://example.com/me/preview#ent02_w100_h100')) \ - .set(ns.bsp.width, 100) \ - .set(ns.bsp.height, 100) \ - .set(ns.bsp.orientation, 1) \ - .set(ns.bsp.asset, open(os.path.join(base, 'ent02_w100_h100.jpg'), 'rb').read()) - ) - n1.set(ns.bse.preview, - store.node(ns.bsn.Preview, URI('http://example.com/me/preview#ent02_w400_h200')) \ - .set(ns.bsp.width, 200) \ - .set(ns.bsp.height, 400) \ - .set(ns.bsp.orientation, 1) \ - .set(ns.bsp.asset, open(os.path.join(base, 'ent02_w400_h200.jpg'), 'rb').read()) - ) - n2.set(ns.bse.preview, - store.node(ns.bsn.Preview, URI('http://example.com/me/preview#ent03_w100_h100')) \ - .set(ns.bsp.width, 100) \ - .set(ns.bsp.height, 100) \ - .set(ns.bsp.orientation, 1) \ - .set(ns.bsp.asset, open(os.path.join(base, 'ent03_w100_h100.jpg'), 'rb').read()) - ) - n2.set(ns.bse.preview, - store.node(ns.bsn.Preview, URI('http://example.com/me/preview#ent03_w400_h200')) \ - .set(ns.bsp.width, 200) \ - .set(ns.bsp.height, 400) \ - .set(ns.bsp.orientation, 1) \ - .set(ns.bsp.asset, open(os.path.join(base, 'ent03_w400_h200.jpg'), 'rb').read()) - ) - n3.set(ns.bse.preview, - store.node(ns.bsn.Preview, URI('http://example.com/me/preview#ent04_w100_h100')) \ - .set(ns.bsp.width, 100) \ - .set(ns.bsp.height, 100) \ - .set(ns.bsp.orientation, 1) \ - .set(ns.bsp.asset, open(os.path.join(base, 'ent04_w100_h100.png'), 'rb').read()) - ) - n3.set(ns.bse.preview, - store.node(ns.bsn.Preview, URI('http://example.com/me/preview#ent04_w400_h200')) \ - .set(ns.bsp.width, 200) \ - .set(ns.bsp.height, 400) \ - .set(ns.bsp.orientation, 1) \ - .set(ns.bsp.asset, open(os.path.join(base, 'ent04_w400_h200.png'), 'rb').read()) - ) - n4.set(ns.bse.preview, - store.node(ns.bsn.Preview, URI('http://example.com/me/preview#ent05_w100_h100')) \ - .set(ns.bsp.width, 100) \ - .set(ns.bsp.height, 100) \ - .set(ns.bsp.orientation, 1) \ - .set(ns.bsp.asset, open(os.path.join(base, 'ent05_w100_h100.jpg'), 'rb').read()) - ) - n4.set(ns.bse.preview, - store.node(ns.bsn.Preview, URI('http://example.com/me/preview#ent05_w400_h200')) \ - .set(ns.bsp.width, 200) \ - .set(ns.bsp.height, 400) \ - .set(ns.bsp.orientation, 1) \ - .set(ns.bsp.asset, open(os.path.join(base, 'ent05_w400_h200.jpg'), 'rb').read()) - ) - -- cgit v1.2.3 From 5e88d395dee651175a277092c712249e3898a7d8 Mon Sep 17 00:00:00 2001 From: Matthias Baumgartner Date: Sun, 5 Mar 2023 19:16:22 +0100 Subject: build fixes --- tagit/apps/desktop.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'tagit/apps') diff --git a/tagit/apps/desktop.py b/tagit/apps/desktop.py index 913f922..149bf30 100644 --- a/tagit/apps/desktop.py +++ b/tagit/apps/desktop.py @@ -32,8 +32,8 @@ def load_data_hook(cfg, store): import pickle import os # fetch data_hook config flags - schema_path = cfg('session', 'data_hook', 'schema') - triples_path = cfg('session', 'data_hook', 'triples') + schema_path = os.path.expanduser(cfg('session', 'data_hook', 'schema')) + triples_path = os.path.expanduser(cfg('session', 'data_hook', 'triples')) # load data if present if os.path.exists(schema_path) and os.path.exists(triples_path): with open(schema_path, 'rb') as ifile: -- cgit v1.2.3