new version 1.1.5

.github/workflows/fascan.yml

@@ -1,30 +1,31 @@
 # .github/workflows/fascan.yml
 name: Fluid Attacks Scan
-on: [push, pull_request]
+on: [push, pull_request, workflow_dispatch]
 jobs:
   machineStandalone:
     name: machineStandalone job
     runs-on: ubuntu-latest
 
-    permissions:
-      # Give the default GITHUB_TOKEN write permission to commit and push the
-      # added or changed files to the repository.
-      contents: write
-
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4
         with:
           ref: ${{ github.head_ref }}
 
       - name: Fluid-Attacks scan
-        uses: docker://ghcr.io/fluidattacks/makes/amd64
+        id: scan
+        continue-on-error: true
+        uses: docker://docker.io/fluidattacks/cli:latest
         with:
-          args: m gitlab:fluidattacks/universe@trunk /skims scan ./_fascan.yml
+          args: skims scan ./_fascan.yml
 
       - name: Commit and push changes
         run: |
           git config user.name github-actions
           git config user.email github-actions@github.com
-          git commit -am "Fluid-Attacks Results.csv commit" || exit 0
-          git push
+          git commit -am "Fluid-Attacks-Results.csv commit" || exit 0
+          git push origin HEAD:master
+
+      - name: Check for failures
+        if: steps.scan.outcome != 'success'
+        run: exit 1

Fluid-Attacks-Results.csv

@@ -1,2 +1,2 @@
-title,cwe,description,cvss,cvss_v4,finding,stream,kind,where,snippet,method
+title,cwe,description,cvss,finding,stream,kind,where,snippet,method
 Summary: No vulnerabilities were found in your targets.

Fluid-Attacks-Scan.sh

@@ -1,3 +1,3 @@
 #!/bin/bash
-docker run -v ~/github/dDriveOOo:/working-dir ghcr.io/fluidattacks/makes/amd64 m gitlab:fluidattacks/universe@trunk /skims scan ./_fascan.yml
-docker system prune -f
+docker run -v ~/github/dDriveOOo:/src -v ./_fascan.yml:/fascan.yml fluidattacks/cli:latest skims scan /fascan.yml
+#docker system prune -f

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.1.4][6]
+# version [1.1.5][6]
 
 ## Introduction:
 
@@ -252,7 +252,12 @@ Although this functionality is only needed for gDriveOOo, it is implemented glob
 - Changes to extension options that require a restart of LibreOffice will result in a message being displayed.
 - Support for LibreOffice version 24.8.x.
 
-### What remains to be done for version 1.1.4:
+### What has been done for version 1.1.5:
+
+- The extension will ask you to install the OAuth2OOo and jdbcDriverOOo extensions in versions 1.3.8 and 1.4.6 respectively minimum.
+- Modification of the extension options accessible via: **Tools -> Options... -> Internet -> dDriveOOo** in order to comply with the new graphic charter.
+
+### What remains to be done for version 1.1.5:
 
 - Add new language for internationalization...
 
@@ -263,7 +268,7 @@ Although this functionality is only needed for gDriveOOo, it is implemented glob
 [3]: <https://prrvchr.github.io/dDriveOOo/README_fr>
 [4]: <https://prrvchr.github.io/dDriveOOo/source/dDriveOOo/registration/TermsOfUse_en>
 [5]: <https://prrvchr.github.io/dDriveOOo/source/dDriveOOo/registration/PrivacyPolicy_en>
-[6]: <https://prrvchr.github.io/dDriveOOo#what-has-been-done-for-version-114>
+[6]: <https://prrvchr.github.io/dDriveOOo#what-has-been-done-for-version-115>
 [7]: <https://prrvchr.github.io/>
 [8]: <https://www.libreoffice.org/download/download/>
 [9]: <https://www.openoffice.org/download/index.html>
@@ -284,7 +289,7 @@ Although this functionality is only needed for gDriveOOo, it is implemented glob
 [24]: <https://img.shields.io/github/v/tag/prrvchr/jdbcDriverOOo?label=latest#right>
 [25]: <img/dDriveOOo.svg#middle>
 [26]: <https://github.com/prrvchr/dDriveOOo/releases/latest/download/dDriveOOo.oxt>
-[27]: <https://img.shields.io/github/downloads/prrvchr/dDriveOOo/latest/total?label=v1.1.4#right>
+[27]: <https://img.shields.io/github/downloads/prrvchr/dDriveOOo/latest/total?label=v1.1.5#right>
 [28]: <https://bz.apache.org/ooo/show_bug.cgi?id=128569>
 [29]: <https://github.com/prrvchr/dDriveOOo/blob/master/uno/lib/uno/ucb/replicator.py>
 [30]: <https://github.com/prrvchr/dDriveOOo/blob/master/uno/lib/uno/ucb/database.py>

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.1.4][6]
+# version [1.1.5][6]
 
 ## Introduction:
 
@@ -252,7 +252,12 @@ Bien que cette fonctionnalité ne soit nécessaire que pour gDriveOOo, elle est
 - Les modifications apportées aux options de l'extension, qui nécessitent un redémarrage de LibreOffice, entraîneront l'affichage d'un message.
 - Support de LibreOffice version 24.8.x.
 
-### Que reste-t-il à faire pour la version 1.1.4:
+### Ce qui a été fait pour la version 1.1.5:
+
+- L'extension vous demandera d'installer les extensions OAuth2OOo et jdbcDriverOOo en version respectivement 1.3.8 et 1.4.6 minimum.
+- Modification des options de l'extension accessibles via : **Outils -> Options... -> Internet -> dDriveOOo** afin de respecter la nouvelle charte graphique.
+
+### Que reste-t-il à faire pour la version 1.1.5:
 
 - Ajouter de nouvelles langue pour l'internationalisation...
 
@@ -263,7 +268,7 @@ Bien que cette fonctionnalité ne soit nécessaire que pour gDriveOOo, elle est
 [3]: <https://prrvchr.github.io/dDriveOOo>
 [4]: <https://prrvchr.github.io/dDriveOOo/source/dDriveOOo/registration/TermsOfUse_fr>
 [5]: <https://prrvchr.github.io/dDriveOOo/source/dDriveOOo/registration/PrivacyPolicy_fr>
-[6]: <https://prrvchr.github.io/dDriveOOo/README_fr#ce-qui-a-%C3%A9t%C3%A9-fait-pour-la-version-114>
+[6]: <https://prrvchr.github.io/dDriveOOo/README_fr#ce-qui-a-%C3%A9t%C3%A9-fait-pour-la-version-115>
 [7]: <https://prrvchr.github.io/README_fr>
 [8]: <https://fr.libreoffice.org/download/telecharger-libreoffice/>
 [9]: <https://www.openoffice.org/fr/Telecharger/>
@@ -284,7 +289,7 @@ Bien que cette fonctionnalité ne soit nécessaire que pour gDriveOOo, elle est
 [24]: <https://img.shields.io/github/v/tag/prrvchr/jdbcDriverOOo?label=latest#right>
 [25]: <img/dDriveOOo.svg#middle>
 [26]: <https://github.com/prrvchr/dDriveOOo/releases/latest/download/dDriveOOo.oxt>
-[27]: <https://img.shields.io/github/downloads/prrvchr/dDriveOOo/latest/total?label=v1.1.4#right>
+[27]: <https://img.shields.io/github/downloads/prrvchr/dDriveOOo/latest/total?label=v1.1.5#right>
 [28]: <https://bz.apache.org/ooo/show_bug.cgi?id=128569>
 [29]: <https://github.com/prrvchr/dDriveOOo/blob/master/uno/lib/uno/ucb/replicator.py>
 [30]: <https://github.com/prrvchr/dDriveOOo/blob/master/uno/lib/uno/ucb/database.py>

dDriveOOo.update.xml

@@ -28,7 +28,7 @@
   xmlns="http://openoffice.org/extensions/update/2006"
   xmlns:xlink="http://www.w3.org/1999/xlink">
     <identifier value="io.github.prrvchr.dDriveOOo"/>
-    <version value="1.1.4"/>
+    <version value="1.1.5"/>
     <update-download>
         <src xlink:href="https://github.com/prrvchr/dDriveOOo/releases/latest/download/dDriveOOo.oxt"/>
     </update-download>
@@ -40,7 +40,7 @@
         <name xlink:href="https://prrvchr.github.io/dDriveOOo/README_fr" lang="fr">dDriveOOo</name>
     </publisher>
     <release-notes>
-        <src xlink:href="https://prrvchr.github.io/dDriveOOo/#what-has-been-done-for-version-114" lang="en"/>
-        <src xlink:href="https://prrvchr.github.io/dDriveOOo/README_fr#ce-qui-a-%C3%A9t%C3%A9-fait-pour-la-version-114" lang="fr"/>
+        <src xlink:href="https://prrvchr.github.io/dDriveOOo/#what-has-been-done-for-version-115" lang="en"/>
+        <src xlink:href="https://prrvchr.github.io/dDriveOOo/README_fr#ce-qui-a-%C3%A9t%C3%A9-fait-pour-la-version-115" lang="fr"/>
     </release-notes>
 </description>

source/dDriveOOo/Options.xcu

@@ -51,7 +51,7 @@
   <node oor:name="Settings">
     <node oor:name="Download" oor:op="fuse">
       <prop oor:name="Chunk">
-        <value>327680</value>
+        <value>262144</value>
       </prop>
       <prop oor:name="Delay">
         <value>30</value>
@@ -62,7 +62,7 @@
     </node>
     <node oor:name="Upload" oor:op="fuse">
       <prop oor:name="Chunk">
-        <value>327680</value>
+        <value>262144</value>
       </prop>
       <prop oor:name="Delay">
         <value>30</value>

source/dDriveOOo/description.xml

@@ -3,7 +3,7 @@
   xmlns="http://openoffice.org/extensions/description/2006"
   xmlns:d="http://openoffice.org/extensions/description/2006"
   xmlns:xlink="http://www.w3.org/1999/xlink">
-    <version value="1.1.4"/>
+    <version value="1.1.5"/>
     <identifier value="io.github.prrvchr.dDriveOOo"/>
     <platform value="all"/>
     <dependencies>

source/dDriveOOo/dialogs/OptionsDialog_en_US.properties

@@ -2,42 +2,51 @@ OptionsDialog.HelpText=
 OptionsDialog.Title=
 OptionsDialog.FixedLine1.HelpText=
 OptionsDialog.FixedLine1.Label=DropboxOOo settings
-OptionsDialog.CheckBox1.HelpText=
-OptionsDialog.CheckBox1.Label=Handle shared documents in folder:
-OptionsDialog.TextField1.HelpText=
-OptionsDialog.TextField1.Text=
 OptionsDialog.Label1.HelpText=
-OptionsDialog.Label1.Label=Replication:
+OptionsDialog.Label1.Label=Datasource:
+OptionsDialog.CommandButton1.HelpText=
+OptionsDialog.CommandButton1.Label=View DataBase
+OptionsDialog.Label2.HelpText=
+OptionsDialog.Label2.Label=Replication:
 OptionsDialog.OptionButton1.HelpText=
 OptionsDialog.OptionButton1.Label=Remote then local
 OptionsDialog.OptionButton2.HelpText=
 OptionsDialog.OptionButton2.Label=Local then remote
 OptionsDialog.OptionButton3.HelpText=
 OptionsDialog.OptionButton3.Label=None
-OptionsDialog.Label2.HelpText=
-OptionsDialog.Label2.Label=Interval (minutes):
-OptionsDialog.NumericField1.HelpText=Replication interval in minutes
 OptionsDialog.Label3.HelpText=
-OptionsDialog.Label3.Label=File transfer:
+OptionsDialog.Label3.Label=Interval (minutes):
+OptionsDialog.NumericField1.HelpText=Replication interval in minutes
+OptionsDialog.Label4.HelpText=
+OptionsDialog.Label4.Label=Transfer:
 OptionsDialog.OptionButton4.HelpText=
 OptionsDialog.OptionButton4.Label=Download
 OptionsDialog.OptionButton5.HelpText=
 OptionsDialog.OptionButton5.Label=Upload
-OptionsDialog.Label4.HelpText=
-OptionsDialog.Label4.Label=Chunk:
+OptionsDialog.Label5.HelpText=
+OptionsDialog.Label5.Label=Chunk:
 OptionsDialog.NumericField2.HelpText=Size of download chunk in Ko
 OptionsDialog.NumericField3.HelpText=Size of upload chunk in Ko
-OptionsDialog.Label5.HelpText=
-OptionsDialog.Label5.Label=Delay:
+OptionsDialog.CommandButton2.HelpText=
+OptionsDialog.CommandButton2.Label=+
+OptionsDialog.CommandButton3.HelpText=
+OptionsDialog.CommandButton3.Label=+
+OptionsDialog.CommandButton4.HelpText=
+OptionsDialog.CommandButton4.Label=-
+OptionsDialog.CommandButton5.HelpText=
+OptionsDialog.CommandButton5.Label=-
+OptionsDialog.Label6.HelpText=
+OptionsDialog.Label6.Label=Delay:
 OptionsDialog.NumericField4.HelpText=Download retry delay in second
 OptionsDialog.NumericField5.HelpText=Upload retry delay in second
-OptionsDialog.Label6.HelpText=
-OptionsDialog.Label6.Label=Retry:
+OptionsDialog.Label7.HelpText=
+OptionsDialog.Label7.Label=Retry:
 OptionsDialog.NumericField6.HelpText=Number of download retry in case of failure
 OptionsDialog.NumericField7.HelpText=Number of upload retry in case of failure
-OptionsDialog.Label7.HelpText=
-OptionsDialog.Label7.Label=Datasource:
-OptionsDialog.CommandButton1.HelpText=
-OptionsDialog.CommandButton1.Label=View DataBase
+OptionsDialog.CheckBox1.HelpText=
+OptionsDialog.CheckBox1.Label=Handle shared drives in folder:
+OptionsDialog.TextField1.HelpText=
+OptionsDialog.TextField1.Text=
 OptionsDialog.Label8.HelpText=
 OptionsDialog.Label8.Label=The changes will take effect after restarting LibreOffice...
+

source/dDriveOOo/dialogs/OptionsDialog_fr_FR.properties

@@ -2,42 +2,51 @@ OptionsDialog.HelpText=
 OptionsDialog.Title=
 OptionsDialog.FixedLine1.HelpText=
 OptionsDialog.FixedLine1.Label=Options DropboxOOo
-OptionsDialog.CheckBox1.HelpText=
-OptionsDialog.CheckBox1.Label=G\u00e9rer les documents partag\u00e9s dans le dossier:
-OptionsDialog.TextField1.HelpText=
-OptionsDialog.TextField1.Text=
 OptionsDialog.Label1.HelpText=
-OptionsDialog.Label1.Label=R\u00e9plication:
+OptionsDialog.Label1.Label=Données:
+OptionsDialog.CommandButton1.HelpText=
+OptionsDialog.CommandButton1.Label=Voir la base de données
+OptionsDialog.Label2.HelpText=
+OptionsDialog.Label2.Label=Réplication:
 OptionsDialog.OptionButton1.HelpText=
 OptionsDialog.OptionButton1.Label=Distant puis local
 OptionsDialog.OptionButton2.HelpText=
 OptionsDialog.OptionButton2.Label=Local puis distant
 OptionsDialog.OptionButton3.HelpText=
 OptionsDialog.OptionButton3.Label=Sans
-OptionsDialog.Label2.HelpText=
-OptionsDialog.Label2.Label=Intervalle (minutes):
-OptionsDialog.NumericField1.HelpText=Intervalle de r\u00e9plication en minutes
 OptionsDialog.Label3.HelpText=
-OptionsDialog.Label3.Label=Transfert de fichier:
+OptionsDialog.Label3.Label=Intervalle (minutes):
+OptionsDialog.NumericField1.HelpText=Intervalle de réplication en minutes
+OptionsDialog.Label4.HelpText=
+OptionsDialog.Label4.Label=Transfert:
 OptionsDialog.OptionButton4.HelpText=
-OptionsDialog.OptionButton4.Label=Téléchargement
+OptionsDialog.OptionButton4.Label=Téléchargement
 OptionsDialog.OptionButton5.HelpText=
-OptionsDialog.OptionButton5.Label=Mise à jour
-OptionsDialog.Label4.HelpText=
-OptionsDialog.Label4.Label=Tampon:
-OptionsDialog.NumericField2.HelpText=Taille du tampon en Ko pour le téléchargement
-OptionsDialog.NumericField3.HelpText=Taille du tampon en Ko pour la mise à jour
+OptionsDialog.OptionButton5.Label=Mise à jour
 OptionsDialog.Label5.HelpText=
-OptionsDialog.Label5.Label=Délai:
-OptionsDialog.NumericField4.HelpText=Délai de nouvelle  tentatives de téléchargement en secondes
-OptionsDialog.NumericField5.HelpText=Délai de nouvelle tentative de mise à jour en secondes
+OptionsDialog.Label5.Label=Tampon:
+OptionsDialog.NumericField2.HelpText=Taille du tampon en Ko pour le téléchargement
+OptionsDialog.NumericField3.HelpText=Taille du tampon en Ko pour la mise à jour
+OptionsDialog.CommandButton2.HelpText=
+OptionsDialog.CommandButton2.Label=+
+OptionsDialog.CommandButton3.HelpText=
+OptionsDialog.CommandButton3.Label=+
+OptionsDialog.CommandButton4.HelpText=
+OptionsDialog.CommandButton4.Label=-
+OptionsDialog.CommandButton5.HelpText=
+OptionsDialog.CommandButton5.Label=-
 OptionsDialog.Label6.HelpText=
-OptionsDialog.Label6.Label=Réessayer:
-OptionsDialog.NumericField6.HelpText=Nombre de tentatives de téléchargement en cas d'échec
-OptionsDialog.NumericField7.HelpText=Nombre de tentatives de mise à jour en cas d'échec
+OptionsDialog.Label6.Label=Délai:
+OptionsDialog.NumericField4.HelpText=Délai de nouvelle  tentatives de téléchargement en secondes
+OptionsDialog.NumericField5.HelpText=Délai de nouvelle tentative de mise à jour en secondes
 OptionsDialog.Label7.HelpText=
-OptionsDialog.Label7.Label=Source de donn\u00e9es:
-OptionsDialog.CommandButton1.HelpText=
-OptionsDialog.CommandButton1.Label=Voir la base de donn\u00e9es
+OptionsDialog.Label7.Label=Essai:
+OptionsDialog.NumericField6.HelpText=Nombre de tentatives de téléchargement en cas d'échec
+OptionsDialog.NumericField7.HelpText=Nombre de tentatives de mise à jour en cas d'échec
+OptionsDialog.CheckBox1.HelpText=
+OptionsDialog.CheckBox1.Label=Gérer les lecteurs partagés dans le dossier:
+OptionsDialog.TextField1.HelpText=
+OptionsDialog.TextField1.Text=
 OptionsDialog.Label8.HelpText=
-OptionsDialog.Label8.Label=Les modifications prendront effet apr\u00e8s le red\u00e9marrage de LibreOffice...
+OptionsDialog.Label8.Label=Les modifications prendront effet après le redémarrage de LibreOffice...
+

source/dDriveOOo/service/OptionsHandler.py

@@ -56,15 +56,14 @@ 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):
         try:
             handled = False
             if method == 'external_event':
                 if event == 'initialize':
-                    self._manager = OptionsManager(self._ctx, window, self._logger)
+                    self._manager = OptionsManager(self._ctx, window)
                     handled = True
                 elif event == 'ok':
                     self._manager.saveSetting()
@@ -90,9 +89,22 @@ def callHandlerMethod(self, window, event, method):
             elif method == 'Upload':
                 self._manager.upload()
                 handled = True
+            elif method == 'SpinUp1':
+                self._manager.spinUp(0)
+                handled = True
+            elif method == 'SpinDown1':
+                self._manager.spinDown(0)
+                handled = True
+            elif method == 'SpinUp2':
+                self._manager.spinUp(1)
+                handled = True
+            elif method == 'SpinDown2':
+                self._manager.spinDown(1)
+                handled = True
             return handled
         except Exception as e:
-            self._logger.logprb(SEVERE, 'OptionsHandler', 'callHandlerMethod()', 141, e, traceback.format_exc())
+            print("OptionsHandler.callHandlerMethod() Error: %s - %s" % (e, traceback.format_exc()))
+            getLogger(self._ctx, g_defaultlog).logprb(SEVERE, 'OptionsHandler', 'callHandlerMethod()', 141, e, traceback.format_exc())
 
     def getSupportedMethodNames(self):
         return ('external_event',
@@ -101,7 +113,11 @@ def getSupportedMethodNames(self):
                 'DisableSync',
                 'ViewData',
                 'Download',
-                'Upload')
+                'Upload',
+                'SpinUp1',
+                'SpinDown1',
+                'SpinUp2',
+                'SpinDown2')
 
     # XServiceInfo
     def supportsService(self, service):