Skip to content

Commit

Permalink
new version 1.1.5
Browse files Browse the repository at this point in the history
  • Loading branch information
prrvchr committed Nov 4, 2024
1 parent 5bf5d92 commit 374117c
Show file tree
Hide file tree
Showing 3 changed files with 23 additions and 21 deletions.
2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -258,6 +258,8 @@ Although this functionality is only needed for gDriveOOo, it is implemented glob

### What has been done for version 1.1.5:

- Fixed a SQL query preventing a new folder from being created correctly.
- Disabling data replication in the extension options will display an explicit message in the replicator log.
- 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 -> mDriveOOo** in order to comply with the new graphic charter.

Expand Down
2 changes: 2 additions & 0 deletions README_fr.md
Original file line number Diff line number Diff line change
Expand Up @@ -258,6 +258,8 @@ Bien que cette fonctionnalité ne soit nécessaire que pour gDriveOOo, elle est

### Ce qui a été fait pour la version 1.1.5:

- Correction d'une requête SQL empêchant la création correcte d'un nouveau dossier.
- La désactivation de la réplication des données dans les options d'extension affichera un message explicite dans le journal du réplicateur.
- 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 -> mDriveOOo** afin de respecter la nouvelle charte graphique.

Expand Down
40 changes: 19 additions & 21 deletions source/mDriveOOo/service/pythonpath/mdrive/provider.py
Original file line number Diff line number Diff line change
Expand Up @@ -239,31 +239,29 @@ def _parseDocumentLocation(self, response):

def mergeNewFolder(self, user, oldid, response):
newid = None
if response.Ok:
items = self._parseNewFolder(response)
if all(items):
newid = user.DataBase.updateNewItemId(oldid, *items)
else:
print("Provider.mergeNewFolder() %s" % response.Text)
response.close()
items = self._parseNewFolder(response)
if all(items):
newid = user.DataBase.updateNewItemId(user.Id, oldid, *items)
return newid

def _parseNewFolder(self, response):
newid = created = modified = None
events = ijson.sendable_list()
parser = ijson.parse_coro(events)
iterator = response.iterContent(g_chunk, False)
while iterator.hasMoreElements():
parser.send(iterator.nextElement().value)
for prefix, event, value in events:
if (prefix, event) == ('id', 'string'):
newid = value
elif (prefix, event) == ('createdDateTime', 'string'):
created = self.parseDateTime(value)
elif (prefix, event) == ('lastModifiedDateTime', 'string'):
modified = self.parseDateTime(value)
del events[:]
parser.close()
if response.Ok:
events = ijson.sendable_list()
parser = ijson.parse_coro(events)
iterator = response.iterContent(g_chunk, False)
while iterator.hasMoreElements():
parser.send(iterator.nextElement().value)
for prefix, event, value in events:
if (prefix, event) == ('id', 'string'):
newid = value
elif (prefix, event) == ('createdDateTime', 'string'):
created = self.parseDateTime(value)
elif (prefix, event) == ('lastModifiedDateTime', 'string'):
modified = self.parseDateTime(value)
del events[:]
parser.close()
response.close()
return newid, created, modified

def _getUser(self, source, request, name):
Expand Down

0 comments on commit 374117c

Please sign in to comment.