Skip to content

Commit

Permalink
Merge pull request #304 from Infomaniak/Add-back-changes-on-folder-wa…
Browse files Browse the repository at this point in the history
…tcher-mac

Re-apply changes from commit ec90711
  • Loading branch information
ClementKunz authored Sep 20, 2024
2 parents 8714c89 + 4fe395a commit 395725e
Show file tree
Hide file tree
Showing 45 changed files with 1,055 additions and 916 deletions.
7 changes: 4 additions & 3 deletions infomaniak-build-tools/kDrive-template.html
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,11 @@ <h2><b>Bug fixes</b></h2>
<ul>
<li>Fixed a sync issue occurring on files whose name contains a special character</li>
<li>Corrected behaviour in the event of disconnection</li>
<li>Fixed empty file list retrieved in case of poor network connection</li>
<li>Fixed issue generating lots of conflicted files while using specific software</li>
<li>Fixed issue where an empty file list is retrieved in case of poor network connection</li>
<li>Fixed an issue causing many conflicting files when using specific software</li>
<li>Fixed a sync issue generating infinite loop</li>
<li>Windows - Code optimization to reduce duration of step 1 and 2</li>
<li>Windows - Code optimization to reduce duration of steps 1 and 2</li>
<li>macOS - Fixed unwanted popup message on session logout</li>
</ul>
</body>
</html>
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,10 @@ <h2><b>Fehlerbehebungen</b></h2>
<ul>
<li>Ein Synchronisierungsproblem bei Dateien, deren Name ein Sonderzeichen enth&auml;lt, wurde behoben</li>
<li>Korrigiertes Verhalten im Falle einer Unterbrechung der Verbindung</li>
<li>Behebung der leeren Dateiliste, die bei schlechter Netzwerkverbindung abgerufen wird</li>
<li>Problem behoben, das bei der Verwendung bestimmter Software viele konfliktbehaftete Dateien erzeugt</li>
<li>Problem behoben, bei dem eine leere Dateiliste im Falle einer schlechten Netzwerkverbindung abgerufen wird</li>
<li>Es wurde ein Problem behoben, das bei der Verwendung bestimmter Software zu vielen widerspr&uuml;chlichen Dateien f&uuml;hrte</li>
<li>Sync-Problem behoben, das zu einer Endlosschleife f&uuml;hrte</li>
<li>Codeoptimierung zur Verk&uuml;rzung der Dauer von Schritt 1 und 2</li>
<li>Unerw&uuml;nschte Popup-Meldung bei Sitzungsabmeldung behoben</li>
</ul>
</body>
</html>
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,12 @@
<h1>Notas de la versi&oacute;n - kDrive 3.6.5</h1>
<h2><b>Correcci&oacute;n de errores</b></h2>
<ul>
<li>Se ha corregido un problema de sincronizaci&oacute;n que se produc&iacute;a en archivos cuyo nombre conten&iacute;a un car&aacute;cter especial.</li>
<li>Se ha corregido un problema de sincronizaci&oacute;n que se produc&iacute;a en archivos cuyo nombre conten&iacute;a un car&aacute;cter especial</li>
<li>Comportamiento corregido en caso de desconexi&oacute;n</li>
<li>Corregida la lista de archivos vac&iacute;a recuperada en caso de conexi&oacute;n de red deficiente.</li>
<li>Se ha solucionado un problema que generaba muchos archivos en conflicto al utilizar software espec&iacute;fico.</li>
<li>Se ha solucionado el problema por el que se recuperaba una lista de archivos vac&iacute;a en caso de conexi&oacute;n de red deficiente</li>
<li>Se ha corregido un problema que provocaba muchos archivos conflictivos al utilizar software espec&iacute;fico</li>
<li>Solucionado un problema de sincronizaci&oacute;n que generaba un bucle infinito</li>
<li>Corregido un mensaje emergente no deseado al cerrar la sesi&oacute;n</li>
</ul>
</body>
</html>
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,10 @@ <h2><b>Correction de bugs</b></h2>
<ul>
<li>Correction d'un probl&egrave;me de synchronisation sur les fichiers dont le nom contient un caract&egrave;re sp&eacute;cial</li>
<li>Comportement corrig&eacute; en cas de d&eacute;connexion</li>
<li>Correction de la liste des fichiers vides r&eacute;cup&eacute;r&eacute;s en cas de mauvaise connexion r&eacute;seau</li>
<li>Correction d'un probl&egrave;me g&eacute;n&eacute;rant de nombreux fichiers conflictuels lors de l'utilisation d'un logiciel sp&eacute;cifique</li>
<li>Correction d'un probl&egrave;me o&ugrave; une liste de fichiers vide est r&eacute;cup&eacute;r&eacute;e en cas de mauvaise connexion r&eacute;seau</li>
<li>Correction d'un probl&egrave;me provoquant de nombreux conflits de fichiers lors de l'utilisation de certains logiciels</li>
<li>Correction d'un probl&egrave;me de synchronisation g&eacute;n&eacute;rant une boucle infinie</li>
<li>Correction d'un message popup ind&eacute;sirable lors de la d&eacute;connexion d'une session</li>
</ul>
</body>
</html>
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,12 @@
<h1>Note di rilascio - kDrive 3.6.5</h1>
<h2><b>Correzioni di bug</b></h2>
<ul>
<li>&Egrave; stato risolto un problema di sincronizzazione dei file il cui nome contiene un carattere speciale.</li>
<li>&Egrave; stato risolto un problema di sincronizzazione dei file il cui nome contiene un carattere speciale</li>
<li>Comportamento corretto in caso di disconnessione</li>
<li>Corretto l'elenco dei file vuoti recuperati in caso di scarsa connessione di rete</li>
<li>Corretto il problema che genera molti file in conflitto quando si utilizza un software specifico.</li>
<li>Corretto il problema per cui viene recuperato un elenco di file vuoto in caso di connessione di rete scadente</li>
<li>&Egrave; stato risolto un problema che causava molti file in conflitto quando si utilizzava un software specifico</li>
<li>Corretto un problema di sincronizzazione che generava un loop infinito</li>
<li>Corretto il messaggio popup indesiderato al logout della sessione</li>
</ul>
</body>
</html>
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ <h2><b>Fehlerbehebungen</b></h2>
<ul>
<li>Ein Synchronisierungsproblem bei Dateien, deren Name ein Sonderzeichen enth&auml;lt, wurde behoben</li>
<li>Korrigiertes Verhalten im Falle einer Unterbrechung der Verbindung</li>
<li>Behebung der leeren Dateiliste, die bei schlechter Netzwerkverbindung abgerufen wird</li>
<li>Problem behoben, das bei der Verwendung bestimmter Software viele konfliktbehaftete Dateien erzeugt</li>
<li>Problem behoben, bei dem eine leere Dateiliste im Falle einer schlechten Netzwerkverbindung abgerufen wird</li>
<li>Es wurde ein Problem behoben, das bei der Verwendung bestimmter Software zu vielen widerspr&uuml;chlichen Dateien f&uuml;hrte</li>
<li>Sync-Problem behoben, das zu einer Endlosschleife f&uuml;hrte</li>
</ul>
</body>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,10 @@
<h1>Notas de la versi&oacute;n - kDrive 3.6.5</h1>
<h2><b>Correcci&oacute;n de errores</b></h2>
<ul>
<li>Se ha corregido un problema de sincronizaci&oacute;n que se produc&iacute;a en archivos cuyo nombre conten&iacute;a un car&aacute;cter especial.</li>
<li>Se ha corregido un problema de sincronizaci&oacute;n que se produc&iacute;a en archivos cuyo nombre conten&iacute;a un car&aacute;cter especial</li>
<li>Comportamiento corregido en caso de desconexi&oacute;n</li>
<li>Corregida la lista de archivos vac&iacute;a recuperada en caso de conexi&oacute;n de red deficiente.</li>
<li>Se ha solucionado un problema que generaba muchos archivos en conflicto al utilizar software espec&iacute;fico.</li>
<li>Se ha solucionado el problema por el que se recuperaba una lista de archivos vac&iacute;a en caso de conexi&oacute;n de red deficiente</li>
<li>Se ha corregido un problema que provocaba muchos archivos conflictivos al utilizar software espec&iacute;fico</li>
<li>Solucionado un problema de sincronizaci&oacute;n que generaba un bucle infinito</li>
</ul>
</body>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ <h2><b>Correction de bugs</b></h2>
<ul>
<li>Correction d'un probl&egrave;me de synchronisation sur les fichiers dont le nom contient un caract&egrave;re sp&eacute;cial</li>
<li>Comportement corrig&eacute; en cas de d&eacute;connexion</li>
<li>Correction de la liste des fichiers vides r&eacute;cup&eacute;r&eacute;s en cas de mauvaise connexion r&eacute;seau</li>
<li>Correction d'un probl&egrave;me g&eacute;n&eacute;rant de nombreux fichiers conflictuels lors de l'utilisation d'un logiciel sp&eacute;cifique</li>
<li>Correction d'un probl&egrave;me o&ugrave; une liste de fichiers vide est r&eacute;cup&eacute;r&eacute;e en cas de mauvaise connexion r&eacute;seau</li>
<li>Correction d'un probl&egrave;me provoquant de nombreux conflits de fichiers lors de l'utilisation de certains logiciels</li>
<li>Correction d'un probl&egrave;me de synchronisation g&eacute;n&eacute;rant une boucle infinie</li>
</ul>
</body>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,10 @@
<h1>Note di rilascio - kDrive 3.6.5</h1>
<h2><b>Correzioni di bug</b></h2>
<ul>
<li>&Egrave; stato risolto un problema di sincronizzazione dei file il cui nome contiene un carattere speciale.</li>
<li>&Egrave; stato risolto un problema di sincronizzazione dei file il cui nome contiene un carattere speciale</li>
<li>Comportamento corretto in caso di disconnessione</li>
<li>Corretto l'elenco dei file vuoti recuperati in caso di scarsa connessione di rete</li>
<li>Corretto il problema che genera molti file in conflitto quando si utilizza un software specifico.</li>
<li>Corretto il problema per cui viene recuperato un elenco di file vuoto in caso di connessione di rete scadente</li>
<li>&Egrave; stato risolto un problema che causava molti file in conflitto quando si utilizzava un software specifico</li>
<li>Corretto un problema di sincronizzazione che generava un loop infinito</li>
</ul>
</body>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ <h2><b>Bug fixes</b></h2>
<ul>
<li>Fixed a sync issue occurring on files whose name contains a special character</li>
<li>Corrected behaviour in the event of disconnection</li>
<li>Fixed empty file list retrieved in case of poor network connection</li>
<li>Fixed issue generating lots of conflicted files while using specific software</li>
<li>Fixed issue where an empty file list is retrieved in case of poor network connection</li>
<li>Fixed an issue causing many conflicting files when using specific software</li>
<li>Fixed a sync issue generating infinite loop</li>
</ul>
</body>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,10 @@ <h2><b>Fehlerbehebungen</b></h2>
<ul>
<li>Ein Synchronisierungsproblem bei Dateien, deren Name ein Sonderzeichen enth&auml;lt, wurde behoben</li>
<li>Korrigiertes Verhalten im Falle einer Unterbrechung der Verbindung</li>
<li>Behebung der leeren Dateiliste, die bei schlechter Netzwerkverbindung abgerufen wird</li>
<li>Problem behoben, das bei der Verwendung bestimmter Software viele konfliktbehaftete Dateien erzeugt</li>
<li>Problem behoben, bei dem eine leere Dateiliste im Falle einer schlechten Netzwerkverbindung abgerufen wird</li>
<li>Es wurde ein Problem behoben, das bei der Verwendung bestimmter Software zu vielen widerspr&uuml;chlichen Dateien f&uuml;hrte</li>
<li>Sync-Problem behoben, das zu einer Endlosschleife f&uuml;hrte</li>
<li>Code-Optimierung zur Verk&uuml;rzung der Dauer der Schritte 1 und 2</li>
</ul>
</body>
</html>
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,10 @@
<h1>Notas de la versi&oacute;n - kDrive 3.6.5</h1>
<h2><b>Correcci&oacute;n de errores</b></h2>
<ul>
<li>Se ha corregido un problema de sincronizaci&oacute;n que se produc&iacute;a en archivos cuyo nombre conten&iacute;a un car&aacute;cter especial.</li>
<li>Se ha corregido un problema de sincronizaci&oacute;n que se produc&iacute;a en archivos cuyo nombre conten&iacute;a un car&aacute;cter especial</li>
<li>Comportamiento corregido en caso de desconexi&oacute;n</li>
<li>Corregida la lista de archivos vac&iacute;a recuperada en caso de conexi&oacute;n de red deficiente.</li>
<li>Se ha solucionado un problema que generaba muchos archivos en conflicto al utilizar software espec&iacute;fico.</li>
<li>Se ha solucionado el problema por el que se recuperaba una lista de archivos vac&iacute;a en caso de conexi&oacute;n de red deficiente</li>
<li>Se ha corregido un problema que provocaba muchos archivos conflictivos al utilizar software espec&iacute;fico</li>
<li>Solucionado un problema de sincronizaci&oacute;n que generaba un bucle infinito</li>
<li>Optimizaci&oacute;n del c&oacute;digo para reducir la duraci&oacute;n de los pasos 1 y 2</li>
</ul>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ <h2><b>Correction de bugs</b></h2>
<ul>
<li>Correction d'un probl&egrave;me de synchronisation sur les fichiers dont le nom contient un caract&egrave;re sp&eacute;cial</li>
<li>Comportement corrig&eacute; en cas de d&eacute;connexion</li>
<li>Correction de la liste des fichiers vides r&eacute;cup&eacute;r&eacute;s en cas de mauvaise connexion r&eacute;seau</li>
<li>Correction d'un probl&egrave;me g&eacute;n&eacute;rant de nombreux fichiers conflictuels lors de l'utilisation d'un logiciel sp&eacute;cifique</li>
<li>Correction d'un probl&egrave;me o&ugrave; une liste de fichiers vide est r&eacute;cup&eacute;r&eacute;e en cas de mauvaise connexion r&eacute;seau</li>
<li>Correction d'un probl&egrave;me provoquant de nombreux conflits de fichiers lors de l'utilisation de certains logiciels</li>
<li>Correction d'un probl&egrave;me de synchronisation g&eacute;n&eacute;rant une boucle infinie</li>
<li>Optimisation du code pour r&eacute;duire la dur&eacute;e des &eacute;tapes 1 et 2</li>
</ul>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,10 @@
<h1>Note di rilascio - kDrive 3.6.5</h1>
<h2><b>Correzioni di bug</b></h2>
<ul>
<li>&Egrave; stato risolto un problema di sincronizzazione dei file il cui nome contiene un carattere speciale.</li>
<li>&Egrave; stato risolto un problema di sincronizzazione dei file il cui nome contiene un carattere speciale</li>
<li>Comportamento corretto in caso di disconnessione</li>
<li>Corretto l'elenco dei file vuoti recuperati in caso di scarsa connessione di rete</li>
<li>Corretto il problema che genera molti file in conflitto quando si utilizza un software specifico.</li>
<li>Corretto il problema per cui viene recuperato un elenco di file vuoto in caso di connessione di rete scadente</li>
<li>&Egrave; stato risolto un problema che causava molti file in conflitto quando si utilizzava un software specifico</li>
<li>Corretto un problema di sincronizzazione che generava un loop infinito</li>
<li>Ottimizzazione del codice per ridurre la durata dei passaggi 1 e 2</li>
</ul>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,10 @@ <h2><b>Bug fixes</b></h2>
<ul>
<li>Fixed a sync issue occurring on files whose name contains a special character</li>
<li>Corrected behaviour in the event of disconnection</li>
<li>Fixed empty file list retrieved in case of poor network connection</li>
<li>Fixed issue generating lots of conflicted files while using specific software</li>
<li>Fixed issue where an empty file list is retrieved in case of poor network connection</li>
<li>Fixed an issue causing many conflicting files when using specific software</li>
<li>Fixed a sync issue generating infinite loop</li>
<li>Code optimization to reduce duration of step 1 and 2</li>
<li>Code optimization to reduce duration of steps 1 and 2</li>
</ul>
</body>
</html>
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,10 @@ <h2><b>Bug fixes</b></h2>
<ul>
<li>Fixed a sync issue occurring on files whose name contains a special character</li>
<li>Corrected behaviour in the event of disconnection</li>
<li>Fixed empty file list retrieved in case of poor network connection</li>
<li>Fixed issue generating lots of conflicted files while using specific software</li>
<li>Fixed issue where an empty file list is retrieved in case of poor network connection</li>
<li>Fixed an issue causing many conflicting files when using specific software</li>
<li>Fixed a sync issue generating infinite loop</li>
<li>Fixed unwanted popup message on session logout</li>
</ul>
</body>
</html>
2 changes: 1 addition & 1 deletion src/libcommon/log/sentry/sentryhandler.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -299,7 +299,7 @@ void SentryHandler::handleEventsRateLimit(SentryEvent &event, bool &toUpload) {
}

auto &storedEvent = it->second;
storedEvent.captureCount++;
storedEvent.captureCount = std::min(storedEvent.captureCount + 1, UINT_MAX-1);
event.captureCount = storedEvent.captureCount;

if (lastEventCaptureIsOutdated(storedEvent)) { // Reset the capture count if the last capture was more than 10 minutes ago
Expand Down
4 changes: 3 additions & 1 deletion src/libcommon/log/sentry/sentryhandler.h
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,8 @@ inline std::string toString(SentryLevel level) {
return "Error";
case SentryLevel::Fatal:
return "Fatal";
default:
return "No conversion to string available";
}
};

Expand Down Expand Up @@ -141,7 +143,7 @@ class SentryHandler {
std::unordered_map<std::string, SentryEvent, StringHash, std::equal_to<>> _events;
SentryConfidentialityLevel _globalConfidentialityLevel = SentryConfidentialityLevel::Anonymous; // Default value
SentryConfidentialityLevel _lastConfidentialityLevel = SentryConfidentialityLevel::None;
int _sentryMaxCaptureCountBeforeRateLimit = 10; // Number of capture before rate limiting an event
unsigned int _sentryMaxCaptureCountBeforeRateLimit = 10; // Number of capture before rate limiting an event
int _sentryMinUploadIntervaOnRateLimit = 60; // Min. interval between two uploads of a rate limited event (seconds)
bool _isSentryActivated = false;
};
Expand Down
10 changes: 5 additions & 5 deletions src/libcommon/utility/jsonparserutility.h
Original file line number Diff line number Diff line change
Expand Up @@ -28,12 +28,12 @@
namespace KDC {

struct COMMONSERVER_EXPORT JsonParserUtility {
template <typename T>
static bool extractValue(const Poco::JSON::Object::Ptr obj, const std::string &key, T &val, bool mandatory = true) {
template<typename T>
static bool extractValue(const Poco::JSON::Object::Ptr obj, const std::string &key, T &val, const bool mandatory = true) {
if (!obj) {
LOG_WARN(Log::instance()->getLogger(), "JSON object is NULL");
return false;
} // namespace KDC
} // namespace KDC

if (obj->has(key) && obj->isNull(key)) {
// Item exist in JSON but is null, this is ok
Expand All @@ -45,7 +45,7 @@ struct COMMONSERVER_EXPORT JsonParserUtility {
var.convert(val);
} catch (...) {
if (mandatory) {
std::string msg = "Fail to extract value for key=" + key;
const std::string msg = "Fail to extract value for key=" + key;
LOG_WARN(Log::instance()->getLogger(), msg.c_str());
SentryHandler::instance()->captureMessage(SentryLevel::Error, "JsonParserUtility::extractValue", msg);
return false;
Expand Down Expand Up @@ -84,4 +84,4 @@ struct COMMONSERVER_EXPORT JsonParserUtility {
}
};

} // namespace KDC
} // namespace KDC
Loading

0 comments on commit 395725e

Please sign in to comment.