git subrepo pull uno

subrepo:
  subdir:   "uno"
  merged:   "da522e84"
upstream:
  origin:   "https://github.com/prrvchr/uno.git"
  branch:   "main"
  commit:   "da522e84"
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 = 054dd6184ac4d60fbfeca2e76424fac1e1cbd60e
-	parent = d1cce8673cda89e6c657afa36dfd73c005eca6b7
+	commit = da522e840a7080b2c2ef590783e7e3d15b894c1b
+	parent = 286558bfdee9f9ca68164288aa6cf658bb15638d
 	method = merge
 	cmdver = 0.4.3

uno/lib/uno/ucb/contentprovider.py

@@ -43,38 +43,23 @@
 from com.sun.star.ucb import IllegalIdentifierException
 
 from .ucp import Identifier
+from .ucp import getDataSourceUrl
 from .ucp import getExceptionMessage
 
-from .database import DataBase
-
 from .datasource import DataSource
 
-from .unotool import checkVersion
-from .unotool import getExtensionVersion
 from .unotool import getUrlTransformer
 from .unotool import parseUrl
 
-from .dbtool import getConnectionUrl
-
 from .logger import getLogger
 
-from .oauth2 import getOAuth2Version
-from .oauth2 import g_extension as g_oauth2ext
-from .oauth2 import g_version as g_oauth2ver
-
 from .jdbcdriver import g_extension as g_jdbcext
-from .jdbcdriver import g_identifier as g_jdbcid
-from .jdbcdriver import g_version as g_jdbcver
 
-from .dbconfig import g_folder
 from .dbconfig import g_version
 
 from .configuration import g_extension
 from .configuration import g_identifier
 from .configuration import g_defaultlog
-from .configuration import g_scheme
-
-from .ucp import g_ucbseparator
 
 import traceback
 
@@ -109,8 +94,11 @@ def createContentIdentifier(self, url):
     # XContentProvider
     def queryContent(self, identifier):
         try:
+            print("ContentProvider.queryContent() 1")
             url = self._getPresentationUrl(identifier.getContentIdentifier())
+            print("ContentProvider.queryContent() 2")
             content = self._datasource.queryContent(self, self._authority, url)
+            print("ContentProvider.queryContent() 3")
             self._logger.logprb(INFO, self._cls, 'queryContent', 231, url)
             return content
         except IllegalIdentifierException as e:
@@ -145,42 +133,24 @@ def getSupportedServiceNames(self):
     # Private methods
     def _getDataSource(self):
         mtd = '_getDataSource'
-        oauth2 = getOAuth2Version(self._ctx)
-        driver = getExtensionVersion(self._ctx, g_jdbcid)
-        if oauth2 is None:
-            msg = self._getExceptionMessage(mtd, 221, g_oauth2ext, g_oauth2ext, g_extension)
-            raise IllegalIdentifierException(msg, self)
-        elif not checkVersion(oauth2, g_oauth2ver):
-            msg = self._getExceptionMessage(mtd, 223, g_oauth2ext, oauth2, g_oauth2ext, g_oauth2ver)
-            raise IllegalIdentifierException(msg, self)
-        elif driver is None:
-            msg = self._getExceptionMessage(mtd, 221, g_jdbcext, g_jdbcext, g_extension)
+        url = getDataSourceUrl(self._ctx, self, self._logger, self._cls, mtd)
+        try:
+            datasource = DataSource(self._ctx, self._logger, url)
+        except SQLException as e:
+            msg = self._getExceptionMessage(mtd, 225, g_extension, url, e.Message)
             raise IllegalIdentifierException(msg, self)
-        elif not checkVersion(driver, g_jdbcver):
-            msg = self._getExceptionMessage(mtd, 223, g_jdbcext, driver, g_jdbcext, g_jdbcver)
+        if not datasource.isUptoDate():
+            msg = self._getExceptionMessage(mtd, 227, g_jdbcext, datasource.getDataBaseVersion(), g_version)
             raise IllegalIdentifierException(msg, self)
-        else:
-            path = g_folder + g_ucbseparator + g_scheme
-            url = getConnectionUrl(self._ctx, path)
-            try:
-                database = DataBase(self._ctx, self._logger, url)
-            except SQLException as e:
-                msg = self._getExceptionMessage(mtd, 225, g_extension, url, e.Message)
-                raise IllegalIdentifierException(msg, self)
-            else:
-                if not database.isUptoDate():
-                    msg = self._getExceptionMessage(mtd, 227, g_jdbcext, database.Version, g_version)
-                    raise IllegalIdentifierException(msg, self)
-                else:
-                    return DataSource(self._ctx, self._logger, database)
-        return None
+        return datasource
 
     def _getPresentationUrl(self, url):
-        # FIXME: Sometimes the url can end with a dot or a slash, it must be deleted
-        url = url.rstrip('/.')
+        # FIXME: Sometimes the url can end with a dot, it must be removed
+        url = url.removesuffix('.')
         uri = parseUrl(self._transformer, url)
         if uri is not None:
             url = self._transformer.getPresentation(uri, True)
+        print("ContentProvider._getPresentationUrl() url: %s" % url)
         return url
 
     def _getExceptionMessage(self, mtd, code, extension, *args):

uno/lib/uno/ucb/database.py

@@ -65,17 +65,24 @@
 class DataBase():
     def __init__(self, ctx, logger, url, user='', pwd=''):
         self._ctx = ctx
-        self._logger = logger
+        cls, mtd = 'DataBase', '__init__'
+        logger.logprb(INFO, cls, mtd, 401)
         self._url = url
         odb = url + '.odb'
         new = not getSimpleFile(ctx).exists(odb)
         connection = getDataBaseConnection(ctx, url, user, pwd, new)
         version = connection.getMetaData().getDriverVersion()
-        if new and checkVersion(version, g_version):
-            createDataBase(ctx, logger, connection, odb, version)
+        if new:
+            if checkVersion(version, g_version):
+                logger.logprb(INFO, cls, mtd, 402, version)
+                createDataBase(ctx, connection, odb)
+                logger.logprb(INFO, cls, mtd, 403)
+            else:
+                logger.logprb(SEVERE, cls, mtd, 404, version, g_version)
         self._statement = connection.createStatement()
         self._version = version
-        self._logger.logprb(INFO, 'DataBase', '__init__', 401)
+        self._logger = logger
+        logger.logprb(INFO, cls, mtd, 405)
 
     @property
     def Url(self):
@@ -467,7 +474,7 @@ def _mergeItem(self, call, item):
             mx = 2 ** 32 / 2 -1
             if size > mx:
                 size = min(size, mx)
-                self._logger.logprb(SEVERE, 'DataBase', '_mergeItem', 402, size, item.get('Size'))
+                self._logger.logprb(SEVERE, 'DataBase', '_mergeItem', 451, size, item.get('Size'))
         call.setLong(10, size)
         call.setString(11, item.get('Link'))
         call.setBoolean(12, item.get('Trashed'))

uno/lib/uno/ucb/datasource.py

@@ -32,7 +32,9 @@
 
 from com.sun.star.ucb import IllegalIdentifierException
 
-from .oauth2 import getOAuth2UserName
+from .database import DataBase
+
+from .oauth20 import getOAuth2UserName
 
 from .unotool import getUriFactory
 
@@ -53,20 +55,36 @@
 
 
 class DataSource():
-    def __init__(self, ctx, logger, database):
+    def __init__(self, ctx, logger, url):
+        cls, mtd = 'DataSource', '__init__'
+        logger.logprb(INFO, cls, mtd, 301)
         self._ctx = ctx
         self._default = ''
         self._users = {}
-        self._logger = logger
-        self.Error = None
         self._sync = Event()
         self._lock = Lock()
         self._urifactory = getUriFactory(ctx)
-        self._provider = Provider(ctx, logger)
-        self.Replicator = Replicator(ctx, database.Url, self._provider, self._users, self._sync, self._lock)
-        self.DataBase = database
+        database = DataBase(ctx, logger, url)
+        provider = Provider(ctx, logger)
+        self._replicator = Replicator(ctx, url, provider, self._users, self._sync, self._lock)
+        self._database = database
+        self._provider = provider
+        self._logger = logger
         database.addCloseListener(CloseListener(self))
-        self._logger.logprb(INFO, 'DataSource', '__init__', 301)
+        logger.logprb(INFO, cls, mtd, 302)
+
+    @property
+    def DataBase(self):
+        return self._database
+    @property
+    def Replicator(self):
+        return self._replicator
+
+    def isUptoDate(self):
+        return self.DataBase.isUptoDate()
+
+    def getDataBaseVersion(self):
+        return self.DataBase.Version
 
     # called from XCloseListener
     def dispose(self):
@@ -137,7 +155,10 @@ def _getUser(self, source, authority, url):
         return user, uri
 
     def _getUserName(self, source, url):
-        name = getOAuth2UserName(self._ctx, self, self._provider.Scheme)
+        try:
+            name = getOAuth2UserName(self._ctx, source, self._provider.Scheme)
+        except Exception as e:
+            print("DataSource._getUserName() ERROR: %s - %s" % (e, traceback.format_exc()))
         if not name:
             msg = self._getExceptionMessage('_getUserName', 331, url)
             raise IllegalIdentifierException(msg, source)

uno/lib/uno/ucb/dbinit.py

@@ -82,8 +82,7 @@ def getDataBaseConnection(ctx, url, user, pwd, new, infos=None):
         infos = getDriverInfos(ctx, url, g_drvinfos)
     return getDataSourceConnection(ctx, url, user, pwd, new, infos)
 
-def createDataBase(ctx, logger, connection, odb, version):
-    logger.logprb(INFO, 'DataBase', '_createDataBase', 411, version)
+def createDataBase(ctx, connection, odb):
     # XXX Creation order are very important here...
     tables = connection.getTables()
     statement = connection.createStatement()
@@ -102,7 +101,6 @@ def createDataBase(ctx, logger, connection, odb, version):
     executeQueries(ctx, statement, _getProcedures(), 'create%s', g_queries)
     statement.close()
     connection.getParent().DatabaseDocument.storeAsURL(odb, ())
-    logger.logprb(INFO, 'DataBase', '_createDataBase', 412)
 
 def _createTables(connection, statement, tables):
     infos = getConnectionInfos(connection, 'AutoIncrementCreation', 'RowVersionCreation')

uno/lib/uno/ucb/ucp/__init__.py

@@ -40,5 +40,6 @@
 
 from .user import User
 
+from .contenthelper import getDataSourceUrl
 from .contenthelper import getExceptionMessage
 

uno/lib/uno/ucb/ucp/contenthelper.py

@@ -39,20 +39,57 @@
 from com.sun.star.ucb.ContentAction import DELETED
 from com.sun.star.ucb.ContentAction import EXCHANGED
 
+from com.sun.star.ucb import IllegalIdentifierException
 from com.sun.star.ucb import InteractiveAugmentedIOException
 
 from com.sun.star.ucb.ConnectionMode import ONLINE
 from com.sun.star.ucb.ConnectionMode import OFFLINE
 
 from com.sun.star.sdb import ParametersRequest
 
+from ..dbtool import getConnectionUrl
+
+from ..unotool import checkVersion
 from ..unotool import createMessageBox
 from ..unotool import createService
+from ..unotool import getExtensionVersion
 from ..unotool import getParentWindow
 from ..unotool import getProperty
 from ..unotool import getPropertyValue
 from ..unotool import getNamedValueSet
 
+from ..oauth20 import getOAuth2Version
+from ..oauth20 import g_extension as g_oauth2ext
+from ..oauth20 import g_version as g_oauth2ver
+
+from ..jdbcdriver import g_extension as g_jdbcext
+from ..jdbcdriver import g_identifier as g_jdbcid
+from ..jdbcdriver import g_version as g_jdbcver
+
+from ..dbconfig import g_folder
+
+from ..configuration import g_extension
+from ..configuration import g_scheme
+
+from .configuration import g_ucbseparator
+
+
+def getDataSourceUrl(ctx, source, logger, cls, mtd):
+    oauth2 = getOAuth2Version(ctx)
+    driver = getExtensionVersion(ctx, g_jdbcid)
+    if oauth2 is None:
+        msg = getExceptionMessage(ctx, logger, cls, mtd, 221, g_oauth2ext, g_oauth2ext, g_extension)
+        raise IllegalIdentifierException(msg, source)
+    if not checkVersion(oauth2, g_oauth2ver):
+        msg = getExceptionMessage(ctx, logger, cls, mtd, 223, g_oauth2ext, oauth2, g_oauth2ext, g_oauth2ver)
+        raise IllegalIdentifierException(msg, source)
+    if driver is None:
+        msg = getExceptionMessage(ctx, logger, cls, mtd, 221, g_jdbcext, g_jdbcext, g_extension)
+        raise IllegalIdentifierException(msg, source)
+    if not checkVersion(driver, g_jdbcver):
+        msg = getExceptionMessage(ctx, logger, cls, mtd, 223, g_jdbcext, driver, g_jdbcext, g_jdbcver)
+        raise IllegalIdentifierException(msg, source)
+    return getConnectionUrl(ctx, g_folder + g_ucbseparator + g_scheme)
 
 def propertyChange(source, name, oldvalue, newvalue):
     if name in source.propertiesListener:
@@ -177,7 +214,7 @@ def executeContentCommand(content, name, argument, environment):
 
 def getExceptionMessage(ctx, logger, cls, method, code, extension, *args):
     title = logger.resolveString(code, extension)
-    message = logger.resolveString(code +1, *args)
+    message = logger.resolveString(code + 1, *args)
     logger.logp(SEVERE, cls, method, message)
     msgbox = createMessageBox(getParentWindow(ctx), message, title, 'error', 1)
     msgbox.execute()

uno/lib/uno/ucb/ucp/contentlib.py

@@ -42,8 +42,6 @@
 
 from .identifier import Identifier
 
-from ..oauth2 import g_oauth2
-
 from ..unolib import PropertySet
 
 from ..unotool import getProperty

uno/lib/uno/ucb/ucp/user.py

@@ -40,8 +40,8 @@
 
 from com.sun.star.ucb import IllegalIdentifierException
 
-from ..oauth2 import getRequest
-from ..oauth2 import g_oauth2
+from ..oauth20 import getRequest
+from ..oauth20 import g_service
 
 from ..dbtool import currentDateTimeInTZ
 from ..dbtool import currentUnoDateTime
@@ -99,7 +99,7 @@ def __init__(self, ctx, source, logger, database, provider, sync, name, password
             if request is None:
                 # If we have a Null value here then it means that the user has abandoned
                 # the OAuth2 Wizard, there is nothing more to do except throw an exception
-                msg = self._getExceptionMessage(mtd, 501, g_oauth2)
+                msg = self._getExceptionMessage(mtd, 501, g_service)
                 raise IllegalIdentifierException(msg, source)
             user = self.Provider.getUser(source, request, name)
             metadata = database.insertUser(user)
@@ -178,8 +178,10 @@ def getContentByParent(self, authority, itemid, path):
 
     # method called from DataSource.queryContent()
     def getContent(self, authority, uri):
-        isroot = uri.getPathSegmentCount() == 0
-        return self._getContent(authority, uri.getPath(), isroot)
+        path = uri.getPath()
+        print("User.getContent() Count: %s - Path: %s" % (uri.getPathSegmentCount(), uri.getPath()))
+        isroot = path == g_ucbseparator or uri.getPathSegmentCount() == 0
+        return self._getContent(authority, path.removesuffix('/'), isroot)
 
     def setLock(self):
         if self._lock is not None:

uno/resource/ucb/ContentProvider_en_US.properties

@@ -40,9 +40,9 @@
 241=Identifiers <{}> - <{}> ... seem to be the same
 242=Identifiers <{}> - <{}> ... doesn't seem to be the same
 
-
 300=DataSource.__init__()
-301=DataSource: Loading completed
+301=The data source is loading...
+302=Data source successfully loaded.
 
 310=DataSource.queryContent()
 311=Error: Unable to load content with an incomplete Identifier <{}>
@@ -64,13 +64,14 @@
 
 
 400=DataBase.__init__()
-401=DataBase: Loading completed.
-402=DataBase._mergeItem() size <{}> os name <{}>
-
-410=DataBase.createDataBase()
-411=Try to create the database with HsqlDB version <{}>.
-412=Successful database creation.
-413=Unable to create database: installed HsqlDB version <{}> is lower than minimum supported version <{}>.
+401=The database is loading...
+402=Try to create the database with HsqlDB version <{}>.
+403=Database creation successful.
+404=Unable to create database: installed HsqlDB version <{}> is lower than minimum supported version <{}>.
+405=Database successfully loaded.
+
+450=DataBase._mergeItem()
+451=DataBase._mergeItem() size <{}> os name <{}>
 
 
 500=User.__init__()