git subrepo pull uno

subrepo:
  subdir:   "uno"
  merged:   "448f55e2"
upstream:
  origin:   "https://github.com/prrvchr/uno.git"
  branch:   "main"
  commit:   "448f55e2"
git-subrepo:
  version:  "0.4.3"
  origin:   "https://github.com/ingydotnet/git-subrepo.git"
  commit:   "2f68596"

Author: prrvchr

uno/.gitrepo

@@ -6,7 +6,7 @@
 [subrepo]
 	remote = https://github.com/prrvchr/uno.git
 	branch = main
-	commit = bdc86da71c2050339b611e294cdc250c5d054042
-	parent = d8c0c059851abc0a600bc5467b65aa000cbe11f2
+	commit = 448f55e200c506f0edadcf062dd6160ff05c033a
+	parent = c8dc3475778cb2d4fab1a9c93679a530a6fd0bc3
 	method = merge
 	cmdver = 0.4.3

uno/lib/uno/card/card/book.py

@@ -27,15 +27,21 @@
 ╚════════════════════════════════════════════════════════════════════════════════════╝
 """
 
+from .group import Group
 
-class Book(object):
+import json
+
+
+class Book():
     def __init__(self, new, **kwargs):
         self._new = new
         self._id = kwargs.get('Book')
         self._uri = kwargs.get('Uri')
         self._name = kwargs.get('Name')
         self._tag = kwargs.get('Tag')
         self._token = kwargs.get('Token')
+        groups = (Group(new, *group) for group in json.loads(kwargs.get('Groups', '[]')))
+        self._groups = {group.Uri: group for group in groups}
 
     @property
     def Id(self):
@@ -59,7 +65,21 @@ def isNew(self):
     def resetNew(self):
         self._new = False
 
-    def hasNameChanged(self, name):
+    def hasGroup(self, uri):
+        return uri in self._groups
+
+    def getGroups(self):
+        return self._groups.values()
+
+    def getGroup(self, uri):
+        return self._groups[uri]
+
+    def setNewGroup(self, uri, *args):
+        group = Group(True, *args)
+        self._groups[uri] = group
+        return group
+
+    def isRenamed(self, name):
         return self._name != name
 
     def setName(self, name):

uno/lib/uno/card/card/group.py

@@ -0,0 +1,62 @@
+#!
+# -*- coding: utf-8 -*-
+
+"""
+╔════════════════════════════════════════════════════════════════════════════════════╗
+║                                                                                    ║
+║   Copyright (c) 2020 https://prrvchr.github.io                                     ║
+║                                                                                    ║
+║   Permission is hereby granted, free of charge, to any person obtaining            ║
+║   a copy of this software and associated documentation files (the "Software"),     ║
+║   to deal in the Software without restriction, including without limitation        ║
+║   the rights to use, copy, modify, merge, publish, distribute, sublicense,         ║
+║   and/or sell copies of the Software, and to permit persons to whom the Software   ║
+║   is furnished to do so, subject to the following conditions:                      ║
+║                                                                                    ║
+║   The above copyright notice and this permission notice shall be included in       ║
+║   all copies or substantial portions of the Software.                              ║
+║                                                                                    ║
+║   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,                  ║
+║   EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES                  ║
+║   OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.        ║
+║   IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY             ║
+║   CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,             ║
+║   TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE       ║
+║   OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                                    ║
+║                                                                                    ║
+╚════════════════════════════════════════════════════════════════════════════════════╝
+"""
+
+
+class Group():
+    def __init__(self, new, group, uri, name, token=''):
+        self._new = new
+        self._id = group
+        self._uri = uri
+        self._name = name
+        self._token = token
+
+    @property
+    def Id(self):
+        return self._id
+    @property
+    def Uri(self):
+        return self._uri
+    @property
+    def Name(self):
+        return self._name
+    @property
+    def Token(self):
+        return self._token
+
+    def isNew(self):
+        return self._new
+
+    def resetNew(self):
+        self._new = False
+
+    def isRenamed(self, name):
+        return self._name != name
+
+    def setName(self, name):
+        self._name = name

uno/lib/uno/card/card/replicator.py

@@ -64,25 +64,26 @@ def dispose(self):
     def run(self):
         mtd = 'run'
         logger = getLogger(self._ctx, g_synclog, self._cls)
-        timeout = 0
+        timeout = self._config.getByName('ReplicateTimeout')
         try:
             logger.logprb(INFO, self._cls, mtd, 101)
             while not self._canceled:
                 self._sync.clear()
                 self._sync.wait(timeout)
                 if self._canceled:
                     continue
-                timeout = self._config.getByName('ReplicateTimeout')
                 if self._hasConnectedUser():
                     count = self._syncCard(logger)
                     if count > 0:
                         count = self._provider.parseCard(self._database)
                         if self._provider.supportGroup():
                             self._syncGroup(logger)
                     self._database.dispose()
-                    logger.logprb(INFO, self._cls, mtd, 102, timeout // 60)
+                    code = 102
                 else:
-                    logger.logprb(INFO, self._cls, mtd, 103, timeout // 60)
+                    code = 103
+                timeout = self._config.getByName('ReplicateTimeout')
+                logger.logprb(INFO, self._cls, mtd, code, timeout // 60)
             logger.logprb(INFO, self._cls, mtd, 104)
         except UnoException as e:
             logger.logprb(SEVERE, self._cls, mtd, 105, e.Message)

uno/lib/uno/card/card/user.py

@@ -54,7 +54,7 @@ def __init__(self, ctx, source, logger, database, provider, url, scheme, server,
         self._password = pwd
         self._sessions = []
         logger.logprb(INFO, self._cls, mtd, 1352, name)
-        metadata, books = database.selectUser(server, name)
+        metadata, args = database.selectUser(server, name)
         new = metadata is None
         if not new:
             logger.logprb(INFO, self._cls, mtd, 1353, name)
@@ -68,13 +68,14 @@ def __init__(self, ctx, source, logger, database, provider, url, scheme, server,
             request = provider.getRequest(url, name)
             if request is None:
                 raise getSqlException(ctx, source, 1002, 1501, self._cls, mtd, name, g_extension)
-            metadata, books = provider.insertUser(source, logger, database, request, scheme, server, name, pwd)
+            metadata, args = provider.insertUser(logger, database, request, scheme, server, name, pwd)
             if metadata is None:
                 raise getSqlException(ctx, source, 1005, 1503, self._cls, mtd, name)
             database.createUser(getUserSchema(metadata), getUserId(metadata), name, '')
-        self.Request = request
+        self._request = request
         self._metadata = metadata
-        self._books = {book.get('Uri'): Book(new, **book) for book in books}
+        books = (Book(new, **kwargs) for kwargs in args)
+        self._books = {book.Uri: book for book in books}
         logger.logprb(INFO, self._cls, mtd, 1355, name)
 
     @property
@@ -102,11 +103,12 @@ def Password(self):
     def BaseUrl(self):
         return self.Scheme + self.Server + self.Path
     @property
-    def Books(self):
-        return self._books.values()
+    def Request(self):
+        return self._request
 
     def isOnLine(self):
         return self._isOnLine(self.Server)
+
     def isOffLine(self):
         return self._isOffLine(self.Server)
 
@@ -124,11 +126,16 @@ def getSchema(self):
     def hasBook(self, uri):
         return uri in self._books
 
+    def getBooks(self):
+        return self._books.values()
+
     def getBook(self, uri):
         return self._books[uri]
 
     def setNewBook(self, uri, **kwargs):
-        self._books[uri] = Book(True, **kwargs)
+        book = Book(True, **kwargs)
+        self._books[uri] = book
+        return book
 
     def hasSession(self):
         return len(self._sessions) > 0
@@ -143,9 +150,6 @@ def removeSession(self, session):
     def unquoteUrl(self, url):
         return self.Request.unquoteUrl(url)
 
-    def getBooks(self):
-        return self._books.getBooks()
-
     def _isOffLine(self, server):
         return getConnectionMode(self._ctx, server) != ONLINE
 

uno/lib/uno/card/database.py

@@ -156,14 +156,13 @@ def getSessionId(self, connection):
 
     def insertUser(self, uri, scheme, server, path, name):
         metadata = None
-        books = []
         call = self._getCall('insertUser')
         call.setString(1, uri)
         call.setString(2, scheme)
         call.setString(3, server)
         call.setString(4, path)
         call.setString(5, name)
-        result = call.executeQuery()
+        call.execute()
         user = call.getInt(6)
         if not call.wasNull():
             metadata = {'User': user,
@@ -172,11 +171,8 @@ def insertUser(self, uri, scheme, server, path, name):
                         'Server': server,
                         'Path': path,
                         'Name': name}
-            while result.next():
-                books.append(getDataFromResult(result))
-        result.close()
         call.close()
-        return metadata, books
+        return metadata, ()
 
     def createUser(self, schema, userid, name, password):
         try:
@@ -205,7 +201,7 @@ def _getItemOptions(self, catalog, schema, name, *options):
 
     def selectUser(self, server, name):
         metadata = None
-        books = []
+        args = []
         call = self._getCall('selectUser')
         call.setString(1, server)
         call.setString(2, name)
@@ -219,10 +215,10 @@ def selectUser(self, server, name):
                         'Path': call.getString(6),
                         'Name': name}
             while result.next():
-                books.append(getDataFromResult(result))
+                args.append(getDataFromResult(result))
         result.close()
         call.close()
-        return metadata, books
+        return metadata, args
 
 # Procedures called by the User
     def getUserFields(self):
@@ -239,11 +235,11 @@ def initAddressbooks(self, user):
             self._initUserView('Book', *args)
         self._updateBookSync(user, stop)
 
-    def initGroups(self, user, uri, iterator):
+    def initGroups(self, user, book, iterator):
         uris = []
         names = []
         call = self._getCall('initGroups')
-        call.setInt(1, user.getBook(uri).Id)
+        call.setInt(1, user.getBook(book).Id)
         for uri, name in iterator:
             uris.append(uri)
             names.append(name)
@@ -257,16 +253,18 @@ def initGroups(self, user, uri, iterator):
         call.close()
         return remove, add
 
-    def insertGroups(self, user, iterator):
+    def insertGroup(self, bookid, uri, name):
+        args = None
         call = self._getCall('insertGroup')
-        call.setInt(1, user.Id)
-        for uri, name in iterator:
-            call.setString(2, uri)
-            call.setString(3, name)
-            call.execute()
-            gid = call.getInt(4)
-            yield {'Query': 'Inserted', 'User': user.Id, 'Group': gid, 'Schema': user.getSchema(), 'Name': name}
+        call.setInt(1, bookid)
+        call.setString(2, uri)
+        call.setString(3, name)
+        call.execute()
+        group = call.getInt(4)
+        if not call.wasNull():
+            args = (group, uri, name)
         call.close()
+        return args
 
     def syncGroups(self, user):
         start = self.getLastSync('GroupSync', user)
@@ -319,7 +317,7 @@ def _initUserView(self, view, query, schema, user, item, oldname, newname):
         if query == 'Deleted' or query == 'Updated':
             self._deleteUserView(g_catalog, schema, oldname)
         if query == 'Inserted' or query == 'Updated':
-            template = {'Catalog': g_catalog, 'Schema': g_schema, 'Item': item}
+            template = {'Catalog': g_catalog, 'Schema': g_schema, 'ItemId': item}
             command = getSqlQuery(self._ctx, 'get%sViewCommand' % view, template)
             self._createUserView(g_catalog, schema, newname, command, CASCADE)
             self._grantPrivileges(g_catalog, schema, newname, user, TABLE, 1)
@@ -333,6 +331,13 @@ def _deleteUserView(self, catalog, schema, name):
         if views.hasByName(view):
             views.dropByName(view)
 
+    def _renameUserView(self, catalog, schema, newname, oldname):
+        views = self.Connection.getViews()
+        newview = f'{catalog}.{schema}.{newname}'
+        oldview = f'{catalog}.{schema}.{oldname}'
+        if views.hasByName(oldview) and not views.hasByName(newview):
+            views.rename(oldview, newview)
+
     def insertBook(self, userid, uri, name, tag=None, token=None):
         book = None
         call = self._getCall('insertBook')
@@ -354,19 +359,18 @@ def insertBook(self, userid, uri, name, tag=None, token=None):
         call.close()
         return book
 
-    def initGroupView(self, user, remove, add):
+    def createGroupView(self, user, group):
         schema = user.getSchema()
-        if remove:
-            for item in remove:
-                self._deleteUserView(g_catalog, schema, item.get('OldName'))
-        if add:
-            for item in add:
-                view = item.get('NewName')
-                item['Catalog'] = g_catalog
-                item['Schema'] = g_schema
-                command = getSqlQuery(self._ctx, 'getGroupViewCommand', item)
-                self._createUserView(g_catalog, schema, view, command, CASCADE)
-                self._grantPrivileges(g_catalog, schema, view, user.Name, TABLE, 1)
+        template = {'Catalog': g_catalog, 'Schema':  g_schema, 'ItemId': group.Id}
+        command = getSqlQuery(self._ctx, 'getGroupViewCommand', template)
+        self._createUserView(g_catalog, schema, group.Name, command, CASCADE)
+        self._grantPrivileges(g_catalog, schema, group.Name, user.Name, TABLE, 1)
+
+    def removeGroupView(self, user, group):
+        self._deleteUserView(g_catalog, user.getSchema(), group.Name)
+
+    def renameGroupView(self, user, group, name):
+        self._renameUserView(g_catalog, user.getSchema(), group.Name, name)
 
     def updateAddressbookName(self, addressbook, name):
         call = self._getCall('updateAddressbookName')