From 35b1cf63f212e4f0fae6cb6d27901d790f3ebb57 Mon Sep 17 00:00:00 2001 From: Pierre Date: Sun, 14 Jan 2024 23:08:02 +0100 Subject: [PATCH] new version 1.1.0 --- .github/workflows/{dev.yml => fascan.yml} | 0 Fluid-Attacks-Scan.sh | 3 ++ README.md | 42 +++++++++++-------- README_fr.md | 42 +++++++++++-------- _fascan.yml | 4 +- source/vCardOOo/description.xml | 2 +- source/vCardOOo/description/desc_en.txt | 2 +- source/vCardOOo/description/desc_fr.txt | 2 +- source/vCardOOo/package.properties | 4 +- .../vCardOOo/registration/PrivacyPolicy_en.md | 4 +- .../vCardOOo/registration/PrivacyPolicy_fr.md | 4 +- source/vCardOOo/requirements.txt | 5 +++ source/vCardOOo/service/Driver.py | 2 +- source/vCardOOo/service/OptionsHandler.py | 13 ++++-- .../service/pythonpath/_distutils_hack | 1 + .../pythonpath/decorator-5.1.1.dist-info | 1 + .../pythonpath/distutils-precedence.pth | 1 + .../pythonpath/packaging-23.2.dist-info | 1 + .../vCardOOo/service/pythonpath/pkg_resources | 1 + source/vCardOOo/service/pythonpath/setuptools | 1 + .../pythonpath/setuptools-69.0.3.dist-info | 1 + .../service/pythonpath/six-1.16.0.dist-info | 1 + .../pythonpath/validators-0.22.0.dist-info | 1 + .../service/pythonpath/vcard/provider.py | 2 +- vCardOOo.update.xml | 2 +- 25 files changed, 90 insertions(+), 52 deletions(-) rename .github/workflows/{dev.yml => fascan.yml} (100%) create mode 100755 Fluid-Attacks-Scan.sh create mode 100644 source/vCardOOo/requirements.txt create mode 120000 source/vCardOOo/service/pythonpath/_distutils_hack create mode 120000 source/vCardOOo/service/pythonpath/decorator-5.1.1.dist-info create mode 120000 source/vCardOOo/service/pythonpath/distutils-precedence.pth create mode 120000 source/vCardOOo/service/pythonpath/packaging-23.2.dist-info create mode 120000 source/vCardOOo/service/pythonpath/pkg_resources create mode 120000 source/vCardOOo/service/pythonpath/setuptools create mode 120000 source/vCardOOo/service/pythonpath/setuptools-69.0.3.dist-info create mode 120000 source/vCardOOo/service/pythonpath/six-1.16.0.dist-info create mode 120000 source/vCardOOo/service/pythonpath/validators-0.22.0.dist-info diff --git a/.github/workflows/dev.yml b/.github/workflows/fascan.yml similarity index 100% rename from .github/workflows/dev.yml rename to .github/workflows/fascan.yml diff --git a/Fluid-Attacks-Scan.sh b/Fluid-Attacks-Scan.sh new file mode 100755 index 00000000..90abd5d1 --- /dev/null +++ b/Fluid-Attacks-Scan.sh @@ -0,0 +1,3 @@ +#!/bin/bash +docker run -v ~/github/vCardOOo:/working-dir ghcr.io/fluidattacks/makes/amd64 m gitlab:fluidattacks/universe@trunk /skims scan ./_fascan.yml +docker system prune -f diff --git a/README.md b/README.md index d4547fae..59190ed7 100644 --- a/README.md +++ b/README.md @@ -29,7 +29,7 @@ **The use of this software subjects you to our [Terms Of Use][4] and [Data Protection Policy][5].** -# version [1.0.4][6] +# version [1.1.0][6] ## Introduction: @@ -48,19 +48,19 @@ ___ ## Requirement: -In order to take advantage of the latest versions of the Python libraries used in vCardOOo, version 2 of Python has been abandoned in favor of **Python 3.8 minimum**. -This means that **vCardOOo no longer supports OpenOffice and LibreOffice 6.x on Windows since version 1.0.0**. -I can only advise you **to migrate to LibreOffice 7.x**. +The vCardOOo extension uses the OAuth2OOo extension to work. +It must therefore meet the [requirement of the OAuth2OOo extension][12]. -vCardOOo uses a local [HsqlDB][12] database version 2.7.2. -HsqlDB being a database written in Java, its use requires the [installation and configuration][13] in LibreOffice / OpenOffice of a **JRE version 11 or later**. -I recommend [Adoptium][14] as your Java installation source. +The vCardOOo extension uses the jdbcDriverOOo extension to work. +It must therefore meet the [requirement of the jdbcDriverOOo extension][13]. -If you are using **LibreOffice Community on Linux**, you are subject to [bug 139538][15]. To work around the problem, please **uninstall the packages** with commands: -- `sudo apt remove libreoffice-sdbc-hsqldb` (to uninstall the libreoffice-sdbc-hsqldb package) -- `sudo apt remove libhsqldb1.8.0-java` (to uninstall the libhsqldb1.8.0-java package) +**On Linux and macOS the Python packages** used by the extension, if already installed, may come from the system and therefore **may not be up to date**. +To ensure that your Python packages are up to date it is recommended to use the **System Info** option in the extension Options accessible by: +**Tools -> Options -> Internet -> vCardOOo -> View log -> System Info** +If outdated packages appear, you can update them with the command: +`pip install --upgrade ` -If you still want to use the Embedded HsqlDB functionality provided by LibreOffice, then install the [HyperSQLOOo][16] extension. +For more information see: [What has been done for version 1.1.0][14]. ___ @@ -218,7 +218,14 @@ It will give you access to an information system that only larges companies are - Support for version **1.2.1** of the **OAuth2OOo** extension. Previous versions will not work with **OAuth2OOo** extension 1.2.1 or higher. -### What remains to be done for version 1.0.3: +### What has been done for version 1.1.0: + +- All Python packages necessary for the extension are now recorded in a [requirements.txt][47] file following [PEP 508][48]. +- Now if you are not on Windows then the Python packages necessary for the extension can be easily installed with the command: + `pip install requirements.txt` +- Modification of the [Requirement][49] section. + +### What remains to be done for version 1.1.0: - Make the address book locally editable with replication of changes. @@ -237,11 +244,9 @@ It will give you access to an information system that only larges companies are [9]: [10]: [11]: -[12]: -[13]: -[14]: -[15]: -[16]: +[12]: +[13]: +[14]: [17]: [18]: [19]: @@ -272,3 +277,6 @@ It will give you access to an information system that only larges companies are [44]: [45]: [46]: +[47]: +[48]: +[49]: diff --git a/README_fr.md b/README_fr.md index be13ee5d..f3dbcc19 100644 --- a/README_fr.md +++ b/README_fr.md @@ -29,7 +29,7 @@ **L'utilisation de ce logiciel vous soumet à nos [Conditions d'utilisation][4] et à notre [Politique de protection des données][5]**. -# version [1.0.4][6] +# version [1.1.0][6] ## Introduction: @@ -48,19 +48,19 @@ ___ ## Prérequis: -Afin de profiter des dernières versions des bibliothèques Python utilisées dans vCardOOo, la version 2 de Python a été abandonnée au profit de **Python 3.8 minimum**. -Cela signifie que **vCardOOo ne supporte plus OpenOffice et LibreOffice 6.x sous Windows depuis sa version 1.0.0**. -Je ne peux que vous conseiller **de migrer vers LibreOffice 7.x**. +L'extension vCardOOo utilise l'extension OAuth2OOo pour fonctionner. +Elle doit donc répondre aux [prérequis de l'extension OAuth2OOo][12]. -vCardOOo utilise une base de données locale [HsqlDB][12] version 2.7.2. -HsqlDB étant une base de données écrite en Java, son utilisation nécessite [l'installation et la configuration][13] dans LibreOffice / OpenOffice d'un **JRE version 11 ou ultérieure**. -Je vous recommande [Adoptium][14] comme source d'installation de Java. +L'extension vCardOOo utilise l'extension jdbcDriverOOo pour fonctionner. +Elle doit donc répondre aux [prérequis de l'extension jdbcDriverOOo][13]. -Si vous utilisez **LibreOffice Community sous Linux**, vous êtes sujet au [dysfonctionnement 139538][15]. Pour contourner le problème, veuillez **désinstaller les paquets** avec les commandes: -- `sudo apt remove libreoffice-sdbc-hsqldb` (pour désinstaller le paquet libreoffice-sdbc-hsqldb) -- `sudo apt remove libhsqldb1.8.0-java` (pour désinstaller le paquet libhsqldb1.8.0-java) +**Sous Linux et macOS les paquets Python** utilisés par l'extension, peuvent s'il sont déja installé provenir du système et donc, **peuvent ne pas être à jour**. +Afin de s'assurer que vos paquets Python sont à jour il est recommandé d'utiliser l'option **Info système** dans les Options de l'extension accessible par: +**Outils -> Options -> Internet -> vCardOOo -> Voir journal -> Info système** +Si des paquets obsolètes apparaissent, vous pouvez les mettre à jour avec la commande: +`pip install --upgrade ` -Si vous souhaitez quand même utiliser la fonctionnalité HsqlDB intégré fournie par LibreOffice, alors installez l'extension [HyperSQLOOo][16]. +Pour plus d'information voir: [Ce qui a été fait pour la version 1.1.0][14]. ___ @@ -218,7 +218,14 @@ Elle vous donnera accès à un système d'information que seules les grandes ent - Prise en charge de la version 1.2.1 de l'extension **OAuth2OOo**. Les versions précédentes ne fonctionneront pas avec l'extension **OAuth2OOo** 1.2.1 ou ultérieure. -### Que reste-t-il à faire pour la version 1.0.3: +### Ce qui a été fait pour la version 1.1.0: + +- Tous les paquets Python nécessaires à l'extension sont désormais enregistrés dans un fichier [requirements.txt][47] suivant la [PEP 508][48]. +- Désormais si vous n'êtes pas sous Windows alors les paquets Python nécessaires à l'extension peuvent être facilement installés avec la commande: + `pip install requirements.txt` +- Modification de la section [Prérequis][49]. + +### Que reste-t-il à faire pour la version 1.1.0: - Rendre le carnet d'adresses modifiable localement avec la réplication des modifications. @@ -237,11 +244,9 @@ Elle vous donnera accès à un système d'information que seules les grandes ent [9]: [10]: [11]: -[12]: -[13]: -[14]: -[15]: -[16]: +[12]: +[13]: +[14]: [17]: [18]: [19]: @@ -272,3 +277,6 @@ Elle vous donnera accès à un système d'information que seules les grandes ent [44]: [45]: [46]: +[47]: +[48]: +[49]: diff --git a/_fascan.yml b/_fascan.yml index de7f0f97..5290bb92 100644 --- a/_fascan.yml +++ b/_fascan.yml @@ -5,9 +5,9 @@ output: working_dir: . sast: include: - - source/vCardOOo/source/io/github/prrvchr/ - - source/vCardOOo/service/pythonpath/vcard/ - glob(source/vCardOOo/service/*.py) + - glob(source/vCardOOo/service/pythonpath/vcard/*) + - glob(source/vCardOOo/source/*) sca: include: - . diff --git a/source/vCardOOo/description.xml b/source/vCardOOo/description.xml index 3da1e152..e3d458bd 100644 --- a/source/vCardOOo/description.xml +++ b/source/vCardOOo/description.xml @@ -28,7 +28,7 @@ xmlns="http://openoffice.org/extensions/description/2006" xmlns:d="http://openoffice.org/extensions/description/2006" xmlns:xlink="http://www.w3.org/1999/xlink"> - + diff --git a/source/vCardOOo/description/desc_en.txt b/source/vCardOOo/description/desc_en.txt index 0f55a4f4..234785c9 100644 --- a/source/vCardOOo/description/desc_en.txt +++ b/source/vCardOOo/description/desc_en.txt @@ -1 +1 @@ -Your phone contacts finally available in LibreOffice. +Your CardDAV contacts (Nextcloud) finally available in LibreOffice. diff --git a/source/vCardOOo/description/desc_fr.txt b/source/vCardOOo/description/desc_fr.txt index d928ebda..8b69fee4 100644 --- a/source/vCardOOo/description/desc_fr.txt +++ b/source/vCardOOo/description/desc_fr.txt @@ -1 +1 @@ -Vos contacts téléphoniques enfin accessibles dans LibreOffice. +Vos contacts CardDAV (Nextcloud) enfin accessibles dans LibreOffice. diff --git a/source/vCardOOo/package.properties b/source/vCardOOo/package.properties index 60c56bad..c0d587ee 100644 --- a/source/vCardOOo/package.properties +++ b/source/vCardOOo/package.properties @@ -1,3 +1,3 @@ #Written by the OOEclipseIntegration -#Wed Sep 20 23:11:07 CEST 2023 -contents=Drivers.xcu, META-INF, META-INF/manifest.xml, Options.xcs, Options.xcu, OptionsDialog.xcu, description, description/desc_en.txt, description/desc_fr.txt, description.xml, hsqldb, hsqldb/Columns.csv, hsqldb/Properties.csv, hsqldb/PropertyType.csv, hsqldb/Resources.csv, hsqldb/TableColumn.csv, hsqldb/Tables.csv, hsqldb/Types.csv, registration, registration/PrivacyPolicy_en.md, registration/PrivacyPolicy_fr.md, registration/TermsOfUse_en.md, registration/TermsOfUse_fr.md, resource, resource/Driver_en_US.default, resource/Driver_en_US.properties, resource/Driver_fr_FR.properties, resource/Logger_en_US.default, resource/Logger_en_US.properties, resource/Logger_fr_FR.properties, resource/Replicator_en_US.default, resource/Replicator_en_US.properties, resource/Replicator_fr_FR.properties, resource/dbqueries_en_US.default, resource/dbqueries_en_US.properties, resource/dbqueries_fr_FR.properties, resource/dbtool_en_US.default, resource/dbtool_en_US.properties, resource/dbtool_fr_FR.properties, service, service/Driver.py, service/OptionsHandler.py, service/pythonpath, service/pythonpath/decorator.py, service/pythonpath/packaging, service/pythonpath/packaging/__init__.py, service/pythonpath/packaging/_elffile.py, service/pythonpath/packaging/_manylinux.py, service/pythonpath/packaging/_musllinux.py, service/pythonpath/packaging/_parser.py, service/pythonpath/packaging/_structures.py, service/pythonpath/packaging/_tokenizer.py, service/pythonpath/packaging/markers.py, service/pythonpath/packaging/metadata.py, service/pythonpath/packaging/py.typed, service/pythonpath/packaging/requirements.py, service/pythonpath/packaging/specifiers.py, service/pythonpath/packaging/tags.py, service/pythonpath/packaging/utils.py, service/pythonpath/packaging/version.py, service/pythonpath/six.py, service/pythonpath/validators, service/pythonpath/validators/__init__.py, service/pythonpath/validators/between.py, service/pythonpath/validators/btc_address.py, service/pythonpath/validators/card.py, service/pythonpath/validators/domain.py, service/pythonpath/validators/email.py, service/pythonpath/validators/extremes.py, service/pythonpath/validators/hashes.py, service/pythonpath/validators/i18n, service/pythonpath/validators/i18n/__init__.py, service/pythonpath/validators/i18n/es.py, service/pythonpath/validators/i18n/fi.py, service/pythonpath/validators/iban.py, service/pythonpath/validators/ip_address.py, service/pythonpath/validators/length.py, service/pythonpath/validators/mac_address.py, service/pythonpath/validators/slug.py, service/pythonpath/validators/truthy.py, service/pythonpath/validators/url.py, service/pythonpath/validators/utils.py, service/pythonpath/validators/uuid.py, service/pythonpath/vcard, service/pythonpath/vcard/__init__.py, service/pythonpath/vcard/card, service/pythonpath/vcard/card/__init__.py, service/pythonpath/vcard/card/book.py, service/pythonpath/vcard/card/database.py, service/pythonpath/vcard/card/provider.py, service/pythonpath/vcard/card/user.py, service/pythonpath/vcard/cardtool.py, service/pythonpath/vcard/configuration.py, service/pythonpath/vcard/database.py, service/pythonpath/vcard/datasource.py, service/pythonpath/vcard/dbconfig.py, service/pythonpath/vcard/dbinit.py, service/pythonpath/vcard/dbqueries.py, service/pythonpath/vcard/dbtool, service/pythonpath/vcard/dbtool/__init__.py, service/pythonpath/vcard/dbtool/array.py, service/pythonpath/vcard/dbtool/dbtool.py, service/pythonpath/vcard/dbtool/object.py, service/pythonpath/vcard/jdbcdriver, service/pythonpath/vcard/jdbcdriver/__init__.py, service/pythonpath/vcard/jdbcdriver/configuration.py, service/pythonpath/vcard/listener.py, service/pythonpath/vcard/logger, service/pythonpath/vcard/logger/__init__.py, service/pythonpath/vcard/logger/handler.py, service/pythonpath/vcard/logger/log.py, service/pythonpath/vcard/logger/logger.py, service/pythonpath/vcard/logger/loggerpool.py, service/pythonpath/vcard/logger/loghandler.py, service/pythonpath/vcard/logger/loghelper.py, service/pythonpath/vcard/logger/logmanager.py, service/pythonpath/vcard/logger/logmodel.py, service/pythonpath/vcard/logger/logview.py, service/pythonpath/vcard/oauth2, service/pythonpath/vcard/oauth2/__init__.py, service/pythonpath/vcard/oauth2/configuration.py, service/pythonpath/vcard/oauth2/oauth2core.py, service/pythonpath/vcard/oauth2/oauth2lib.py, service/pythonpath/vcard/oauth2/oauth2tools.py, service/pythonpath/vcard/options, service/pythonpath/vcard/options/__init__.py, service/pythonpath/vcard/options/optionsmanager.py, service/pythonpath/vcard/options/optionsmodel.py, service/pythonpath/vcard/options/optionsview.py, service/pythonpath/vcard/provider.py, service/pythonpath/vcard/replicator.py, service/pythonpath/vcard/unolib, service/pythonpath/vcard/unolib/__init__.py, service/pythonpath/vcard/unolib/unocore.py, service/pythonpath/vcard/unolib/unolib.py, service/pythonpath/vcard/unotool, service/pythonpath/vcard/unotool/__init__.py, service/pythonpath/vcard/unotool/unotool.py, vCardOOo, vCardOOo/DialogStrings_en_US.default, vCardOOo/DialogStrings_en_US.properties, vCardOOo/DialogStrings_fr_FR.properties, vCardOOo/LogDialog.xdl, vCardOOo/LogWindow.xdl, vCardOOo/OptionsDialog.xdl, vCardOOo/OptionsDialog_en_US.default, vCardOOo/OptionsDialog_en_US.properties, vCardOOo/OptionsDialog_fr_FR.properties, vCardOOo/dialog.xlb, vCardOOo/script.xlb, vCardOOo/vCardOOo.svg +#Sun Jan 14 22:11:15 CET 2024 +contents=Drivers.xcu, META-INF, META-INF/manifest.xml, Options.xcs, Options.xcu, OptionsDialog.xcu, description, description/desc_en.txt, description/desc_fr.txt, description.xml, hsqldb, hsqldb/Columns.csv, hsqldb/Properties.csv, hsqldb/PropertyType.csv, hsqldb/Resources.csv, hsqldb/TableColumn.csv, hsqldb/Tables.csv, hsqldb/Types.csv, registration, registration/PrivacyPolicy_en.md, registration/PrivacyPolicy_fr.md, registration/TermsOfUse_en.md, registration/TermsOfUse_fr.md, requirements.txt, resource, resource/Driver_en_US.default, resource/Driver_en_US.properties, resource/Driver_fr_FR.properties, resource/Logger_en_US.default, resource/Logger_en_US.properties, resource/Logger_fr_FR.properties, resource/Replicator_en_US.default, resource/Replicator_en_US.properties, resource/Replicator_fr_FR.properties, resource/dbqueries_en_US.default, resource/dbqueries_en_US.properties, resource/dbqueries_fr_FR.properties, resource/dbtool_en_US.default, resource/dbtool_en_US.properties, resource/dbtool_fr_FR.properties, service, service/Driver.py, service/OptionsHandler.py, service/pythonpath, service/pythonpath/_distutils_hack, service/pythonpath/_distutils_hack/__init__.py, service/pythonpath/_distutils_hack/override.py, service/pythonpath/decorator-5.1.1.dist-info, service/pythonpath/decorator-5.1.1.dist-info/LICENSE.txt, service/pythonpath/decorator-5.1.1.dist-info/METADATA, service/pythonpath/decorator-5.1.1.dist-info/RECORD, service/pythonpath/decorator-5.1.1.dist-info/WHEEL, service/pythonpath/decorator-5.1.1.dist-info/pbr.json, service/pythonpath/decorator-5.1.1.dist-info/top_level.txt, service/pythonpath/decorator.py, service/pythonpath/distutils-precedence.pth, service/pythonpath/packaging, service/pythonpath/packaging/__init__.py, service/pythonpath/packaging/_elffile.py, service/pythonpath/packaging/_manylinux.py, service/pythonpath/packaging/_musllinux.py, service/pythonpath/packaging/_parser.py, service/pythonpath/packaging/_structures.py, service/pythonpath/packaging/_tokenizer.py, service/pythonpath/packaging/markers.py, service/pythonpath/packaging/metadata.py, service/pythonpath/packaging/py.typed, service/pythonpath/packaging/requirements.py, service/pythonpath/packaging/specifiers.py, service/pythonpath/packaging/tags.py, service/pythonpath/packaging/utils.py, service/pythonpath/packaging/version.py, service/pythonpath/packaging-23.2.dist-info, service/pythonpath/packaging-23.2.dist-info/LICENSE, service/pythonpath/packaging-23.2.dist-info/LICENSE.APACHE, service/pythonpath/packaging-23.2.dist-info/LICENSE.BSD, service/pythonpath/packaging-23.2.dist-info/METADATA, service/pythonpath/packaging-23.2.dist-info/RECORD, service/pythonpath/packaging-23.2.dist-info/WHEEL, service/pythonpath/pkg_resources, service/pythonpath/pkg_resources/__init__.py, service/pythonpath/pkg_resources/_vendor, service/pythonpath/pkg_resources/_vendor/__init__.py, service/pythonpath/pkg_resources/_vendor/importlib_resources, service/pythonpath/pkg_resources/_vendor/importlib_resources/__init__.py, service/pythonpath/pkg_resources/_vendor/importlib_resources/_adapters.py, service/pythonpath/pkg_resources/_vendor/importlib_resources/_common.py, service/pythonpath/pkg_resources/_vendor/importlib_resources/_compat.py, service/pythonpath/pkg_resources/_vendor/importlib_resources/_itertools.py, service/pythonpath/pkg_resources/_vendor/importlib_resources/_legacy.py, service/pythonpath/pkg_resources/_vendor/importlib_resources/abc.py, service/pythonpath/pkg_resources/_vendor/importlib_resources/py.typed, service/pythonpath/pkg_resources/_vendor/importlib_resources/readers.py, service/pythonpath/pkg_resources/_vendor/importlib_resources/simple.py, service/pythonpath/pkg_resources/_vendor/jaraco, service/pythonpath/pkg_resources/_vendor/jaraco/__init__.py, service/pythonpath/pkg_resources/_vendor/jaraco/context.py, service/pythonpath/pkg_resources/_vendor/jaraco/functools.py, service/pythonpath/pkg_resources/_vendor/jaraco/text, service/pythonpath/pkg_resources/_vendor/jaraco/text/__init__.py, service/pythonpath/pkg_resources/_vendor/more_itertools, service/pythonpath/pkg_resources/_vendor/more_itertools/__init__.py, service/pythonpath/pkg_resources/_vendor/more_itertools/__init__.pyi, service/pythonpath/pkg_resources/_vendor/more_itertools/more.py, service/pythonpath/pkg_resources/_vendor/more_itertools/more.pyi, service/pythonpath/pkg_resources/_vendor/more_itertools/py.typed, service/pythonpath/pkg_resources/_vendor/more_itertools/recipes.py, service/pythonpath/pkg_resources/_vendor/more_itertools/recipes.pyi, service/pythonpath/pkg_resources/_vendor/packaging, service/pythonpath/pkg_resources/_vendor/packaging/__init__.py, service/pythonpath/pkg_resources/_vendor/packaging/_elffile.py, service/pythonpath/pkg_resources/_vendor/packaging/_manylinux.py, service/pythonpath/pkg_resources/_vendor/packaging/_musllinux.py, service/pythonpath/pkg_resources/_vendor/packaging/_parser.py, service/pythonpath/pkg_resources/_vendor/packaging/_structures.py, service/pythonpath/pkg_resources/_vendor/packaging/_tokenizer.py, service/pythonpath/pkg_resources/_vendor/packaging/markers.py, service/pythonpath/pkg_resources/_vendor/packaging/metadata.py, service/pythonpath/pkg_resources/_vendor/packaging/py.typed, service/pythonpath/pkg_resources/_vendor/packaging/requirements.py, service/pythonpath/pkg_resources/_vendor/packaging/specifiers.py, service/pythonpath/pkg_resources/_vendor/packaging/tags.py, service/pythonpath/pkg_resources/_vendor/packaging/utils.py, service/pythonpath/pkg_resources/_vendor/packaging/version.py, service/pythonpath/pkg_resources/_vendor/platformdirs, service/pythonpath/pkg_resources/_vendor/platformdirs/__init__.py, service/pythonpath/pkg_resources/_vendor/platformdirs/__main__.py, service/pythonpath/pkg_resources/_vendor/platformdirs/android.py, service/pythonpath/pkg_resources/_vendor/platformdirs/api.py, service/pythonpath/pkg_resources/_vendor/platformdirs/macos.py, service/pythonpath/pkg_resources/_vendor/platformdirs/py.typed, service/pythonpath/pkg_resources/_vendor/platformdirs/unix.py, service/pythonpath/pkg_resources/_vendor/platformdirs/version.py, service/pythonpath/pkg_resources/_vendor/platformdirs/windows.py, service/pythonpath/pkg_resources/_vendor/typing_extensions.py, service/pythonpath/pkg_resources/_vendor/zipp.py, service/pythonpath/pkg_resources/extern, service/pythonpath/pkg_resources/extern/__init__.py, service/pythonpath/setuptools, service/pythonpath/setuptools/__init__.py, service/pythonpath/setuptools/_core_metadata.py, service/pythonpath/setuptools/_distutils, service/pythonpath/setuptools/_distutils/__init__.py, service/pythonpath/setuptools/_distutils/_collections.py, service/pythonpath/setuptools/_distutils/_functools.py, service/pythonpath/setuptools/_distutils/_log.py, service/pythonpath/setuptools/_distutils/_macos_compat.py, service/pythonpath/setuptools/_distutils/_modified.py, service/pythonpath/setuptools/_distutils/_msvccompiler.py, service/pythonpath/setuptools/_distutils/archive_util.py, service/pythonpath/setuptools/_distutils/bcppcompiler.py, service/pythonpath/setuptools/_distutils/ccompiler.py, service/pythonpath/setuptools/_distutils/cmd.py, service/pythonpath/setuptools/_distutils/command, service/pythonpath/setuptools/_distutils/command/__init__.py, service/pythonpath/setuptools/_distutils/command/_framework_compat.py, service/pythonpath/setuptools/_distutils/command/bdist.py, service/pythonpath/setuptools/_distutils/command/bdist_dumb.py, service/pythonpath/setuptools/_distutils/command/bdist_rpm.py, service/pythonpath/setuptools/_distutils/command/build.py, service/pythonpath/setuptools/_distutils/command/build_clib.py, service/pythonpath/setuptools/_distutils/command/build_ext.py, service/pythonpath/setuptools/_distutils/command/build_py.py, service/pythonpath/setuptools/_distutils/command/build_scripts.py, service/pythonpath/setuptools/_distutils/command/check.py, service/pythonpath/setuptools/_distutils/command/clean.py, service/pythonpath/setuptools/_distutils/command/config.py, service/pythonpath/setuptools/_distutils/command/install.py, service/pythonpath/setuptools/_distutils/command/install_data.py, service/pythonpath/setuptools/_distutils/command/install_egg_info.py, service/pythonpath/setuptools/_distutils/command/install_headers.py, service/pythonpath/setuptools/_distutils/command/install_lib.py, service/pythonpath/setuptools/_distutils/command/install_scripts.py, service/pythonpath/setuptools/_distutils/command/py37compat.py, service/pythonpath/setuptools/_distutils/command/register.py, service/pythonpath/setuptools/_distutils/command/sdist.py, service/pythonpath/setuptools/_distutils/command/upload.py, service/pythonpath/setuptools/_distutils/config.py, service/pythonpath/setuptools/_distutils/core.py, service/pythonpath/setuptools/_distutils/cygwinccompiler.py, service/pythonpath/setuptools/_distutils/debug.py, service/pythonpath/setuptools/_distutils/dep_util.py, service/pythonpath/setuptools/_distutils/dir_util.py, service/pythonpath/setuptools/_distutils/dist.py, service/pythonpath/setuptools/_distutils/errors.py, service/pythonpath/setuptools/_distutils/extension.py, service/pythonpath/setuptools/_distutils/fancy_getopt.py, service/pythonpath/setuptools/_distutils/file_util.py, service/pythonpath/setuptools/_distutils/filelist.py, service/pythonpath/setuptools/_distutils/log.py, service/pythonpath/setuptools/_distutils/msvc9compiler.py, service/pythonpath/setuptools/_distutils/msvccompiler.py, service/pythonpath/setuptools/_distutils/py38compat.py, service/pythonpath/setuptools/_distutils/py39compat.py, service/pythonpath/setuptools/_distutils/spawn.py, service/pythonpath/setuptools/_distutils/sysconfig.py, service/pythonpath/setuptools/_distutils/text_file.py, service/pythonpath/setuptools/_distutils/unixccompiler.py, service/pythonpath/setuptools/_distutils/util.py, service/pythonpath/setuptools/_distutils/version.py, service/pythonpath/setuptools/_distutils/versionpredicate.py, service/pythonpath/setuptools/_entry_points.py, service/pythonpath/setuptools/_imp.py, service/pythonpath/setuptools/_importlib.py, service/pythonpath/setuptools/_itertools.py, service/pythonpath/setuptools/_normalization.py, service/pythonpath/setuptools/_path.py, service/pythonpath/setuptools/_reqs.py, service/pythonpath/setuptools/_vendor, service/pythonpath/setuptools/_vendor/__init__.py, service/pythonpath/setuptools/_vendor/importlib_metadata, service/pythonpath/setuptools/_vendor/importlib_metadata/__init__.py, service/pythonpath/setuptools/_vendor/importlib_metadata/_adapters.py, service/pythonpath/setuptools/_vendor/importlib_metadata/_collections.py, service/pythonpath/setuptools/_vendor/importlib_metadata/_compat.py, service/pythonpath/setuptools/_vendor/importlib_metadata/_functools.py, service/pythonpath/setuptools/_vendor/importlib_metadata/_itertools.py, service/pythonpath/setuptools/_vendor/importlib_metadata/_meta.py, service/pythonpath/setuptools/_vendor/importlib_metadata/_py39compat.py, service/pythonpath/setuptools/_vendor/importlib_metadata/_text.py, service/pythonpath/setuptools/_vendor/importlib_metadata/py.typed, service/pythonpath/setuptools/_vendor/importlib_resources, service/pythonpath/setuptools/_vendor/importlib_resources/__init__.py, service/pythonpath/setuptools/_vendor/importlib_resources/_adapters.py, service/pythonpath/setuptools/_vendor/importlib_resources/_common.py, service/pythonpath/setuptools/_vendor/importlib_resources/_compat.py, service/pythonpath/setuptools/_vendor/importlib_resources/_itertools.py, service/pythonpath/setuptools/_vendor/importlib_resources/_legacy.py, service/pythonpath/setuptools/_vendor/importlib_resources/abc.py, service/pythonpath/setuptools/_vendor/importlib_resources/py.typed, service/pythonpath/setuptools/_vendor/importlib_resources/readers.py, service/pythonpath/setuptools/_vendor/importlib_resources/simple.py, service/pythonpath/setuptools/_vendor/jaraco, service/pythonpath/setuptools/_vendor/jaraco/__init__.py, service/pythonpath/setuptools/_vendor/jaraco/context.py, service/pythonpath/setuptools/_vendor/jaraco/functools.py, service/pythonpath/setuptools/_vendor/jaraco/text, service/pythonpath/setuptools/_vendor/jaraco/text/__init__.py, service/pythonpath/setuptools/_vendor/more_itertools, service/pythonpath/setuptools/_vendor/more_itertools/__init__.py, service/pythonpath/setuptools/_vendor/more_itertools/__init__.pyi, service/pythonpath/setuptools/_vendor/more_itertools/more.py, service/pythonpath/setuptools/_vendor/more_itertools/more.pyi, service/pythonpath/setuptools/_vendor/more_itertools/py.typed, service/pythonpath/setuptools/_vendor/more_itertools/recipes.py, service/pythonpath/setuptools/_vendor/more_itertools/recipes.pyi, service/pythonpath/setuptools/_vendor/ordered_set.py, service/pythonpath/setuptools/_vendor/packaging, service/pythonpath/setuptools/_vendor/packaging/__init__.py, service/pythonpath/setuptools/_vendor/packaging/_elffile.py, service/pythonpath/setuptools/_vendor/packaging/_manylinux.py, service/pythonpath/setuptools/_vendor/packaging/_musllinux.py, service/pythonpath/setuptools/_vendor/packaging/_parser.py, service/pythonpath/setuptools/_vendor/packaging/_structures.py, service/pythonpath/setuptools/_vendor/packaging/_tokenizer.py, service/pythonpath/setuptools/_vendor/packaging/markers.py, service/pythonpath/setuptools/_vendor/packaging/metadata.py, service/pythonpath/setuptools/_vendor/packaging/py.typed, service/pythonpath/setuptools/_vendor/packaging/requirements.py, service/pythonpath/setuptools/_vendor/packaging/specifiers.py, service/pythonpath/setuptools/_vendor/packaging/tags.py, service/pythonpath/setuptools/_vendor/packaging/utils.py, service/pythonpath/setuptools/_vendor/packaging/version.py, service/pythonpath/setuptools/_vendor/tomli, service/pythonpath/setuptools/_vendor/tomli/__init__.py, service/pythonpath/setuptools/_vendor/tomli/_parser.py, service/pythonpath/setuptools/_vendor/tomli/_re.py, service/pythonpath/setuptools/_vendor/tomli/_types.py, service/pythonpath/setuptools/_vendor/tomli/py.typed, service/pythonpath/setuptools/_vendor/typing_extensions.py, service/pythonpath/setuptools/_vendor/zipp.py, service/pythonpath/setuptools/archive_util.py, service/pythonpath/setuptools/build_meta.py, service/pythonpath/setuptools/cli-32.exe, service/pythonpath/setuptools/cli-64.exe, service/pythonpath/setuptools/cli-arm64.exe, service/pythonpath/setuptools/cli.exe, service/pythonpath/setuptools/command, service/pythonpath/setuptools/command/__init__.py, service/pythonpath/setuptools/command/_requirestxt.py, service/pythonpath/setuptools/command/alias.py, service/pythonpath/setuptools/command/bdist_egg.py, service/pythonpath/setuptools/command/bdist_rpm.py, service/pythonpath/setuptools/command/build.py, service/pythonpath/setuptools/command/build_clib.py, service/pythonpath/setuptools/command/build_ext.py, service/pythonpath/setuptools/command/build_py.py, service/pythonpath/setuptools/command/develop.py, service/pythonpath/setuptools/command/dist_info.py, service/pythonpath/setuptools/command/easy_install.py, service/pythonpath/setuptools/command/editable_wheel.py, service/pythonpath/setuptools/command/egg_info.py, service/pythonpath/setuptools/command/install.py, service/pythonpath/setuptools/command/install_egg_info.py, service/pythonpath/setuptools/command/install_lib.py, service/pythonpath/setuptools/command/install_scripts.py, service/pythonpath/setuptools/command/launcher manifest.xml, service/pythonpath/setuptools/command/register.py, service/pythonpath/setuptools/command/rotate.py, service/pythonpath/setuptools/command/saveopts.py, service/pythonpath/setuptools/command/sdist.py, service/pythonpath/setuptools/command/setopt.py, service/pythonpath/setuptools/command/test.py, service/pythonpath/setuptools/command/upload.py, service/pythonpath/setuptools/command/upload_docs.py, service/pythonpath/setuptools/config, service/pythonpath/setuptools/config/__init__.py, service/pythonpath/setuptools/config/_apply_pyprojecttoml.py, service/pythonpath/setuptools/config/_validate_pyproject, service/pythonpath/setuptools/config/_validate_pyproject/__init__.py, service/pythonpath/setuptools/config/_validate_pyproject/error_reporting.py, service/pythonpath/setuptools/config/_validate_pyproject/extra_validations.py, service/pythonpath/setuptools/config/_validate_pyproject/fastjsonschema_exceptions.py, service/pythonpath/setuptools/config/_validate_pyproject/fastjsonschema_validations.py, service/pythonpath/setuptools/config/_validate_pyproject/formats.py, service/pythonpath/setuptools/config/expand.py, service/pythonpath/setuptools/config/pyprojecttoml.py, service/pythonpath/setuptools/config/setupcfg.py, service/pythonpath/setuptools/dep_util.py, service/pythonpath/setuptools/depends.py, service/pythonpath/setuptools/discovery.py, service/pythonpath/setuptools/dist.py, service/pythonpath/setuptools/errors.py, service/pythonpath/setuptools/extension.py, service/pythonpath/setuptools/extern, service/pythonpath/setuptools/extern/__init__.py, service/pythonpath/setuptools/glob.py, service/pythonpath/setuptools/gui-32.exe, service/pythonpath/setuptools/gui-64.exe, service/pythonpath/setuptools/gui-arm64.exe, service/pythonpath/setuptools/gui.exe, service/pythonpath/setuptools/installer.py, service/pythonpath/setuptools/launch.py, service/pythonpath/setuptools/logging.py, service/pythonpath/setuptools/modified.py, service/pythonpath/setuptools/monkey.py, service/pythonpath/setuptools/msvc.py, service/pythonpath/setuptools/namespaces.py, service/pythonpath/setuptools/package_index.py, service/pythonpath/setuptools/py312compat.py, service/pythonpath/setuptools/sandbox.py, service/pythonpath/setuptools/script (dev).tmpl, service/pythonpath/setuptools/script.tmpl, service/pythonpath/setuptools/unicode_utils.py, service/pythonpath/setuptools/version.py, service/pythonpath/setuptools/warnings.py, service/pythonpath/setuptools/wheel.py, service/pythonpath/setuptools/windows_support.py, service/pythonpath/setuptools-69.0.3.dist-info, service/pythonpath/setuptools-69.0.3.dist-info/LICENSE, service/pythonpath/setuptools-69.0.3.dist-info/METADATA, service/pythonpath/setuptools-69.0.3.dist-info/RECORD, service/pythonpath/setuptools-69.0.3.dist-info/WHEEL, service/pythonpath/setuptools-69.0.3.dist-info/entry_points.txt, service/pythonpath/setuptools-69.0.3.dist-info/top_level.txt, service/pythonpath/six-1.16.0.dist-info, service/pythonpath/six-1.16.0.dist-info/LICENSE, service/pythonpath/six-1.16.0.dist-info/METADATA, service/pythonpath/six-1.16.0.dist-info/RECORD, service/pythonpath/six-1.16.0.dist-info/WHEEL, service/pythonpath/six-1.16.0.dist-info/top_level.txt, service/pythonpath/six.py, service/pythonpath/validators, service/pythonpath/validators/__init__.py, service/pythonpath/validators/_extremes.py, service/pythonpath/validators/between.py, service/pythonpath/validators/btc_address.py, service/pythonpath/validators/card.py, service/pythonpath/validators/country_code.py, service/pythonpath/validators/domain.py, service/pythonpath/validators/email.py, service/pythonpath/validators/hashes.py, service/pythonpath/validators/hostname.py, service/pythonpath/validators/i18n, service/pythonpath/validators/i18n/__init__.py, service/pythonpath/validators/i18n/es.py, service/pythonpath/validators/i18n/fi.py, service/pythonpath/validators/iban.py, service/pythonpath/validators/ip_address.py, service/pythonpath/validators/length.py, service/pythonpath/validators/mac_address.py, service/pythonpath/validators/slug.py, service/pythonpath/validators/url.py, service/pythonpath/validators/utils.py, service/pythonpath/validators/uuid.py, service/pythonpath/validators-0.22.0.dist-info, service/pythonpath/validators-0.22.0.dist-info/LICENSE, service/pythonpath/validators-0.22.0.dist-info/METADATA, service/pythonpath/validators-0.22.0.dist-info/RECORD, service/pythonpath/validators-0.22.0.dist-info/WHEEL, service/pythonpath/validators-0.22.0.dist-info/top_level.txt, service/pythonpath/vcard, service/pythonpath/vcard/__init__.py, service/pythonpath/vcard/card, service/pythonpath/vcard/card/__init__.py, service/pythonpath/vcard/card/book.py, service/pythonpath/vcard/card/database.py, service/pythonpath/vcard/card/provider.py, service/pythonpath/vcard/card/user.py, service/pythonpath/vcard/cardtool.py, service/pythonpath/vcard/configuration.py, service/pythonpath/vcard/database.py, service/pythonpath/vcard/datasource.py, service/pythonpath/vcard/dbconfig.py, service/pythonpath/vcard/dbinit.py, service/pythonpath/vcard/dbqueries.py, service/pythonpath/vcard/dbtool, service/pythonpath/vcard/dbtool/__init__.py, service/pythonpath/vcard/dbtool/array.py, service/pythonpath/vcard/dbtool/dbtool.py, service/pythonpath/vcard/dbtool/object.py, service/pythonpath/vcard/jdbcdriver, service/pythonpath/vcard/jdbcdriver/__init__.py, service/pythonpath/vcard/jdbcdriver/configuration.py, service/pythonpath/vcard/listener.py, service/pythonpath/vcard/logger, service/pythonpath/vcard/logger/__init__.py, service/pythonpath/vcard/logger/dialog, service/pythonpath/vcard/logger/dialog/__init__.py, service/pythonpath/vcard/logger/dialog/loghandler.py, service/pythonpath/vcard/logger/dialog/logmanager.py, service/pythonpath/vcard/logger/dialog/logmodel.py, service/pythonpath/vcard/logger/dialog/logview.py, service/pythonpath/vcard/logger/logger.py, service/pythonpath/vcard/logger/loggerpool.py, service/pythonpath/vcard/logger/loghandler.py, service/pythonpath/vcard/logger/loghelper.py, service/pythonpath/vcard/oauth2, service/pythonpath/vcard/oauth2/__init__.py, service/pythonpath/vcard/oauth2/configuration.py, service/pythonpath/vcard/oauth2/oauth2core.py, service/pythonpath/vcard/oauth2/oauth2lib.py, service/pythonpath/vcard/oauth2/oauth2tools.py, service/pythonpath/vcard/options, service/pythonpath/vcard/options/__init__.py, service/pythonpath/vcard/options/optionsmanager.py, service/pythonpath/vcard/options/optionsmodel.py, service/pythonpath/vcard/options/optionsview.py, service/pythonpath/vcard/provider.py, service/pythonpath/vcard/replicator.py, service/pythonpath/vcard/unolib, service/pythonpath/vcard/unolib/__init__.py, service/pythonpath/vcard/unolib/unocore.py, service/pythonpath/vcard/unolib/unolib.py, service/pythonpath/vcard/unotool, service/pythonpath/vcard/unotool/__init__.py, service/pythonpath/vcard/unotool/unotool.py, vCardOOo, vCardOOo/DialogStrings_en_US.default, vCardOOo/DialogStrings_en_US.properties, vCardOOo/DialogStrings_fr_FR.properties, vCardOOo/LogDialog.xdl, vCardOOo/LogWindow.xdl, vCardOOo/OptionsDialog.xdl, vCardOOo/OptionsDialog_en_US.default, vCardOOo/OptionsDialog_en_US.properties, vCardOOo/OptionsDialog_fr_FR.properties, vCardOOo/dialog.xlb, vCardOOo/script.xlb, vCardOOo/vCardOOo.svg diff --git a/source/vCardOOo/registration/PrivacyPolicy_en.md b/source/vCardOOo/registration/PrivacyPolicy_en.md index 8ec0259b..6f6f9dcd 100644 --- a/source/vCardOOo/registration/PrivacyPolicy_en.md +++ b/source/vCardOOo/registration/PrivacyPolicy_en.md @@ -73,6 +73,6 @@ Use of the `Supplier` services through `OAuth2OOo` and/or `vCardOOo` may subject [1]: [2]: [3]: -[4]: -[5]: +[4]: +[5]: [6]: diff --git a/source/vCardOOo/registration/PrivacyPolicy_fr.md b/source/vCardOOo/registration/PrivacyPolicy_fr.md index 7a5f4451..68807c1e 100644 --- a/source/vCardOOo/registration/PrivacyPolicy_fr.md +++ b/source/vCardOOo/registration/PrivacyPolicy_fr.md @@ -73,6 +73,6 @@ Le `Fournisseur` est seul responsable de l'expiration des données qu'il collect [1]: [2]: [3]: -[4]: -[5]: +[4]: +[5]: [6]: diff --git a/source/vCardOOo/requirements.txt b/source/vCardOOo/requirements.txt new file mode 100644 index 00000000..54bbe78e --- /dev/null +++ b/source/vCardOOo/requirements.txt @@ -0,0 +1,5 @@ +decorator>=5.1.1 +packaging>=23.2 +setuptools>=69.0.3 +six>=1.16.0 +validators>=0.22.0 diff --git a/source/vCardOOo/service/Driver.py b/source/vCardOOo/service/Driver.py index e38f73c9..22aeddce 100644 --- a/source/vCardOOo/service/Driver.py +++ b/source/vCardOOo/service/Driver.py @@ -75,7 +75,7 @@ # pythonloader looks for a static g_ImplementationHelper variable g_ImplementationHelper = unohelper.ImplementationHelper() -g_ImplementationName = '%s.Driver' % g_identifier +g_ImplementationName = f'{g_identifier}.Driver' class Driver(unohelper.Base, diff --git a/source/vCardOOo/service/OptionsHandler.py b/source/vCardOOo/service/OptionsHandler.py index 7266aaf1..7908cfa9 100644 --- a/source/vCardOOo/service/OptionsHandler.py +++ b/source/vCardOOo/service/OptionsHandler.py @@ -29,18 +29,23 @@ import unohelper +from com.sun.star.logging.LogLevel import SEVERE + from com.sun.star.lang import XServiceInfo from com.sun.star.awt import XContainerWindowEventHandler from vcard import OptionsManager +from vcard import getLogger + from vcard import g_identifier +from vcard import g_defaultlog import traceback # pythonloader looks for a static g_ImplementationHelper variable g_ImplementationHelper = unohelper.ImplementationHelper() -g_ImplementationName = '%s.OptionsHandler' % g_identifier +g_ImplementationName = f'{g_identifier}.OptionsHandler' class OptionsHandler(unohelper.Base, @@ -49,6 +54,7 @@ class OptionsHandler(unohelper.Base, def __init__(self, ctx): self._ctx = ctx self._manager = None + self._logger = getLogger(ctx, g_defaultlog) # XContainerWindowEventHandler def callHandlerMethod(self, window, event, method): @@ -56,7 +62,7 @@ def callHandlerMethod(self, window, event, method): handled = False if method == 'external_event': if event == 'initialize': - self._manager = OptionsManager(self._ctx, window, False) + self._manager = OptionsManager(self._ctx, window, self._logger) handled = True elif event == 'ok': self._manager.saveSetting() @@ -69,8 +75,7 @@ def callHandlerMethod(self, window, event, method): handled = True return handled except Exception as e: - msg = "OptionsHandler.callHandlerMethod() Error: %s" % traceback.format_exc() - print(msg) + self._logger.logprb(SEVERE, 'OptionsHandler', 'callHandlerMethod()', 141, e, traceback.format_exc()) def getSupportedMethodNames(self): return ('external_event', diff --git a/source/vCardOOo/service/pythonpath/_distutils_hack b/source/vCardOOo/service/pythonpath/_distutils_hack new file mode 120000 index 00000000..9b97a0a6 --- /dev/null +++ b/source/vCardOOo/service/pythonpath/_distutils_hack @@ -0,0 +1 @@ +../../../../uno/lib/python/_distutils_hack \ No newline at end of file diff --git a/source/vCardOOo/service/pythonpath/decorator-5.1.1.dist-info b/source/vCardOOo/service/pythonpath/decorator-5.1.1.dist-info new file mode 120000 index 00000000..ea198ede --- /dev/null +++ b/source/vCardOOo/service/pythonpath/decorator-5.1.1.dist-info @@ -0,0 +1 @@ +../../../../uno/lib/python/decorator-5.1.1.dist-info \ No newline at end of file diff --git a/source/vCardOOo/service/pythonpath/distutils-precedence.pth b/source/vCardOOo/service/pythonpath/distutils-precedence.pth new file mode 120000 index 00000000..f655d29b --- /dev/null +++ b/source/vCardOOo/service/pythonpath/distutils-precedence.pth @@ -0,0 +1 @@ +../../../../uno/lib/python/distutils-precedence.pth \ No newline at end of file diff --git a/source/vCardOOo/service/pythonpath/packaging-23.2.dist-info b/source/vCardOOo/service/pythonpath/packaging-23.2.dist-info new file mode 120000 index 00000000..e94fcb74 --- /dev/null +++ b/source/vCardOOo/service/pythonpath/packaging-23.2.dist-info @@ -0,0 +1 @@ +../../../../uno/lib/python/packaging-23.2.dist-info \ No newline at end of file diff --git a/source/vCardOOo/service/pythonpath/pkg_resources b/source/vCardOOo/service/pythonpath/pkg_resources new file mode 120000 index 00000000..db3d6076 --- /dev/null +++ b/source/vCardOOo/service/pythonpath/pkg_resources @@ -0,0 +1 @@ +../../../../uno/lib/python/pkg_resources \ No newline at end of file diff --git a/source/vCardOOo/service/pythonpath/setuptools b/source/vCardOOo/service/pythonpath/setuptools new file mode 120000 index 00000000..497add86 --- /dev/null +++ b/source/vCardOOo/service/pythonpath/setuptools @@ -0,0 +1 @@ +../../../../uno/lib/python/setuptools \ No newline at end of file diff --git a/source/vCardOOo/service/pythonpath/setuptools-69.0.3.dist-info b/source/vCardOOo/service/pythonpath/setuptools-69.0.3.dist-info new file mode 120000 index 00000000..31c48433 --- /dev/null +++ b/source/vCardOOo/service/pythonpath/setuptools-69.0.3.dist-info @@ -0,0 +1 @@ +../../../../uno/lib/python/setuptools-69.0.3.dist-info \ No newline at end of file diff --git a/source/vCardOOo/service/pythonpath/six-1.16.0.dist-info b/source/vCardOOo/service/pythonpath/six-1.16.0.dist-info new file mode 120000 index 00000000..91a256c2 --- /dev/null +++ b/source/vCardOOo/service/pythonpath/six-1.16.0.dist-info @@ -0,0 +1 @@ +../../../../uno/lib/python/six-1.16.0.dist-info \ No newline at end of file diff --git a/source/vCardOOo/service/pythonpath/validators-0.22.0.dist-info b/source/vCardOOo/service/pythonpath/validators-0.22.0.dist-info new file mode 120000 index 00000000..a4f8c894 --- /dev/null +++ b/source/vCardOOo/service/pythonpath/validators-0.22.0.dist-info @@ -0,0 +1 @@ +../../../../uno/lib/python/validators-0.22.0.dist-info \ No newline at end of file diff --git a/source/vCardOOo/service/pythonpath/vcard/provider.py b/source/vCardOOo/service/pythonpath/vcard/provider.py index 1bf37740..1e040de7 100644 --- a/source/vCardOOo/service/pythonpath/vcard/provider.py +++ b/source/vCardOOo/service/pythonpath/vcard/provider.py @@ -44,7 +44,7 @@ class Provider(ProviderBase): - def __init__(self, ctx): + def __init__(self, ctx, database): ProviderBase.__init__(self, ctx) self._chunk = 256 self._cardsync = '%s.CardSync' % g_identifier diff --git a/vCardOOo.update.xml b/vCardOOo.update.xml index d8a87c72..c3ea650f 100644 --- a/vCardOOo.update.xml +++ b/vCardOOo.update.xml @@ -28,7 +28,7 @@ xmlns="http://openoffice.org/extensions/update/2006" xmlns:xlink="http://www.w3.org/1999/xlink"> - +