diff --git a/CHANGELOG b/CHANGELOG index 8a5eb71f..a57b3d1d 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,6 +1,7 @@ All theses changelogs are not exhaustive, please check the Mercurial repository for more details. v 0.8.0 « La Cecília » (NOT RELEASED YET): + - renamed the project from "Salut à Toi" to "Libervia" - Python 3 port - OMEMO for MUCs (group chat) - aesgcm schema handling (aka OMEMO Media Sharing) @@ -21,6 +22,7 @@ v 0.8.0 « La Cecília » (NOT RELEASED YET): - list of interests: unique ID per location, to avoid duplicates - settings for themes in template engine - launching scripts are now in Python instead of shell scripts + - D-Bus bridge: renamed namespace from org.salutatoi.SAT to org.libervia.Libervia - Cagou: - new "share" widget - URIs can now be clicked to open a suitable application diff --git a/CONTRAT_SOCIAL b/CONTRAT_SOCIAL index cec943ab..a29c2f3d 100644 --- a/CONTRAT_SOCIAL +++ b/CONTRAT_SOCIAL @@ -1,18 +1,18 @@ -Le projet « Salut à Toi » est né d'un besoin de protection de nos libertés, de notre vie privée et de notre indépendance. Il se veut garant des droits et libertés qu'un utilisateur a vis à vis de ses propres informations, des informations numériques sur sa vie ou celles de ses connaissances, des données qu'il manipule; et se veut également un point de contact humain, ne se substituant pas aux rapports réels, mais au contraire les facilitant. -Salut à Toi lutte et luttera toujours contre toute forme de main mise sur les technologies par des intérêts privés. Le réseau global doit appartenir à tous, et être un point d'expression et de liberté pour l'Humanité. +Le projet « Libervia » est né d'un besoin de protection de nos libertés, de notre vie privée et de notre indépendance. Il se veut garant des droits et libertés qu'un utilisateur a vis à vis de ses propres informations, des informations numériques sur sa vie ou celles de ses connaissances, des données qu'il manipule; et se veut également un point de contact humain, ne se substituant pas aux rapports réels, mais au contraire les facilitant. +Libervia lutte et luttera toujours contre toute forme de main mise sur les technologies par des intérêts privés. Le réseau global doit appartenir à tous, et être un point d'expression et de liberté pour l'Humanité. -À ce titre, « Salut à Toi » et ceux qui y participent se basent sur un contrat social, un engagement vis à vis de ceux qui l'utilisent. Ce contrat consiste en les points suivants: +À ce titre, « Libervia » et ceux qui y participent se basent sur un contrat social, un engagement vis à vis de ceux qui l'utilisent. Ce contrat consiste en les points suivants: -- nous plaçons la Liberté en tête de nos priorités: liberté de l'utilisateur, liberté vis à vis de ses données. Pour cela, « Salut à Toi » est un logiciel Libre - condition essentielle -, et son infrastructure se base également sur des logiciels Libres, c'est à dire des logiciels qui respectent ces 4 libertés fondamentales +- nous plaçons la Liberté en tête de nos priorités: liberté de l'utilisateur, liberté vis à vis de ses données. Pour cela, « Libervia » est un logiciel Libre - condition essentielle -, et son infrastructure se base également sur des logiciels Libres, c'est à dire des logiciels qui respectent ces 4 libertés fondamentales - la liberté d'exécuter le programme, pour tous les usages, - la liberté d'étudier le fonctionnement du programme et de l'adapter à ses besoins, - la liberté de redistribuer des copies du programme, - la liberté d'améliorer le programme et de distribuer ces améliorations au public. -Vous avez ainsi la possibilité d'installer votre propre version de « Salut à Toi » sur votre propre machine, d'en vérifier - et de comprendre - ainsi son fonctionnement, de l'adapter à vos besoins, d'en faire profiter vos amis. +Vous avez ainsi la possibilité d'installer votre propre version de « Libervia » sur votre propre machine, d'en vérifier - et de comprendre - ainsi son fonctionnement, de l'adapter à vos besoins, d'en faire profiter vos amis. -- Les informations vous concernant vous appartiennent, et nous n'aurons pas la prétention - et l'indécence ! - de considérer le contenu que vous produisez ou faites circuler via « Salut à Toi » comme nous appartenant. De même, nous nous engageons à ne jamais faire de profit en revendant vos informations personnelles. +- Les informations vous concernant vous appartiennent, et nous n'aurons pas la prétention - et l'indécence ! - de considérer le contenu que vous produisez ou faites circuler via « Libervia » comme nous appartenant. De même, nous nous engageons à ne jamais faire de profit en revendant vos informations personnelles. -- Nous incitons fortement à la _décentralisation_ généralisée. « Salut à Toi » étant basé sur un protocole décentralisé (XMPP), il l'est lui-même par nature. La décentralisation est essentielle pour une meilleure protection de vos informations, une meilleure résistance à la censure ou aux pannes, et pour éviter les dérives autoritaires. +- Nous incitons fortement à la _décentralisation_ généralisée. « Libervia » étant basé sur un protocole décentralisé (XMPP), il l'est lui-même par nature. La décentralisation est essentielle pour une meilleure protection de vos informations, une meilleure résistance à la censure ou aux pannes, et pour éviter les dérives autoritaires. - Luttant contre les tentatives de contrôle privé et les abus commerciaux du réseau global, et afin de garder notre indépendance, nous nous refusons à toute forme de publicité: vous ne verrez *jamais* de forme de réclame commerciale de notre fait. @@ -20,9 +20,9 @@ Vous avez ainsi la possibilité d'installer votre propre version de « Salut à - Nous ferons tout notre possible pour lutter contre toute tentative de censure, y compris en protégeant la parole des victimes de harcèlement, discours haineux, menaces, humiliations et tout ce qui pourrait mener à de l'autocensure. Le réseau global doit être un moyen d'expression pour tous. -- Nous refusons toute idée d'autorité absolue en ce qui concerne les décisions prises pour « Salut à Toi » et son fonctionnement, et le choix de la décentralisation et l'utilisation de logiciel Libre permet de lutter contre toute forme de hiérarchie. +- Nous refusons toute idée d'autorité absolue en ce qui concerne les décisions prises pour « Libervia » et son fonctionnement, et le choix de la décentralisation et l'utilisation de logiciel Libre permet de lutter contre toute forme de hiérarchie. - L'idée de Fraternité est essentielle, aussi: - nous ferons notre possible pour aider les utilisateurs, quel que soit leur niveau - de même, des efforts seront fait quant à l'accessibilité pour tous - - « Salut à Toi », XMPP, et les technologies utilisées facilitent les échanges électroniques, mais nous désirons mettre l'accent sur les rencontres réelles et humaines: nous favoriserons toujours le réel sur le virtuel. + - « Libervia », XMPP, et les technologies utilisées facilitent les échanges électroniques, mais nous désirons mettre l'accent sur les rencontres réelles et humaines: nous favoriserons toujours le réel sur le virtuel. diff --git a/CONTRAT_SOCIAL_en b/CONTRAT_SOCIAL_en index a476e73c..14206382 100644 --- a/CONTRAT_SOCIAL_en +++ b/CONTRAT_SOCIAL_en @@ -1,18 +1,18 @@ -The project "Salut à Toi" was born from a need to protect our liberties, our privacy and our independence. It is intended to protect the rights and liberties a user has regarding her own private and numeric data, her acquaintance's, and the data she handles; it is also intended to be a human contact point, not substituting itself to physical encounters, but rather facilitating them. -Salut à Toi will always fight against all forms of technology control by private interests. The global network must belong to everybody, and be a force of expression and freedom for all Humanity. +The project "Libervia" was born from a need to protect our liberties, our privacy and our independence. It is intended to protect the rights and liberties a user has regarding her own private and numeric data, her acquaintance's, and the data she handles; it is also intended to be a human contact point, not substituting itself to physical encounters, but rather facilitating them. +Libervia will always fight against all forms of technology control by private interests. The global network must belong to everybody, and be a force of expression and freedom for all Humanity. -Towards this end, "Salut à Toi" and those who participate in the project operate on a Social Contract, a commitment to those who use it. This Contract involves the following points : +Towards this end, "Libervia" and those who participate in the project operate on a Social Contract, a commitment to those who use it. This Contract involves the following points : -- We put the freedom at the top of our priorities : freedom of the user, freedom with her data. To achieve this, "Salut à Toi" is a Libre Software - an essential condition - and its infrastructure also relies on Libre Software, meaning softwares that respect the 4 fundamental rules : +- We put the freedom at the top of our priorities : freedom of the user, freedom with her data. To achieve this, "Libervia" is a Libre Software - an essential condition - and its infrastructure also relies on Libre Software, meaning softwares that respect the 4 fundamental rules : - The freedom to run the program for any purpose. - The freedom to study how the program works, and change it to make it do what you wish. - The freedom to redistribute copies so you can help your neighbor. - The freedom to improve the program, and release your improvements (and modified versions in general) to the public, so that the whole community benefits. -You have the full possibility to install your own version of "Salut à Toi" on your own machine, to verify - and understand - how it works, adapt it to your needs, and share the knowledge with your friends. +You have the full possibility to install your own version of "Libervia" on your own machine, to verify - and understand - how it works, adapt it to your needs, and share the knowledge with your friends. -- The information regarding the user belong to her, and we will never have the pretention - and indecency ! - to consider the content that she produces or relays via "Salut à Toi" as our property. As well, we commit ourselves to never make profit from selling any of her personal information. +- The information regarding the user belong to her, and we will never have the pretention - and indecency ! - to consider the content that she produces or relays via "Libervia" as our property. As well, we commit ourselves to never make profit from selling any of her personal information. -- We greatly encourage a general _decentralisation_. "Salut à Toi" being based on a decentralised protocol (XMPP), it is by nature decentralised. This is essential for a better protection of your information, a better resistance to censorship and hardware or software failures, and to alleviate authoritarian tendencies. +- We greatly encourage a general _decentralisation_. "Libervia" being based on a decentralised protocol (XMPP), it is by nature decentralised. This is essential for a better protection of your information, a better resistance to censorship and hardware or software failures, and to alleviate authoritarian tendencies. - By fighting against the attempts at private control and commercial abuses of the global network, and trying to remain independent, we are absolutely opposed to any form of advertisement: you will *never* see any advertisement coming from us @@ -20,10 +20,10 @@ You have the full possibility to install your own version of "Salut à Toi" on y - We will do whatever is possible to fight against any kind of censorship including protecting the speech of victims of harassment, hate speech, threats, humiliation and anything that could lead to self-censorship. The global network must be a means of expression for everyone. -- We refuse the mere idea of an absolute authority regarding the decisions taken for "Salut à Toi" and how it works, and the choice of decentralisation and the use of Libre Software allows to reject all hierarchy. +- We refuse the mere idea of an absolute authority regarding the decisions taken for "Libervia" and how it works, and the choice of decentralisation and the use of Libre Software allows to reject all hierarchy. - The idea of Fraternity is essential. This is why: - we will help the users, whatever their computer literacy is, to the extent of what we can - - we will as well commit ourselves to help the accessibility to "Salut à Toi" for all - - "Salut à Toi" , XMPP, and the technologies used help facilitate the electronic exchanges, but we strive to focus on real and human exchanges : we will always favor Real on Virtual. + - we will as well commit ourselves to help the accessibility to "Libervia" for all + - "Libervia" , XMPP, and the technologies used help facilitate the electronic exchanges, but we strive to focus on real and human exchanges : we will always favor Real on Virtual. diff --git a/misc/README b/misc/README index 60a3c79e..57f2c84f 100644 --- a/misc/README +++ b/misc/README @@ -11,5 +11,5 @@ compinit Then, you should be able to complete a jp command line by pressing [TAB]. -* org.salutatoi.SAT.service: +* org.libervia.Libervia.service: This file is used by D-Bus to know how to launch the backend, you have to put in in D-Bus services dir (usually /usr/share/dbus-1/services) diff --git a/misc/org.salutatoi.SAT.service b/misc/org.salutatoi.SAT.service index 08796c2b..1a2a46e1 100644 --- a/misc/org.salutatoi.SAT.service +++ b/misc/org.salutatoi.SAT.service @@ -1,3 +1,3 @@ [D-BUS Service] -Name=org.salutatoi.SAT +Name=org.libervia.Libervia Exec=sat diff --git a/sat/__init__.py b/sat/__init__.py index 4948c2ab..306ef9ae 100644 --- a/sat/__init__.py +++ b/sat/__init__.py @@ -1,7 +1,7 @@ #!/usr/bin/env python3 -# SàT: a XMPP client +# Libervia: an XMPP client # Copyright (C) 2009-2021 Jérôme Poisson (goffi@goffi.org) # This program is free software: you can redistribute it and/or modify diff --git a/sat/bridge/bridge_constructor/base_constructor.py b/sat/bridge/bridge_constructor/base_constructor.py index 1319414b..2fc3e22d 100644 --- a/sat/bridge/bridge_constructor/base_constructor.py +++ b/sat/bridge/bridge_constructor/base_constructor.py @@ -1,7 +1,7 @@ #!/usr/bin/env python3 -# SàT: a XMPP client +# Libervia: an XMPP client # Copyright (C) 2009-2021 Jérôme Poisson (goffi@goffi.org) # This program is free software: you can redistribute it and/or modify diff --git a/sat/bridge/bridge_constructor/bridge_constructor.py b/sat/bridge/bridge_constructor/bridge_constructor.py index dc669a77..2cb54a91 100755 --- a/sat/bridge/bridge_constructor/bridge_constructor.py +++ b/sat/bridge/bridge_constructor/bridge_constructor.py @@ -1,7 +1,7 @@ #!/usr/bin/env python3 -# SàT: a XMPP client +# Libervia: an XMPP client # Copyright (C) 2009-2021 Jérôme Poisson (goffi@goffi.org) # This program is free software: you can redistribute it and/or modify diff --git a/sat/bridge/bridge_constructor/constants.py b/sat/bridge/bridge_constructor/constants.py index 1565efb5..56b533e1 100644 --- a/sat/bridge/bridge_constructor/constants.py +++ b/sat/bridge/bridge_constructor/constants.py @@ -1,7 +1,7 @@ #!/usr/bin/env python3 -# SàT: a XMPP client +# Libervia: an XMPP client # Copyright (C) 2009-2021 Jérôme Poisson (goffi@goffi.org) # This program is free software: you can redistribute it and/or modify diff --git a/sat/bridge/bridge_constructor/constructors/dbus-xml/constructor.py b/sat/bridge/bridge_constructor/constructors/dbus-xml/constructor.py index 39b712bc..8e96cefb 100644 --- a/sat/bridge/bridge_constructor/constructors/dbus-xml/constructor.py +++ b/sat/bridge/bridge_constructor/constructors/dbus-xml/constructor.py @@ -1,7 +1,7 @@ #!/usr/bin/env python3 -# SàT: a XMPP client +# Libervia: an XMPP client # Copyright (C) 2009-2021 Jérôme Poisson (goffi@goffi.org) # This program is free software: you can redistribute it and/or modify @@ -29,7 +29,7 @@ class DbusXmlConstructor(base_constructor.Constructor): base_constructor.Constructor.__init__(self, bridge_template, options) self.template = "dbus_xml_template.xml" - self.core_dest = "org.salutatoi.sat.xml" + self.core_dest = "org.libervia.sat.xml" self.default_annotation = { "a{ss}": "StringDict", "a(sa{ss}as)": "QList", diff --git a/sat/bridge/bridge_constructor/constructors/dbus-xml/dbus_xml_template.xml b/sat/bridge/bridge_constructor/constructors/dbus-xml/dbus_xml_template.xml index 2101cbbe..67bc909b 100644 --- a/sat/bridge/bridge_constructor/constructors/dbus-xml/dbus_xml_template.xml +++ b/sat/bridge/bridge_constructor/constructors/dbus-xml/dbus_xml_template.xml @@ -1,4 +1,4 @@ - + diff --git a/sat/bridge/bridge_constructor/constructors/dbus/constructor.py b/sat/bridge/bridge_constructor/constructors/dbus/constructor.py index ae233892..a6623f49 100644 --- a/sat/bridge/bridge_constructor/constructors/dbus/constructor.py +++ b/sat/bridge/bridge_constructor/constructors/dbus/constructor.py @@ -1,7 +1,7 @@ #!/usr/bin/env python3 -# SàT: a XMPP client +# Libervia: an XMPP client # Copyright (C) 2009-2021 Jérôme Poisson (goffi@goffi.org) # This program is free software: you can redistribute it and/or modify diff --git a/sat/bridge/bridge_constructor/constructors/dbus/dbus_core_template.py b/sat/bridge/bridge_constructor/constructors/dbus/dbus_core_template.py index 4bee890a..d7469167 100644 --- a/sat/bridge/bridge_constructor/constructors/dbus/dbus_core_template.py +++ b/sat/bridge/bridge_constructor/constructors/dbus/dbus_core_template.py @@ -34,9 +34,9 @@ const_INT_PREFIX = config.getConfig( config.parseMainConf(), "", "bridge_dbus_int_prefix", - "org.salutatoi.SAT") + "org.libervia.Libervia") const_ERROR_PREFIX = const_INT_PREFIX + ".error" -const_OBJ_PATH = "/org/salutatoi/SAT/bridge" +const_OBJ_PATH = "/org/libervia/Libervia/bridge" const_CORE_SUFFIX = ".core" const_PLUGIN_SUFFIX = ".plugin" diff --git a/sat/bridge/bridge_constructor/constructors/dbus/dbus_frontend_template.py b/sat/bridge/bridge_constructor/constructors/dbus/dbus_frontend_template.py index 383ecb29..a8addfd1 100644 --- a/sat/bridge/bridge_constructor/constructors/dbus/dbus_frontend_template.py +++ b/sat/bridge/bridge_constructor/constructors/dbus/dbus_frontend_template.py @@ -36,9 +36,9 @@ const_INT_PREFIX = config.getConfig( config.parseMainConf(), "", "bridge_dbus_int_prefix", - "org.salutatoi.SAT") + "org.libervia.Libervia") const_ERROR_PREFIX = const_INT_PREFIX + ".error" -const_OBJ_PATH = '/org/salutatoi/SAT/bridge' +const_OBJ_PATH = '/org/libervia/Libervia/bridge' const_CORE_SUFFIX = ".core" const_PLUGIN_SUFFIX = ".plugin" const_TIMEOUT = 120 diff --git a/sat/bridge/bridge_constructor/constructors/embedded/constructor.py b/sat/bridge/bridge_constructor/constructors/embedded/constructor.py index 187cae8f..7fc06baa 100644 --- a/sat/bridge/bridge_constructor/constructors/embedded/constructor.py +++ b/sat/bridge/bridge_constructor/constructors/embedded/constructor.py @@ -1,7 +1,7 @@ #!/usr/bin/env python3 -# SàT: a XMPP client +# Libervia: an XMPP client # Copyright (C) 2009-2021 Jérôme Poisson (goffi@goffi.org) # This program is free software: you can redistribute it and/or modify diff --git a/sat/bridge/bridge_constructor/constructors/embedded/embedded_frontend_template.py b/sat/bridge/bridge_constructor/constructors/embedded/embedded_frontend_template.py index d9b92ffb..401f6680 100644 --- a/sat/bridge/bridge_constructor/constructors/embedded/embedded_frontend_template.py +++ b/sat/bridge/bridge_constructor/constructors/embedded/embedded_frontend_template.py @@ -1,7 +1,7 @@ #!/usr/bin/env python3 -# SàT: a XMPP client +# Libervia: an XMPP client # Copyright (C) 2009-2021 Jérôme Poisson (goffi@goffi.org) # This program is free software: you can redistribute it and/or modify diff --git a/sat/bridge/bridge_constructor/constructors/embedded/embedded_template.py b/sat/bridge/bridge_constructor/constructors/embedded/embedded_template.py index 77957553..6123a2d7 100644 --- a/sat/bridge/bridge_constructor/constructors/embedded/embedded_template.py +++ b/sat/bridge/bridge_constructor/constructors/embedded/embedded_template.py @@ -1,7 +1,7 @@ #!/usr/bin/env python3 -# SàT: a XMPP client +# Libervia: an XMPP client # Copyright (C) 2009-2021 Jérôme Poisson (goffi@goffi.org) # This program is free software: you can redistribute it and/or modify diff --git a/sat/bridge/bridge_constructor/constructors/mediawiki/constructor.py b/sat/bridge/bridge_constructor/constructors/mediawiki/constructor.py index e4948060..2c679a6b 100644 --- a/sat/bridge/bridge_constructor/constructors/mediawiki/constructor.py +++ b/sat/bridge/bridge_constructor/constructors/mediawiki/constructor.py @@ -1,7 +1,7 @@ #!/usr/bin/env python3 -# SàT: a XMPP client +# Libervia: an XMPP client # Copyright (C) 2009-2021 Jérôme Poisson (goffi@goffi.org) # This program is free software: you can redistribute it and/or modify diff --git a/sat/bridge/bridge_constructor/constructors/pb/constructor.py b/sat/bridge/bridge_constructor/constructors/pb/constructor.py index 1e008711..5977583f 100644 --- a/sat/bridge/bridge_constructor/constructors/pb/constructor.py +++ b/sat/bridge/bridge_constructor/constructors/pb/constructor.py @@ -1,6 +1,6 @@ #!/usr/bin/env python3 -# SàT: a XMPP client +# Libervia: an XMPP client # Copyright (C) 2009-2021 Jérôme Poisson (goffi@goffi.org) # This program is free software: you can redistribute it and/or modify diff --git a/sat/bridge/dbus_bridge.py b/sat/bridge/dbus_bridge.py index 8e0f4c52..223c2ac5 100644 --- a/sat/bridge/dbus_bridge.py +++ b/sat/bridge/dbus_bridge.py @@ -34,9 +34,9 @@ const_INT_PREFIX = config.getConfig( config.parseMainConf(), "", "bridge_dbus_int_prefix", - "org.salutatoi.SAT") + "org.libervia.Libervia") const_ERROR_PREFIX = const_INT_PREFIX + ".error" -const_OBJ_PATH = "/org/salutatoi/SAT/bridge" +const_OBJ_PATH = "/org/libervia/Libervia/bridge" const_CORE_SUFFIX = ".core" const_PLUGIN_SUFFIX = ".plugin" diff --git a/sat/core/constants.py b/sat/core/constants.py index 56fe045b..80c21895 100644 --- a/sat/core/constants.py +++ b/sat/core/constants.py @@ -1,7 +1,6 @@ #!/usr/bin/env python3 - -# SàT: a XMPP client +# Libervia: an XMPP client # Copyright (C) 2009-2021 Jérôme Poisson (goffi@goffi.org) # This program is free software: you can redistribute it and/or modify @@ -29,12 +28,11 @@ import sat class Const(object): ## Application ## - APP_NAME = "Salut à Toi" - APP_NAME_SHORT = "SàT" - APP_NAME_FILE = "sat" - APP_NAME_FULL = "{name_short} ({name})".format( - name_short=APP_NAME_SHORT, name=APP_NAME - ) + APP_NAME = "Libervia" + APP_COMPONENT = "backend" + APP_NAME_ALT = "SàT" + APP_NAME_FILE = "libervia" + APP_NAME_FULL = f"{APP_NAME} ({APP_COMPONENT})" APP_VERSION = ( sat.__version__ ) # Please add 'D' at the end of version in sat/VERSION for dev versions @@ -440,7 +438,7 @@ class Const(object): if ( BaseDirectory ): # skipped when xdg module is not available (should not happen in backend) - if "org.salutatoi.cagou" in BaseDirectory.__file__: + if "org.libervia.cagou" in BaseDirectory.__file__: # FIXME: hack to make config read from the right location on Android # TODO: fix it in a more proper way @@ -457,8 +455,8 @@ if ( BaseDirectory = None Const.DEFAULT_CONFIG = { - "local_dir": "/data/data/org.salutatoi.cagou/app", - "media_dir": "/data/data/org.salutatoi.cagou/files/app/media", + "local_dir": "/data/data/org.libervia.cagou/app", + "media_dir": "/data/data/org.libervia.cagou/files/app/media", # FIXME: temporary location for downloads, need to call API properly "downloads_dir": os.path.join( Environment.getExternalStoragePublicDirectory( @@ -470,7 +468,7 @@ if ( "log_dir": "%(local_dir)s", } Const.CONFIG_FILES = [ - "/data/data/org.salutatoi.cagou/files/app/android/" + "/data/data/org.libervia.cagou/files/app/android/" + Const.APP_NAME_FILE + ".conf" ] @@ -485,9 +483,14 @@ if ( # image) ["/etc/_", "/etc/", "~/", "~/."] + [ - "%s/" % path + "{}/".format(path) for path in list(BaseDirectory.load_config_paths(Const.APP_NAME_FILE)) ] + # this is to handle legacy sat.conf + + [ + "{}/".format(path) + for path in list(BaseDirectory.load_config_paths("sat")) + ] + [root_dir] ) @@ -512,5 +515,9 @@ if ( Const.CONFIG_FILES = [ realpath(expanduser(path) + Const.APP_NAME_FILE + ".conf") for path in Const.CONFIG_PATHS + ] + [ + # legacy sat.conf + realpath(expanduser(path) + "sat.conf") + for path in Const.CONFIG_PATHS ] diff --git a/sat/core/launcher.py b/sat/core/launcher.py index ecd0dfe1..ca04f190 100644 --- a/sat/core/launcher.py +++ b/sat/core/launcher.py @@ -1,6 +1,6 @@ #!/usr/bin/env python3 -# SàT: an XMPP client +# Libervia: an XMPP client # Copyright (C) 2009-2021 Jérôme Poisson (goffi@goffi.org) # This program is free software: you can redistribute it and/or modify diff --git a/sat/core/log.py b/sat/core/log.py index fe550e8a..bed54d28 100644 --- a/sat/core/log.py +++ b/sat/core/log.py @@ -1,7 +1,7 @@ #!/usr/bin/env python3 -# SàT: a XMPP client +# Libervia: an XMPP client # Copyright (C) 2009-2021 Jérôme Poisson (goffi@goffi.org) # This program is free software: you can redistribute it and/or modify diff --git a/sat/core/log_config.py b/sat/core/log_config.py index c03b487e..88748368 100644 --- a/sat/core/log_config.py +++ b/sat/core/log_config.py @@ -1,7 +1,7 @@ #!/usr/bin/env python3 -# SàT: a XMPP client +# Libervia: an XMPP client # Copyright (C) 2009-2021 Jérôme Poisson (goffi@goffi.org) # This program is free software: you can redistribute it and/or modify diff --git a/sat/core/sat_main.py b/sat/core/sat_main.py index d7e67e80..571f0bbf 100644 --- a/sat/core/sat_main.py +++ b/sat/core/sat_main.py @@ -1,6 +1,6 @@ #!/usr/bin/env python3 -# SàT: an XMPP client +# Libervia: an XMPP client # Copyright (C) 2009-2021 Jérôme Poisson (goffi@goffi.org) # This program is free software: you can redistribute it and/or modify diff --git a/sat/core/xmpp.py b/sat/core/xmpp.py index fa0bd026..1d23fe36 100644 --- a/sat/core/xmpp.py +++ b/sat/core/xmpp.py @@ -1,6 +1,6 @@ #!/usr/bin/env python3 -# SàT: a XMPP client +# Libervia: an XMPP client # Copyright (C) 2009-2021 Jérôme Poisson (goffi@goffi.org) # This program is free software: you can redistribute it and/or modify diff --git a/sat/memory/memory.py b/sat/memory/memory.py index f0a88d0a..01b9d648 100644 --- a/sat/memory/memory.py +++ b/sat/memory/memory.py @@ -1,6 +1,6 @@ #!/usr/bin/env python3 -# SàT: an XMPP client +# Libervia: an XMPP client # Copyright (C) 2009-2021 Jérôme Poisson (goffi@goffi.org) # This program is free software: you can redistribute it and/or modify diff --git a/sat/memory/params.py b/sat/memory/params.py index f5ad820b..59489435 100644 --- a/sat/memory/params.py +++ b/sat/memory/params.py @@ -1,6 +1,6 @@ #!/usr/bin/env python3 -# SàT: a XMPP client +# Libervia: an XMPP client # Copyright (C) 2009-2021 Jérôme Poisson (goffi@goffi.org) # This program is free software: you can redistribute it and/or modify diff --git a/sat/plugins/plugin_adhoc_dbus.py b/sat/plugins/plugin_adhoc_dbus.py index 3234c899..7afc9e1c 100644 --- a/sat/plugins/plugin_adhoc_dbus.py +++ b/sat/plugins/plugin_adhoc_dbus.py @@ -46,7 +46,7 @@ except ImportError: else: DBusGMainLoop(set_as_default=True) -NS_MEDIA_PLAYER = "org.salutatoi.mediaplayer" +NS_MEDIA_PLAYER = "org.libervia.mediaplayer" FD_NAME = "org.freedesktop.DBus" FD_PATH = "/org/freedekstop/DBus" INTROSPECT_IFACE = "org.freedesktop.DBus.Introspectable" diff --git a/sat/plugins/plugin_misc_android.py b/sat/plugins/plugin_misc_android.py index 5dcfdedc..085c5c42 100644 --- a/sat/plugins/plugin_misc_android.py +++ b/sat/plugins/plugin_misc_android.py @@ -102,7 +102,7 @@ VIBRATION_OPTS = { "vibrate": D_("In vibrate mode"), "never": D_("Never"), } -SOCKET_DIR = "/data/data/org.salutatoi.cagou/" +SOCKET_DIR = "/data/data/org.libervia.cagou/" SOCKET_FILE = ".socket" STATE_RUNNING = b"running" STATE_PAUSED = b"paused" diff --git a/sat/tools/common/ansi.py b/sat/tools/common/ansi.py index c3747fa0..d941e542 100644 --- a/sat/tools/common/ansi.py +++ b/sat/tools/common/ansi.py @@ -1,7 +1,7 @@ #!/usr/bin/env python3 -# SàT: a XMPP client +# Libervia: an XMPP client # Copyright (C) 2009-2021 Jérôme Poisson (goffi@goffi.org) # This program is free software: you can redistribute it and/or modify diff --git a/sat/tools/common/data_objects.py b/sat/tools/common/data_objects.py index cdab45e0..feda8a08 100644 --- a/sat/tools/common/data_objects.py +++ b/sat/tools/common/data_objects.py @@ -1,6 +1,6 @@ #!/usr/bin/env python3 -# SàT: an XMPP client +# Libervia: an XMPP client # Copyright (C) 2009-2021 Jérôme Poisson (goffi@goffi.org) # This program is free software: you can redistribute it and/or modify diff --git a/sat/tools/common/dynamic_import.py b/sat/tools/common/dynamic_import.py index df883b4f..6e35fabf 100644 --- a/sat/tools/common/dynamic_import.py +++ b/sat/tools/common/dynamic_import.py @@ -1,6 +1,6 @@ #!/usr/bin/env python3 -# SàT: an XMPP client +# Libervia: an XMPP client # Copyright (C) 2009-2021 Jérôme Poisson (goffi@goffi.org) # This program is free software: you can redistribute it and/or modify diff --git a/sat/tools/common/tls.py b/sat/tools/common/tls.py index c6cf0255..bcae8c6c 100644 --- a/sat/tools/common/tls.py +++ b/sat/tools/common/tls.py @@ -1,6 +1,6 @@ #!/usr/bin/env python3 -# SàT: a XMPP client +# Libervia: an XMPP client # Copyright (C) 2009-2021 Jérôme Poisson (goffi@goffi.org) # This program is free software: you can redistribute it and/or modify diff --git a/sat/tools/common/utils.py b/sat/tools/common/utils.py index 50e8e793..e2f2853f 100644 --- a/sat/tools/common/utils.py +++ b/sat/tools/common/utils.py @@ -1,6 +1,6 @@ #!/usr/bin/env python3 -# SàT: a XMPP client +# Libervia: an XMPP client # Copyright (C) 2009-2021 Jérôme Poisson (goffi@goffi.org) # This program is free software: you can redistribute it and/or modify diff --git a/sat/tools/image.py b/sat/tools/image.py index ac41eb12..df5ead94 100644 --- a/sat/tools/image.py +++ b/sat/tools/image.py @@ -1,6 +1,6 @@ #!/usr/bin/env python3 -# SàT: an XMPP client +# Libervia: an XMPP client # Copyright (C) 2009-2021 Jérôme Poisson (goffi@goffi.org) # This program is free software: you can redistribute it and/or modify diff --git a/sat/tools/sat_defer.py b/sat/tools/sat_defer.py index 923c3f63..04439697 100644 --- a/sat/tools/sat_defer.py +++ b/sat/tools/sat_defer.py @@ -1,7 +1,7 @@ #!/usr/bin/env python3 -# SàT: a XMPP client +# Libervia: an XMPP client # Copyright (C) 2009-2021 Jérôme Poisson (goffi@goffi.org) # This program is free software: you can redistribute it and/or modify diff --git a/sat/tools/stream.py b/sat/tools/stream.py index fc5cf112..0cf206b4 100644 --- a/sat/tools/stream.py +++ b/sat/tools/stream.py @@ -1,6 +1,6 @@ #!/usr/bin/env python3 -# SàT: an XMPP client +# Libervia: an XMPP client # Copyright (C) 2009-2021 Jérôme Poisson (goffi@goffi.org) # This program is free software: you can redistribute it and/or modify diff --git a/sat/tools/video.py b/sat/tools/video.py index 8e570b80..1190a08d 100644 --- a/sat/tools/video.py +++ b/sat/tools/video.py @@ -1,6 +1,6 @@ #!/usr/bin/env python3 -# SàT: an XMPP client +# Libervia: an XMPP client # Copyright (C) 2009-2021 Jérôme Poisson (goffi@goffi.org) # This program is free software: you can redistribute it and/or modify diff --git a/sat/tools/web.py b/sat/tools/web.py index 3f55e672..3b662360 100644 --- a/sat/tools/web.py +++ b/sat/tools/web.py @@ -1,6 +1,6 @@ #!/usr/bin/env python3 -# SàT: an XMPP client +# Libervia: an XMPP client # Copyright (C) 2009-2021 Jérôme Poisson (goffi@goffi.org) # This program is free software: you can redistribute it and/or modify diff --git a/sat_frontends/bridge/dbus_bridge.py b/sat_frontends/bridge/dbus_bridge.py index f679f685..b250607d 100644 --- a/sat_frontends/bridge/dbus_bridge.py +++ b/sat_frontends/bridge/dbus_bridge.py @@ -36,9 +36,9 @@ const_INT_PREFIX = config.getConfig( config.parseMainConf(), "", "bridge_dbus_int_prefix", - "org.salutatoi.SAT") + "org.libervia.Libervia") const_ERROR_PREFIX = const_INT_PREFIX + ".error" -const_OBJ_PATH = '/org/salutatoi/SAT/bridge' +const_OBJ_PATH = '/org/libervia/Libervia/bridge' const_CORE_SUFFIX = ".core" const_PLUGIN_SUFFIX = ".plugin" const_TIMEOUT = 120 diff --git a/setup.py b/setup.py index 73afe46b..8d8e60b2 100644 --- a/setup.py +++ b/setup.py @@ -59,7 +59,7 @@ extras_require = { } DBUS_DIR = 'dbus-1/services' -DBUS_FILE = 'misc/org.salutatoi.SAT.service' +DBUS_FILE = 'misc/org.libervia.Libervia.service' with open(os.path.join(NAME, 'VERSION')) as f: VERSION = f.read().strip() is_dev_version = VERSION.endswith('D') diff --git a/tests/e2e/conftest.py b/tests/e2e/conftest.py index ad12dc09..1ffe8a06 100644 --- a/tests/e2e/conftest.py +++ b/tests/e2e/conftest.py @@ -1,6 +1,6 @@ #!/usr/bin/env python3 -# SàT: an XMPP client +# Libervia: an XMPP client # Copyright (C) 2009-2021 Jérôme Poisson (goffi@goffi.org) # This program is free software: you can redistribute it and/or modify diff --git a/tests/e2e/jp/conftest.py b/tests/e2e/jp/conftest.py index ca2fc934..94a41d8b 100644 --- a/tests/e2e/jp/conftest.py +++ b/tests/e2e/jp/conftest.py @@ -1,6 +1,6 @@ #!/usr/bin/env python3 -# SàT: an XMPP client +# Libervia: an XMPP client # Copyright (C) 2009-2021 Jérôme Poisson (goffi@goffi.org) # This program is free software: you can redistribute it and/or modify diff --git a/tests/e2e/jp/test_jp.py b/tests/e2e/jp/test_jp.py index 8b6fc318..9cab38aa 100644 --- a/tests/e2e/jp/test_jp.py +++ b/tests/e2e/jp/test_jp.py @@ -1,6 +1,6 @@ #!/usr/bin/env python3 -# SàT: an XMPP client +# Libervia: an XMPP client # Copyright (C) 2009-2021 Jérôme Poisson (goffi@goffi.org) # This program is free software: you can redistribute it and/or modify diff --git a/tests/e2e/libervia/conftest.py b/tests/e2e/libervia/conftest.py index 6b10ad8c..0698a312 100644 --- a/tests/e2e/libervia/conftest.py +++ b/tests/e2e/libervia/conftest.py @@ -1,6 +1,6 @@ #!/usr/bin/env python3 -# SàT: an XMPP client +# Libervia: an XMPP client # Copyright (C) 2009-2021 Jérôme Poisson (goffi@goffi.org) # This program is free software: you can redistribute it and/or modify diff --git a/tests/e2e/libervia/test_libervia.py b/tests/e2e/libervia/test_libervia.py index e1994461..54714cc2 100644 --- a/tests/e2e/libervia/test_libervia.py +++ b/tests/e2e/libervia/test_libervia.py @@ -1,6 +1,6 @@ #!/usr/bin/env python3 -# SàT: an XMPP client +# Libervia: an XMPP client # Copyright (C) 2009-2021 Jérôme Poisson (goffi@goffi.org) # This program is free software: you can redistribute it and/or modify diff --git a/tests/e2e/run_e2e.py b/tests/e2e/run_e2e.py index 7d0a1191..b5297e5e 100755 --- a/tests/e2e/run_e2e.py +++ b/tests/e2e/run_e2e.py @@ -1,6 +1,6 @@ #!/usr/bin/env python3 -# SàT: an XMPP client +# Libervia: an XMPP client # Copyright (C) 2009-2021 Jérôme Poisson (goffi@goffi.org) # This program is free software: you can redistribute it and/or modify diff --git a/twisted/plugins/sat_plugin.py b/twisted/plugins/sat_plugin.py index 93d71de1..20b3ecce 100644 --- a/twisted/plugins/sat_plugin.py +++ b/twisted/plugins/sat_plugin.py @@ -1,6 +1,6 @@ #!/usr/bin/env python3 -# SàT: an XMPP client +# Libervia: an XMPP client # Copyright (C) 2009-2021 Jérôme Poisson (goffi@goffi.org) # This program is free software: you can redistribute it and/or modify