diff --git a/libervia/backend/bridge/bridge_constructor/constructors/pb/pb_frontend_template.py b/libervia/backend/bridge/bridge_constructor/constructors/pb/pb_frontend_template.py
index aac4815f..95ede106 100644
--- a/libervia/backend/bridge/bridge_constructor/constructors/pb/pb_frontend_template.py
+++ b/libervia/backend/bridge/bridge_constructor/constructors/pb/pb_frontend_template.py
@@ -25,7 +25,7 @@ from twisted.internet import reactor, defer
from twisted.internet.error import ConnectionRefusedError, ConnectError
from libervia.backend.core import exceptions
from libervia.backend.tools import config
-from sat_frontends.bridge.bridge_frontend import BridgeException
+from libervia.frontends.bridge.bridge_frontend import BridgeException
log = getLogger(__name__)
diff --git a/libervia/backend/plugins/plugin_misc_tarot.py b/libervia/backend/plugins/plugin_misc_tarot.py
index 73c26892..009949a5 100644
--- a/libervia/backend/plugins/plugin_misc_tarot.py
+++ b/libervia/backend/plugins/plugin_misc_tarot.py
@@ -29,7 +29,7 @@ from wokkel import data_form
from libervia.backend.memory import memory
from libervia.backend.tools import xml_tools
-from sat_frontends.tools.games import TarotCard
+from libervia.frontends.tools.games import TarotCard
import random
diff --git a/libervia/backend/plugins/plugin_misc_text_syntaxes.py b/libervia/backend/plugins/plugin_misc_text_syntaxes.py
index 4bb52a01..64fd01cf 100644
--- a/libervia/backend/plugins/plugin_misc_text_syntaxes.py
+++ b/libervia/backend/plugins/plugin_misc_text_syntaxes.py
@@ -203,7 +203,7 @@ class TextSyntaxes(object):
TextSyntaxes.OPT_NO_THREAD,
)
# TODO: text => XHTML should add to url like in frontends
- # it's probably best to move sat_frontends.tools.strings to sat.tools.common or similar
+ # it's probably best to move libervia.frontends.tools.strings to sat.tools.common or similar
self.add_syntax(
self.SYNTAX_TEXT,
lambda text: escape(text),
diff --git a/libervia/backend/tools/common/template_xmlui.py b/libervia/backend/tools/common/template_xmlui.py
index c4c4fe3a..b4b4c783 100644
--- a/libervia/backend/tools/common/template_xmlui.py
+++ b/libervia/backend/tools/common/template_xmlui.py
@@ -24,8 +24,8 @@ XMLUI classes from this modules can then be iterated to create the template
from functools import partial
from libervia.backend.core.log import getLogger
-from sat_frontends.tools import xmlui
-from sat_frontends.tools import jid
+from libervia.frontends.tools import xmlui
+from libervia.frontends.tools import jid
try:
from jinja2 import Markup as safe
except ImportError:
diff --git a/sat_frontends/__init__.py b/libervia/frontends/__init__.py
similarity index 100%
rename from sat_frontends/__init__.py
rename to libervia/frontends/__init__.py
diff --git a/sat_frontends/bridge/__init__.py b/libervia/frontends/bridge/__init__.py
similarity index 100%
rename from sat_frontends/bridge/__init__.py
rename to libervia/frontends/bridge/__init__.py
diff --git a/sat_frontends/bridge/bridge_frontend.py b/libervia/frontends/bridge/bridge_frontend.py
similarity index 100%
rename from sat_frontends/bridge/bridge_frontend.py
rename to libervia/frontends/bridge/bridge_frontend.py
diff --git a/sat_frontends/bridge/dbus_bridge.py b/libervia/frontends/bridge/dbus_bridge.py
similarity index 100%
rename from sat_frontends/bridge/dbus_bridge.py
rename to libervia/frontends/bridge/dbus_bridge.py
diff --git a/sat_frontends/bridge/pb.py b/libervia/frontends/bridge/pb.py
similarity index 99%
rename from sat_frontends/bridge/pb.py
rename to libervia/frontends/bridge/pb.py
index 6640780e..6988e0cc 100644
--- a/sat_frontends/bridge/pb.py
+++ b/libervia/frontends/bridge/pb.py
@@ -25,7 +25,7 @@ from twisted.internet import reactor, defer
from twisted.internet.error import ConnectionRefusedError, ConnectError
from libervia.backend.core import exceptions
from libervia.backend.tools import config
-from sat_frontends.bridge.bridge_frontend import BridgeException
+from libervia.frontends.bridge.bridge_frontend import BridgeException
log = getLogger(__name__)
diff --git a/sat_frontends/jp/__init__.py b/libervia/frontends/jp/__init__.py
similarity index 100%
rename from sat_frontends/jp/__init__.py
rename to libervia/frontends/jp/__init__.py
diff --git a/sat_frontends/jp/arg_tools.py b/libervia/frontends/jp/arg_tools.py
similarity index 100%
rename from sat_frontends/jp/arg_tools.py
rename to libervia/frontends/jp/arg_tools.py
diff --git a/sat_frontends/jp/base.py b/libervia/frontends/jp/base.py
similarity index 99%
rename from sat_frontends/jp/base.py
rename to libervia/frontends/jp/base.py
index 2cb45ec0..674fda70 100644
--- a/sat_frontends/jp/base.py
+++ b/libervia/frontends/jp/base.py
@@ -36,7 +36,7 @@ from pathlib import Path
from glob import iglob
from typing import Optional, Set, Union
from importlib import import_module
-from sat_frontends.tools.jid import JID
+from libervia.frontends.tools.jid import JID
from libervia.backend.tools import config
from libervia.backend.tools.common import dynamic_import
from libervia.backend.tools.common import uri
@@ -45,11 +45,11 @@ from libervia.backend.tools.common import utils
from libervia.backend.tools.common import data_format
from libervia.backend.tools.common.ansi import ANSI as A
from libervia.backend.core import exceptions
-import sat_frontends.jp
-from sat_frontends.jp.loops import QuitException, get_jp_loop
-from sat_frontends.jp.constants import Const as C
-from sat_frontends.bridge.bridge_frontend import BridgeException
-from sat_frontends.tools import misc
+import libervia.frontends.jp
+from libervia.frontends.jp.loops import QuitException, get_jp_loop
+from libervia.frontends.jp.constants import Const as C
+from libervia.frontends.bridge.bridge_frontend import BridgeException
+from libervia.frontends.tools import misc
import xml.etree.ElementTree as ET # FIXME: used temporarily to manage XMLUI
from collections import OrderedDict
@@ -108,7 +108,7 @@ class LiberviaCli:
"""
self.sat_conf = main_config
self.set_color_theme()
- bridge_module = dynamic_import.bridge(bridge_name, 'sat_frontends.bridge')
+ bridge_module = dynamic_import.bridge(bridge_name, 'libervia.frontends.bridge')
if bridge_module is None:
log.error("Can't import {} bridge".format(bridge_name))
sys.exit(1)
@@ -523,7 +523,7 @@ class LiberviaCli:
looks from modules names cmd_*.py in jp path and import them
"""
- path = os.path.dirname(sat_frontends.jp.__file__)
+ path = os.path.dirname(libervia.frontends.jp.__file__)
# XXX: outputs must be imported before commands as they are used for arguments
for type_, pattern in ((C.PLUGIN_OUTPUT, 'output_*.py'),
(C.PLUGIN_CMD, 'cmd_*.py')):
@@ -531,7 +531,7 @@ class LiberviaCli:
os.path.splitext(module)[0]
for module in map(os.path.basename, iglob(os.path.join(path, pattern))))
for module_name in modules:
- module_path = "sat_frontends.jp." + module_name
+ module_path = "libervia.frontends.jp." + module_name
try:
module = import_module(module_path)
self.import_plugin_module(module, type_)
diff --git a/sat_frontends/jp/cmd_account.py b/libervia/frontends/jp/cmd_account.py
similarity index 97%
rename from sat_frontends/jp/cmd_account.py
rename to libervia/frontends/jp/cmd_account.py
index bd71ca92..c32c7b9d 100644
--- a/sat_frontends/jp/cmd_account.py
+++ b/libervia/frontends/jp/cmd_account.py
@@ -19,12 +19,12 @@
"""This module permits to manage XMPP accounts using in-band registration (XEP-0077)"""
-from sat_frontends.jp.constants import Const as C
-from sat_frontends.bridge.bridge_frontend import BridgeException
+from libervia.frontends.jp.constants import Const as C
+from libervia.frontends.bridge.bridge_frontend import BridgeException
from libervia.backend.core.log import getLogger
from libervia.backend.core.i18n import _
-from sat_frontends.jp import base
-from sat_frontends.tools import jid
+from libervia.frontends.jp import base
+from libervia.frontends.tools import jid
log = getLogger(__name__)
diff --git a/sat_frontends/jp/cmd_adhoc.py b/libervia/frontends/jp/cmd_adhoc.py
similarity index 98%
rename from sat_frontends/jp/cmd_adhoc.py
rename to libervia/frontends/jp/cmd_adhoc.py
index 34f32485..f2b211eb 100644
--- a/sat_frontends/jp/cmd_adhoc.py
+++ b/libervia/frontends/jp/cmd_adhoc.py
@@ -19,8 +19,8 @@
from . import base
from libervia.backend.core.i18n import _
-from sat_frontends.jp.constants import Const as C
-from sat_frontends.jp import xmlui_manager
+from libervia.frontends.jp.constants import Const as C
+from libervia.frontends.jp import xmlui_manager
__commands__ = ["AdHoc"]
diff --git a/sat_frontends/jp/cmd_application.py b/libervia/frontends/jp/cmd_application.py
similarity index 99%
rename from sat_frontends/jp/cmd_application.py
rename to libervia/frontends/jp/cmd_application.py
index 935c90c9..ba70864e 100644
--- a/sat_frontends/jp/cmd_application.py
+++ b/libervia/frontends/jp/cmd_application.py
@@ -19,7 +19,7 @@
from . import base
from libervia.backend.core.i18n import _
from libervia.backend.tools.common import data_format
-from sat_frontends.jp.constants import Const as C
+from libervia.frontends.jp.constants import Const as C
__commands__ = ["Application"]
diff --git a/sat_frontends/jp/cmd_avatar.py b/libervia/frontends/jp/cmd_avatar.py
similarity index 98%
rename from sat_frontends/jp/cmd_avatar.py
rename to libervia/frontends/jp/cmd_avatar.py
index 8e4ba2e7..316157f3 100644
--- a/sat_frontends/jp/cmd_avatar.py
+++ b/libervia/frontends/jp/cmd_avatar.py
@@ -23,7 +23,7 @@ import os.path
import asyncio
from . import base
from libervia.backend.core.i18n import _
-from sat_frontends.jp.constants import Const as C
+from libervia.frontends.jp.constants import Const as C
from libervia.backend.tools import config
from libervia.backend.tools.common import data_format
diff --git a/sat_frontends/jp/cmd_blocking.py b/libervia/frontends/jp/cmd_blocking.py
similarity index 97%
rename from sat_frontends/jp/cmd_blocking.py
rename to libervia/frontends/jp/cmd_blocking.py
index f5691077..7ff1cd22 100644
--- a/sat_frontends/jp/cmd_blocking.py
+++ b/libervia/frontends/jp/cmd_blocking.py
@@ -22,8 +22,8 @@ import json
import os
from libervia.backend.core.i18n import _
from libervia.backend.tools.common import data_format
-from sat_frontends.jp import common
-from sat_frontends.jp.constants import Const as C
+from libervia.frontends.jp import common
+from libervia.frontends.jp.constants import Const as C
from . import base
__commands__ = ["Blocking"]
diff --git a/sat_frontends/jp/cmd_blog.py b/libervia/frontends/jp/cmd_blog.py
similarity index 99%
rename from sat_frontends/jp/cmd_blog.py
rename to libervia/frontends/jp/cmd_blog.py
index 9fb6094f..df261a7f 100644
--- a/sat_frontends/jp/cmd_blog.py
+++ b/libervia/frontends/jp/cmd_blog.py
@@ -36,8 +36,8 @@ from libervia.backend.tools import config
from libervia.backend.tools.common import uri
from libervia.backend.tools.common import data_format
from libervia.backend.tools.common.ansi import ANSI as A
-from sat_frontends.jp import common
-from sat_frontends.jp.constants import Const as C
+from libervia.frontends.jp import common
+from libervia.frontends.jp.constants import Const as C
from . import base, cmd_pubsub
diff --git a/sat_frontends/jp/cmd_bookmarks.py b/libervia/frontends/jp/cmd_bookmarks.py
similarity index 99%
rename from sat_frontends/jp/cmd_bookmarks.py
rename to libervia/frontends/jp/cmd_bookmarks.py
index 77948bab..0deae212 100644
--- a/sat_frontends/jp/cmd_bookmarks.py
+++ b/libervia/frontends/jp/cmd_bookmarks.py
@@ -19,7 +19,7 @@
from . import base
from libervia.backend.core.i18n import _
-from sat_frontends.jp.constants import Const as C
+from libervia.frontends.jp.constants import Const as C
__commands__ = ["Bookmarks"]
diff --git a/sat_frontends/jp/cmd_debug.py b/libervia/frontends/jp/cmd_debug.py
similarity index 99%
rename from sat_frontends/jp/cmd_debug.py
rename to libervia/frontends/jp/cmd_debug.py
index 879294c4..729be0c8 100644
--- a/sat_frontends/jp/cmd_debug.py
+++ b/libervia/frontends/jp/cmd_debug.py
@@ -20,7 +20,7 @@
from . import base
from libervia.backend.core.i18n import _
-from sat_frontends.jp.constants import Const as C
+from libervia.frontends.jp.constants import Const as C
from libervia.backend.tools.common.ansi import ANSI as A
import json
diff --git a/sat_frontends/jp/cmd_encryption.py b/libervia/frontends/jp/cmd_encryption.py
similarity index 98%
rename from sat_frontends/jp/cmd_encryption.py
rename to libervia/frontends/jp/cmd_encryption.py
index 28107d64..12113749 100644
--- a/sat_frontends/jp/cmd_encryption.py
+++ b/libervia/frontends/jp/cmd_encryption.py
@@ -17,11 +17,11 @@
# You should have received a copy of the GNU Affero General Public License
# along with this program. If not, see .
-from sat_frontends.jp import base
-from sat_frontends.jp.constants import Const as C
+from libervia.frontends.jp import base
+from libervia.frontends.jp.constants import Const as C
from libervia.backend.core.i18n import _
from libervia.backend.tools.common import data_format
-from sat_frontends.jp import xmlui_manager
+from libervia.frontends.jp import xmlui_manager
__commands__ = ["Encryption"]
diff --git a/sat_frontends/jp/cmd_event.py b/libervia/frontends/jp/cmd_event.py
similarity index 99%
rename from sat_frontends/jp/cmd_event.py
rename to libervia/frontends/jp/cmd_event.py
index 23fafec8..80912d06 100644
--- a/sat_frontends/jp/cmd_event.py
+++ b/libervia/frontends/jp/cmd_event.py
@@ -30,9 +30,9 @@ from libervia.backend.tools.common import data_format
from libervia.backend.tools.common import date_utils
from libervia.backend.tools.common.ansi import ANSI as A
from libervia.backend.tools.common.ansi import ANSI as A
-from sat_frontends.jp import common
-from sat_frontends.jp.constants import Const as C
-from sat_frontends.jp.constants import Const as C
+from libervia.frontends.jp import common
+from libervia.frontends.jp.constants import Const as C
+from libervia.frontends.jp.constants import Const as C
from . import base
diff --git a/sat_frontends/jp/cmd_file.py b/libervia/frontends/jp/cmd_file.py
similarity index 99%
rename from sat_frontends/jp/cmd_file.py
rename to libervia/frontends/jp/cmd_file.py
index 62918475..e07f73b2 100644
--- a/sat_frontends/jp/cmd_file.py
+++ b/libervia/frontends/jp/cmd_file.py
@@ -26,9 +26,9 @@ import os.path
import tarfile
from libervia.backend.core.i18n import _
from libervia.backend.tools.common import data_format
-from sat_frontends.jp.constants import Const as C
-from sat_frontends.jp import common
-from sat_frontends.tools import jid
+from libervia.frontends.jp.constants import Const as C
+from libervia.frontends.jp import common
+from libervia.frontends.tools import jid
from libervia.backend.tools.common.ansi import ANSI as A
from libervia.backend.tools.common import utils
from urllib.parse import urlparse
diff --git a/sat_frontends/jp/cmd_forums.py b/libervia/frontends/jp/cmd_forums.py
similarity index 98%
rename from sat_frontends/jp/cmd_forums.py
rename to libervia/frontends/jp/cmd_forums.py
index 5006eed5..99d0414d 100644
--- a/sat_frontends/jp/cmd_forums.py
+++ b/libervia/frontends/jp/cmd_forums.py
@@ -20,8 +20,8 @@
from . import base
from libervia.backend.core.i18n import _
-from sat_frontends.jp.constants import Const as C
-from sat_frontends.jp import common
+from libervia.frontends.jp.constants import Const as C
+from libervia.frontends.jp import common
from libervia.backend.tools.common.ansi import ANSI as A
import codecs
import json
diff --git a/sat_frontends/jp/cmd_identity.py b/libervia/frontends/jp/cmd_identity.py
similarity index 98%
rename from sat_frontends/jp/cmd_identity.py
rename to libervia/frontends/jp/cmd_identity.py
index 1e115554..aeabaa29 100644
--- a/sat_frontends/jp/cmd_identity.py
+++ b/libervia/frontends/jp/cmd_identity.py
@@ -20,7 +20,7 @@
from . import base
from libervia.backend.core.i18n import _
-from sat_frontends.jp.constants import Const as C
+from libervia.frontends.jp.constants import Const as C
from libervia.backend.tools.common import data_format
__commands__ = ["Identity"]
diff --git a/sat_frontends/jp/cmd_info.py b/libervia/frontends/jp/cmd_info.py
similarity index 99%
rename from sat_frontends/jp/cmd_info.py
rename to libervia/frontends/jp/cmd_info.py
index 086bb351..b5466f55 100644
--- a/sat_frontends/jp/cmd_info.py
+++ b/libervia/frontends/jp/cmd_info.py
@@ -22,8 +22,8 @@ from pprint import pformat
from libervia.backend.core.i18n import _
from libervia.backend.tools.common import data_format, date_utils
from libervia.backend.tools.common.ansi import ANSI as A
-from sat_frontends.jp import common
-from sat_frontends.jp.constants import Const as C
+from libervia.frontends.jp import common
+from libervia.frontends.jp.constants import Const as C
from . import base
diff --git a/sat_frontends/jp/cmd_input.py b/libervia/frontends/jp/cmd_input.py
similarity index 99%
rename from sat_frontends/jp/cmd_input.py
rename to libervia/frontends/jp/cmd_input.py
index f0900c83..187f4ec3 100644
--- a/sat_frontends/jp/cmd_input.py
+++ b/libervia/frontends/jp/cmd_input.py
@@ -26,7 +26,7 @@ import asyncio
from . import base
from libervia.backend.core.i18n import _
from libervia.backend.core import exceptions
-from sat_frontends.jp.constants import Const as C
+from libervia.frontends.jp.constants import Const as C
from libervia.backend.tools.common.ansi import ANSI as A
__commands__ = ["Input"]
diff --git a/sat_frontends/jp/cmd_invitation.py b/libervia/frontends/jp/cmd_invitation.py
similarity index 99%
rename from sat_frontends/jp/cmd_invitation.py
rename to libervia/frontends/jp/cmd_invitation.py
index e9f0a5d1..dee081ed 100644
--- a/sat_frontends/jp/cmd_invitation.py
+++ b/libervia/frontends/jp/cmd_invitation.py
@@ -20,7 +20,7 @@
from . import base
from libervia.backend.core.i18n import _
-from sat_frontends.jp.constants import Const as C
+from libervia.frontends.jp.constants import Const as C
from libervia.backend.tools.common.ansi import ANSI as A
from libervia.backend.tools.common import data_format
diff --git a/sat_frontends/jp/cmd_list.py b/libervia/frontends/jp/cmd_list.py
similarity index 99%
rename from sat_frontends/jp/cmd_list.py
rename to libervia/frontends/jp/cmd_list.py
index e006768c..42306c62 100644
--- a/sat_frontends/jp/cmd_list.py
+++ b/libervia/frontends/jp/cmd_list.py
@@ -22,8 +22,8 @@ import json
import os
from libervia.backend.core.i18n import _
from libervia.backend.tools.common import data_format
-from sat_frontends.jp import common
-from sat_frontends.jp.constants import Const as C
+from libervia.frontends.jp import common
+from libervia.frontends.jp.constants import Const as C
from . import base
__commands__ = ["List"]
diff --git a/sat_frontends/jp/cmd_merge_request.py b/libervia/frontends/jp/cmd_merge_request.py
similarity index 97%
rename from sat_frontends/jp/cmd_merge_request.py
rename to libervia/frontends/jp/cmd_merge_request.py
index 65d77611..90306988 100644
--- a/sat_frontends/jp/cmd_merge_request.py
+++ b/libervia/frontends/jp/cmd_merge_request.py
@@ -22,9 +22,9 @@ import os.path
from . import base
from libervia.backend.core.i18n import _
from libervia.backend.tools.common import data_format
-from sat_frontends.jp.constants import Const as C
-from sat_frontends.jp import xmlui_manager
-from sat_frontends.jp import common
+from libervia.frontends.jp.constants import Const as C
+from libervia.frontends.jp import xmlui_manager
+from libervia.frontends.jp import common
__commands__ = ["MergeRequest"]
diff --git a/sat_frontends/jp/cmd_message.py b/libervia/frontends/jp/cmd_message.py
similarity index 98%
rename from sat_frontends/jp/cmd_message.py
rename to libervia/frontends/jp/cmd_message.py
index e2ed15a9..fc2b7b22 100644
--- a/sat_frontends/jp/cmd_message.py
+++ b/libervia/frontends/jp/cmd_message.py
@@ -26,9 +26,9 @@ from libervia.backend.core.i18n import _
from libervia.backend.tools.common import data_format
from libervia.backend.tools.common.ansi import ANSI as A
from libervia.backend.tools.utils import clean_ustr
-from sat_frontends.jp import base
-from sat_frontends.jp.constants import Const as C
-from sat_frontends.tools import jid
+from libervia.frontends.jp import base
+from libervia.frontends.jp.constants import Const as C
+from libervia.frontends.tools import jid
__commands__ = ["Message"]
diff --git a/sat_frontends/jp/cmd_param.py b/libervia/frontends/jp/cmd_param.py
similarity index 100%
rename from sat_frontends/jp/cmd_param.py
rename to libervia/frontends/jp/cmd_param.py
diff --git a/sat_frontends/jp/cmd_ping.py b/libervia/frontends/jp/cmd_ping.py
similarity index 96%
rename from sat_frontends/jp/cmd_ping.py
rename to libervia/frontends/jp/cmd_ping.py
index c3283efe..a4fe3fa4 100644
--- a/sat_frontends/jp/cmd_ping.py
+++ b/libervia/frontends/jp/cmd_ping.py
@@ -19,7 +19,7 @@
from . import base
from libervia.backend.core.i18n import _
-from sat_frontends.jp.constants import Const as C
+from libervia.frontends.jp.constants import Const as C
__commands__ = ["Ping"]
diff --git a/sat_frontends/jp/cmd_pipe.py b/libervia/frontends/jp/cmd_pipe.py
similarity index 96%
rename from sat_frontends/jp/cmd_pipe.py
rename to libervia/frontends/jp/cmd_pipe.py
index bbdc6abb..3b981f9b 100644
--- a/sat_frontends/jp/cmd_pipe.py
+++ b/libervia/frontends/jp/cmd_pipe.py
@@ -25,10 +25,10 @@ import sys
from libervia.backend.core.i18n import _
from libervia.backend.tools.common import data_format
-from sat_frontends.jp import base
-from sat_frontends.jp import xmlui_manager
-from sat_frontends.jp.constants import Const as C
-from sat_frontends.tools import jid
+from libervia.frontends.jp import base
+from libervia.frontends.jp import xmlui_manager
+from libervia.frontends.jp.constants import Const as C
+from libervia.frontends.tools import jid
__commands__ = ["Pipe"]
diff --git a/sat_frontends/jp/cmd_profile.py b/libervia/frontends/jp/cmd_profile.py
similarity index 99%
rename from sat_frontends/jp/cmd_profile.py
rename to libervia/frontends/jp/cmd_profile.py
index 98f7121a..bad26f6c 100644
--- a/sat_frontends/jp/cmd_profile.py
+++ b/libervia/frontends/jp/cmd_profile.py
@@ -20,10 +20,10 @@
"""This module permits to manage profiles. It can list, create, delete
and retrieve information about a profile."""
-from sat_frontends.jp.constants import Const as C
+from libervia.frontends.jp.constants import Const as C
from libervia.backend.core.log import getLogger
from libervia.backend.core.i18n import _
-from sat_frontends.jp import base
+from libervia.frontends.jp import base
log = getLogger(__name__)
diff --git a/sat_frontends/jp/cmd_pubsub.py b/libervia/frontends/jp/cmd_pubsub.py
similarity index 99%
rename from sat_frontends/jp/cmd_pubsub.py
rename to libervia/frontends/jp/cmd_pubsub.py
index 0088d271..0cbf80fe 100644
--- a/sat_frontends/jp/cmd_pubsub.py
+++ b/libervia/frontends/jp/cmd_pubsub.py
@@ -28,17 +28,17 @@ import json
from . import base
from libervia.backend.core.i18n import _
from libervia.backend.core import exceptions
-from sat_frontends.jp.constants import Const as C
-from sat_frontends.jp import common
-from sat_frontends.jp import arg_tools
-from sat_frontends.jp import xml_tools
+from libervia.frontends.jp.constants import Const as C
+from libervia.frontends.jp import common
+from libervia.frontends.jp import arg_tools
+from libervia.frontends.jp import xml_tools
from functools import partial
from libervia.backend.tools.common import data_format
from libervia.backend.tools.common import uri
from libervia.backend.tools.common.ansi import ANSI as A
from libervia.backend.tools.common import date_utils
-from sat_frontends.tools import jid, strings
-from sat_frontends.bridge.bridge_frontend import BridgeException
+from libervia.frontends.tools import jid, strings
+from libervia.frontends.bridge.bridge_frontend import BridgeException
__commands__ = ["Pubsub"]
diff --git a/sat_frontends/jp/cmd_roster.py b/libervia/frontends/jp/cmd_roster.py
similarity index 99%
rename from sat_frontends/jp/cmd_roster.py
rename to libervia/frontends/jp/cmd_roster.py
index 4a0ca8ff..7eac8abe 100644
--- a/sat_frontends/jp/cmd_roster.py
+++ b/libervia/frontends/jp/cmd_roster.py
@@ -20,8 +20,8 @@
from . import base
from collections import OrderedDict
from libervia.backend.core.i18n import _
-from sat_frontends.jp.constants import Const as C
-from sat_frontends.tools import jid
+from libervia.frontends.jp.constants import Const as C
+from libervia.frontends.tools import jid
from libervia.backend.tools.common.ansi import ANSI as A
__commands__ = ["Roster"]
diff --git a/sat_frontends/jp/cmd_shell.py b/libervia/frontends/jp/cmd_shell.py
similarity index 99%
rename from sat_frontends/jp/cmd_shell.py
rename to libervia/frontends/jp/cmd_shell.py
index 041f18e2..3139cffd 100644
--- a/sat_frontends/jp/cmd_shell.py
+++ b/libervia/frontends/jp/cmd_shell.py
@@ -25,8 +25,8 @@ import subprocess
from . import base
from libervia.backend.core.i18n import _
from libervia.backend.core import exceptions
-from sat_frontends.jp.constants import Const as C
-from sat_frontends.jp import arg_tools
+from libervia.frontends.jp.constants import Const as C
+from libervia.frontends.jp import arg_tools
from libervia.backend.tools.common.ansi import ANSI as A
__commands__ = ["Shell"]
diff --git a/sat_frontends/jp/cmd_uri.py b/libervia/frontends/jp/cmd_uri.py
similarity index 97%
rename from sat_frontends/jp/cmd_uri.py
rename to libervia/frontends/jp/cmd_uri.py
index d5b57f34..9a72dceb 100644
--- a/sat_frontends/jp/cmd_uri.py
+++ b/libervia/frontends/jp/cmd_uri.py
@@ -20,7 +20,7 @@
from . import base
from libervia.backend.core.i18n import _
-from sat_frontends.jp.constants import Const as C
+from libervia.frontends.jp.constants import Const as C
from libervia.backend.tools.common import uri
__commands__ = ["Uri"]
diff --git a/sat_frontends/jp/common.py b/libervia/frontends/jp/common.py
similarity index 99%
rename from sat_frontends/jp/common.py
rename to libervia/frontends/jp/common.py
index e4d0a5fe..32230d98 100644
--- a/sat_frontends/jp/common.py
+++ b/libervia/frontends/jp/common.py
@@ -26,7 +26,7 @@ import asyncio
import shlex
import re
from pathlib import Path
-from sat_frontends.jp.constants import Const as C
+from libervia.frontends.jp.constants import Const as C
from libervia.backend.core.i18n import _
from libervia.backend.core import exceptions
from libervia.backend.tools.common import regex
diff --git a/sat_frontends/jp/constants.py b/libervia/frontends/jp/constants.py
similarity index 98%
rename from sat_frontends/jp/constants.py
rename to libervia/frontends/jp/constants.py
index 792d3e39..9a2216e5 100644
--- a/sat_frontends/jp/constants.py
+++ b/libervia/frontends/jp/constants.py
@@ -17,7 +17,7 @@
# You should have received a copy of the GNU Affero General Public License
# along with this program. If not, see .
-from sat_frontends.quick_frontend import constants
+from libervia.frontends.quick_frontend import constants
from libervia.backend.tools.common.ansi import ANSI as A
diff --git a/sat_frontends/jp/loops.py b/libervia/frontends/jp/loops.py
similarity index 97%
rename from sat_frontends/jp/loops.py
rename to libervia/frontends/jp/loops.py
index 3156e44b..4fc033a3 100644
--- a/sat_frontends/jp/loops.py
+++ b/libervia/frontends/jp/loops.py
@@ -20,7 +20,7 @@ import sys
import asyncio
import logging as log
from libervia.backend.core.i18n import _
-from sat_frontends.jp.constants import Const as C
+from libervia.frontends.jp.constants import Const as C
log.basicConfig(level=log.WARNING,
format='[%(name)s] %(message)s')
@@ -117,7 +117,7 @@ def get_jp_loop(bridge_name):
ret = callback(*args)
# FIXME: temporary hack to avoid traceback when using XMLUI
# to be removed once create_task is not used anymore in
- # xmlui_manager (i.e. once sat_frontends.tools.xmlui fully supports
+ # xmlui_manager (i.e. once libervia.frontends.tools.xmlui fully supports
# async syntax)
except QuitException:
return
diff --git a/sat_frontends/jp/output_std.py b/libervia/frontends/jp/output_std.py
similarity index 98%
rename from sat_frontends/jp/output_std.py
rename to libervia/frontends/jp/output_std.py
index 0c0f3746..f3401a54 100644
--- a/sat_frontends/jp/output_std.py
+++ b/libervia/frontends/jp/output_std.py
@@ -19,8 +19,8 @@
"""Standard outputs"""
-from sat_frontends.jp.constants import Const as C
-from sat_frontends.tools import jid
+from libervia.frontends.jp.constants import Const as C
+from libervia.frontends.tools import jid
from libervia.backend.tools.common.ansi import ANSI as A
from libervia.backend.tools.common import date_utils
import json
diff --git a/sat_frontends/jp/output_template.py b/libervia/frontends/jp/output_template.py
similarity index 99%
rename from sat_frontends/jp/output_template.py
rename to libervia/frontends/jp/output_template.py
index a32a52ae..40cb21a4 100644
--- a/sat_frontends/jp/output_template.py
+++ b/libervia/frontends/jp/output_template.py
@@ -19,7 +19,7 @@
"""Standard outputs"""
-from sat_frontends.jp.constants import Const as C
+from libervia.frontends.jp.constants import Const as C
from libervia.backend.core.i18n import _
from libervia.backend.core import log
from libervia.backend.tools.common import template
diff --git a/sat_frontends/jp/output_xml.py b/libervia/frontends/jp/output_xml.py
similarity index 98%
rename from sat_frontends/jp/output_xml.py
rename to libervia/frontends/jp/output_xml.py
index 4bde2087..1aee4276 100644
--- a/sat_frontends/jp/output_xml.py
+++ b/libervia/frontends/jp/output_xml.py
@@ -18,7 +18,7 @@
"""Standard outputs"""
-from sat_frontends.jp.constants import Const as C
+from libervia.frontends.jp.constants import Const as C
from libervia.backend.core.i18n import _
from lxml import etree
from libervia.backend.core.log import getLogger
diff --git a/sat_frontends/jp/output_xmlui.py b/libervia/frontends/jp/output_xmlui.py
similarity index 93%
rename from sat_frontends/jp/output_xmlui.py
rename to libervia/frontends/jp/output_xmlui.py
index 931a1635..e73e1dd9 100644
--- a/sat_frontends/jp/output_xmlui.py
+++ b/libervia/frontends/jp/output_xmlui.py
@@ -19,8 +19,8 @@
"""Standard outputs"""
-from sat_frontends.jp.constants import Const as C
-from sat_frontends.jp import xmlui_manager
+from libervia.frontends.jp.constants import Const as C
+from libervia.frontends.jp import xmlui_manager
from libervia.backend.core.log import getLogger
log = getLogger(__name__)
diff --git a/sat_frontends/jp/xml_tools.py b/libervia/frontends/jp/xml_tools.py
similarity index 97%
rename from sat_frontends/jp/xml_tools.py
rename to libervia/frontends/jp/xml_tools.py
index 5db9a043..07954522 100644
--- a/sat_frontends/jp/xml_tools.py
+++ b/libervia/frontends/jp/xml_tools.py
@@ -18,7 +18,7 @@
# along with this program. If not, see .
from libervia.backend.core.i18n import _
-from sat_frontends.jp.constants import Const as C
+from libervia.frontends.jp.constants import Const as C
def etree_parse(cmd, raw_xml, reraise=False):
"""import lxml and parse raw XML
diff --git a/sat_frontends/jp/xmlui_manager.py b/libervia/frontends/jp/xmlui_manager.py
similarity index 99%
rename from sat_frontends/jp/xmlui_manager.py
rename to libervia/frontends/jp/xmlui_manager.py
index 4eb396ea..755293e2 100644
--- a/sat_frontends/jp/xmlui_manager.py
+++ b/libervia/frontends/jp/xmlui_manager.py
@@ -19,8 +19,8 @@
from functools import partial
from libervia.backend.core.log import getLogger
-from sat_frontends.tools import xmlui as xmlui_base
-from sat_frontends.jp.constants import Const as C
+from libervia.frontends.tools import xmlui as xmlui_base
+from libervia.frontends.jp.constants import Const as C
from libervia.backend.tools.common.ansi import ANSI as A
from libervia.backend.core.i18n import _
from libervia.backend.tools.common import data_format
diff --git a/sat_frontends/primitivus/__init__.py b/libervia/frontends/primitivus/__init__.py
similarity index 100%
rename from sat_frontends/primitivus/__init__.py
rename to libervia/frontends/primitivus/__init__.py
diff --git a/sat_frontends/primitivus/base.py b/libervia/frontends/primitivus/base.py
similarity index 97%
rename from sat_frontends/primitivus/base.py
rename to libervia/frontends/primitivus/base.py
index b517110e..9294f8f3 100644
--- a/sat_frontends/primitivus/base.py
+++ b/libervia/frontends/primitivus/base.py
@@ -18,7 +18,7 @@
from libervia.backend.core.i18n import _, D_
-from sat_frontends.primitivus.constants import Const as C
+from libervia.frontends.primitivus.constants import Const as C
from libervia.backend.core import log_config
log_config.sat_configure(C.LOG_BACKEND_STANDARD, C)
from libervia.backend.core import log as logging
@@ -27,20 +27,20 @@ from libervia.backend.tools import config as sat_config
import urwid
from urwid.util import is_wide_char
from urwid_satext import sat_widgets
-from sat_frontends.quick_frontend.quick_app import QuickApp
-from sat_frontends.quick_frontend import quick_utils
-from sat_frontends.quick_frontend import quick_chat
-from sat_frontends.primitivus.profile_manager import ProfileManager
-from sat_frontends.primitivus.contact_list import ContactList
-from sat_frontends.primitivus.chat import Chat
-from sat_frontends.primitivus import xmlui
-from sat_frontends.primitivus.progress import Progress
-from sat_frontends.primitivus.notify import Notify
-from sat_frontends.primitivus.keys import action_key_map as a_key
-from sat_frontends.primitivus import config
-from sat_frontends.tools.misc import InputHistory
+from libervia.frontends.quick_frontend.quick_app import QuickApp
+from libervia.frontends.quick_frontend import quick_utils
+from libervia.frontends.quick_frontend import quick_chat
+from libervia.frontends.primitivus.profile_manager import ProfileManager
+from libervia.frontends.primitivus.contact_list import ContactList
+from libervia.frontends.primitivus.chat import Chat
+from libervia.frontends.primitivus import xmlui
+from libervia.frontends.primitivus.progress import Progress
+from libervia.frontends.primitivus.notify import Notify
+from libervia.frontends.primitivus.keys import action_key_map as a_key
+from libervia.frontends.primitivus import config
+from libervia.frontends.tools.misc import InputHistory
from libervia.backend.tools.common import dynamic_import
-from sat_frontends.tools import jid
+from libervia.frontends.tools import jid
import signal
import sys
## bridge handling
@@ -283,7 +283,7 @@ class PrimitivusApp(QuickApp, InputHistory):
AVATARS_HANDLER = False
def __init__(self):
- bridge_module = dynamic_import.bridge(bridge_name, 'sat_frontends.bridge')
+ bridge_module = dynamic_import.bridge(bridge_name, 'libervia.frontends.bridge')
if bridge_module is None:
log.error(u"Can't import {} bridge".format(bridge_name))
sys.exit(3)
diff --git a/sat_frontends/primitivus/chat.py b/libervia/frontends/primitivus/chat.py
similarity index 98%
rename from sat_frontends/primitivus/chat.py
rename to libervia/frontends/primitivus/chat.py
index 2d1f42cf..28ee3376 100644
--- a/sat_frontends/primitivus/chat.py
+++ b/libervia/frontends/primitivus/chat.py
@@ -24,14 +24,14 @@ import urwid
from urwid_satext import sat_widgets
from libervia.backend.core.i18n import _
from libervia.backend.core import log as logging
-from sat_frontends.quick_frontend import quick_widgets
-from sat_frontends.quick_frontend import quick_chat
-from sat_frontends.quick_frontend import quick_games
-from sat_frontends.primitivus import game_tarot
-from sat_frontends.primitivus.constants import Const as C
-from sat_frontends.primitivus.keys import action_key_map as a_key
-from sat_frontends.primitivus.widget import PrimitivusWidget
-from sat_frontends.primitivus.contact_list import ContactList
+from libervia.frontends.quick_frontend import quick_widgets
+from libervia.frontends.quick_frontend import quick_chat
+from libervia.frontends.quick_frontend import quick_games
+from libervia.frontends.primitivus import game_tarot
+from libervia.frontends.primitivus.constants import Const as C
+from libervia.frontends.primitivus.keys import action_key_map as a_key
+from libervia.frontends.primitivus.widget import PrimitivusWidget
+from libervia.frontends.primitivus.contact_list import ContactList
log = logging.getLogger(__name__)
diff --git a/sat_frontends/primitivus/config.py b/libervia/frontends/primitivus/config.py
similarity index 93%
rename from sat_frontends/primitivus/config.py
rename to libervia/frontends/primitivus/config.py
index 34b9871e..08a86656 100644
--- a/sat_frontends/primitivus/config.py
+++ b/libervia/frontends/primitivus/config.py
@@ -19,8 +19,8 @@
"""This module manage configuration specific to Primitivus"""
-from sat_frontends.primitivus.constants import Const as C
-from sat_frontends.primitivus.keys import action_key_map
+from libervia.frontends.primitivus.constants import Const as C
+from libervia.frontends.primitivus.keys import action_key_map
import configparser
diff --git a/sat_frontends/primitivus/constants.py b/libervia/frontends/primitivus/constants.py
similarity index 98%
rename from sat_frontends/primitivus/constants.py
rename to libervia/frontends/primitivus/constants.py
index d982f504..2260df70 100644
--- a/sat_frontends/primitivus/constants.py
+++ b/libervia/frontends/primitivus/constants.py
@@ -16,7 +16,7 @@
# You should have received a copy of the GNU Affero General Public License
# along with this program. If not, see .
-from sat_frontends.quick_frontend import constants
+from libervia.frontends.quick_frontend import constants
class Const(constants.Const):
diff --git a/sat_frontends/primitivus/contact_list.py b/libervia/frontends/primitivus/contact_list.py
similarity index 96%
rename from sat_frontends/primitivus/contact_list.py
rename to libervia/frontends/primitivus/contact_list.py
index f0fca6cb..7f05b15b 100644
--- a/sat_frontends/primitivus/contact_list.py
+++ b/libervia/frontends/primitivus/contact_list.py
@@ -20,16 +20,16 @@
from libervia.backend.core.i18n import _
import urwid
from urwid_satext import sat_widgets
-from sat_frontends.quick_frontend.quick_contact_list import QuickContactList
-from sat_frontends.primitivus.status import StatusBar
-from sat_frontends.primitivus.constants import Const as C
-from sat_frontends.primitivus.keys import action_key_map as a_key
-from sat_frontends.primitivus.widget import PrimitivusWidget
-from sat_frontends.tools import jid
+from libervia.frontends.quick_frontend.quick_contact_list import QuickContactList
+from libervia.frontends.primitivus.status import StatusBar
+from libervia.frontends.primitivus.constants import Const as C
+from libervia.frontends.primitivus.keys import action_key_map as a_key
+from libervia.frontends.primitivus.widget import PrimitivusWidget
+from libervia.frontends.tools import jid
from libervia.backend.core import log as logging
log = logging.getLogger(__name__)
-from sat_frontends.quick_frontend import quick_widgets
+from libervia.frontends.quick_frontend import quick_widgets
class ContactList(PrimitivusWidget, QuickContactList):
@@ -107,7 +107,7 @@ class ContactList(PrimitivusWidget, QuickContactList):
def set_focus(self, text, select=False):
"""give focus to the first element that matches the given text. You can also
- pass in text a sat_frontends.tools.jid.JID (it's a subclass of unicode).
+ pass in text a libervia.frontends.tools.jid.JID (it's a subclass of unicode).
@param text: contact group name, contact or muc userhost, muc private dialog jid
@param select: if True, the element is also clicked
diff --git a/sat_frontends/primitivus/game_tarot.py b/libervia/frontends/primitivus/game_tarot.py
similarity index 98%
rename from sat_frontends/primitivus/game_tarot.py
rename to libervia/frontends/primitivus/game_tarot.py
index ccf2a419..2ddcd6c2 100644
--- a/sat_frontends/primitivus/game_tarot.py
+++ b/libervia/frontends/primitivus/game_tarot.py
@@ -20,10 +20,10 @@
from libervia.backend.core.i18n import _
import urwid
from urwid_satext import sat_widgets
-from sat_frontends.tools.games import TarotCard
-from sat_frontends.quick_frontend.quick_game_tarot import QuickTarotGame
-from sat_frontends.primitivus import xmlui
-from sat_frontends.primitivus.keys import action_key_map as a_key
+from libervia.frontends.tools.games import TarotCard
+from libervia.frontends.quick_frontend.quick_game_tarot import QuickTarotGame
+from libervia.frontends.primitivus import xmlui
+from libervia.frontends.primitivus.keys import action_key_map as a_key
class CardDisplayer(urwid.Text):
diff --git a/sat_frontends/primitivus/keys.py b/libervia/frontends/primitivus/keys.py
similarity index 100%
rename from sat_frontends/primitivus/keys.py
rename to libervia/frontends/primitivus/keys.py
diff --git a/sat_frontends/primitivus/notify.py b/libervia/frontends/primitivus/notify.py
similarity index 100%
rename from sat_frontends/primitivus/notify.py
rename to libervia/frontends/primitivus/notify.py
diff --git a/sat_frontends/primitivus/profile_manager.py b/libervia/frontends/primitivus/profile_manager.py
similarity index 97%
rename from sat_frontends/primitivus/profile_manager.py
rename to libervia/frontends/primitivus/profile_manager.py
index bc118e4b..d95499ba 100644
--- a/sat_frontends/primitivus/profile_manager.py
+++ b/libervia/frontends/primitivus/profile_manager.py
@@ -21,9 +21,9 @@ from libervia.backend.core.i18n import _
from libervia.backend.core import log as logging
log = logging.getLogger(__name__)
-from sat_frontends.quick_frontend.quick_profile_manager import QuickProfileManager
-from sat_frontends.primitivus.constants import Const as C
-from sat_frontends.primitivus.keys import action_key_map as a_key
+from libervia.frontends.quick_frontend.quick_profile_manager import QuickProfileManager
+from libervia.frontends.primitivus.constants import Const as C
+from libervia.frontends.primitivus.keys import action_key_map as a_key
from urwid_satext import sat_widgets
import urwid
diff --git a/sat_frontends/primitivus/progress.py b/libervia/frontends/primitivus/progress.py
similarity index 98%
rename from sat_frontends/primitivus/progress.py
rename to libervia/frontends/primitivus/progress.py
index ec5e5427..f14fcc46 100644
--- a/sat_frontends/primitivus/progress.py
+++ b/libervia/frontends/primitivus/progress.py
@@ -20,7 +20,7 @@
from libervia.backend.core.i18n import _
import urwid
from urwid_satext import sat_widgets
-from sat_frontends.quick_frontend import quick_widgets
+from libervia.frontends.quick_frontend import quick_widgets
class Progress(urwid.WidgetWrap, quick_widgets.QuickWidget):
diff --git a/sat_frontends/primitivus/status.py b/libervia/frontends/primitivus/status.py
similarity index 96%
rename from sat_frontends/primitivus/status.py
rename to libervia/frontends/primitivus/status.py
index 108210ac..efaa9d2d 100644
--- a/sat_frontends/primitivus/status.py
+++ b/libervia/frontends/primitivus/status.py
@@ -20,8 +20,8 @@
from libervia.backend.core.i18n import _
import urwid
from urwid_satext import sat_widgets
-from sat_frontends.quick_frontend.constants import Const as commonConst
-from sat_frontends.primitivus.constants import Const as C
+from libervia.frontends.quick_frontend.constants import Const as commonConst
+from libervia.frontends.primitivus.constants import Const as C
class StatusBar(urwid.Columns):
diff --git a/sat_frontends/primitivus/widget.py b/libervia/frontends/primitivus/widget.py
similarity index 97%
rename from sat_frontends/primitivus/widget.py
rename to libervia/frontends/primitivus/widget.py
index 44fa7e44..514aa2c4 100644
--- a/sat_frontends/primitivus/widget.py
+++ b/libervia/frontends/primitivus/widget.py
@@ -22,7 +22,7 @@ from libervia.backend.core import log as logging
log = logging.getLogger(__name__)
import urwid
from urwid_satext import sat_widgets
-from sat_frontends.primitivus.keys import action_key_map as a_key
+from libervia.frontends.primitivus.keys import action_key_map as a_key
class PrimitivusWidget(urwid.WidgetWrap):
diff --git a/sat_frontends/primitivus/xmlui.py b/libervia/frontends/primitivus/xmlui.py
similarity index 99%
rename from sat_frontends/primitivus/xmlui.py
rename to libervia/frontends/primitivus/xmlui.py
index 5b18e949..4851381f 100644
--- a/sat_frontends/primitivus/xmlui.py
+++ b/libervia/frontends/primitivus/xmlui.py
@@ -26,9 +26,9 @@ from urwid_satext import files_management
from libervia.backend.core.log import getLogger
log = getLogger(__name__)
-from sat_frontends.primitivus.constants import Const as C
-from sat_frontends.primitivus.widget import PrimitivusWidget
-from sat_frontends.tools import xmlui
+from libervia.frontends.primitivus.constants import Const as C
+from libervia.frontends.primitivus.widget import PrimitivusWidget
+from libervia.frontends.tools import xmlui
class PrimitivusEvents(object):
diff --git a/sat_frontends/quick_frontend/__init__.py b/libervia/frontends/quick_frontend/__init__.py
similarity index 100%
rename from sat_frontends/quick_frontend/__init__.py
rename to libervia/frontends/quick_frontend/__init__.py
diff --git a/sat_frontends/quick_frontend/constants.py b/libervia/frontends/quick_frontend/constants.py
similarity index 100%
rename from sat_frontends/quick_frontend/constants.py
rename to libervia/frontends/quick_frontend/constants.py
diff --git a/sat_frontends/quick_frontend/quick_app.py b/libervia/frontends/quick_frontend/quick_app.py
similarity index 99%
rename from sat_frontends/quick_frontend/quick_app.py
rename to libervia/frontends/quick_frontend/quick_app.py
index 9a23e7ae..efd4d088 100644
--- a/sat_frontends/quick_frontend/quick_app.py
+++ b/libervia/frontends/quick_frontend/quick_app.py
@@ -22,13 +22,13 @@ from libervia.backend.core import exceptions
from libervia.backend.tools import trigger
from libervia.backend.tools.common import data_format
-from sat_frontends.tools import jid
-from sat_frontends.quick_frontend import quick_widgets
-from sat_frontends.quick_frontend import quick_menus
-from sat_frontends.quick_frontend import quick_blog
-from sat_frontends.quick_frontend import quick_chat, quick_games
-from sat_frontends.quick_frontend import quick_contact_list
-from sat_frontends.quick_frontend.constants import Const as C
+from libervia.frontends.tools import jid
+from libervia.frontends.quick_frontend import quick_widgets
+from libervia.frontends.quick_frontend import quick_menus
+from libervia.frontends.quick_frontend import quick_blog
+from libervia.frontends.quick_frontend import quick_chat, quick_games
+from libervia.frontends.quick_frontend import quick_contact_list
+from libervia.frontends.quick_frontend.constants import Const as C
import sys
import time
diff --git a/sat_frontends/quick_frontend/quick_blog.py b/libervia/frontends/quick_frontend/quick_blog.py
similarity index 99%
rename from sat_frontends/quick_frontend/quick_blog.py
rename to libervia/frontends/quick_frontend/quick_blog.py
index 8da14aaa..1ef3076c 100644
--- a/sat_frontends/quick_frontend/quick_blog.py
+++ b/libervia/frontends/quick_frontend/quick_blog.py
@@ -23,9 +23,9 @@ from libervia.backend.core.log import getLogger
log = getLogger(__name__)
-from sat_frontends.quick_frontend.constants import Const as C
-from sat_frontends.quick_frontend import quick_widgets
-from sat_frontends.tools import jid
+from libervia.frontends.quick_frontend.constants import Const as C
+from libervia.frontends.quick_frontend import quick_widgets
+from libervia.frontends.tools import jid
from libervia.backend.tools.common import data_format
try:
diff --git a/sat_frontends/quick_frontend/quick_chat.py b/libervia/frontends/quick_frontend/quick_chat.py
similarity index 99%
rename from sat_frontends/quick_frontend/quick_chat.py
rename to libervia/frontends/quick_frontend/quick_chat.py
index 00e9c731..ea6e8e08 100644
--- a/sat_frontends/quick_frontend/quick_chat.py
+++ b/libervia/frontends/quick_frontend/quick_chat.py
@@ -20,10 +20,10 @@ from libervia.backend.core.i18n import _
from libervia.backend.core.log import getLogger
from libervia.backend.tools.common import data_format
from libervia.backend.core import exceptions
-from sat_frontends.quick_frontend import quick_widgets
-from sat_frontends.quick_frontend.constants import Const as C
+from libervia.frontends.quick_frontend import quick_widgets
+from libervia.frontends.quick_frontend.constants import Const as C
from collections import OrderedDict
-from sat_frontends.tools import jid
+from libervia.frontends.tools import jid
import time
diff --git a/sat_frontends/quick_frontend/quick_contact_list.py b/libervia/frontends/quick_frontend/quick_contact_list.py
similarity index 99%
rename from sat_frontends/quick_frontend/quick_contact_list.py
rename to libervia/frontends/quick_frontend/quick_contact_list.py
index 205714bd..86bd3c80 100644
--- a/sat_frontends/quick_frontend/quick_contact_list.py
+++ b/libervia/frontends/quick_frontend/quick_contact_list.py
@@ -22,9 +22,9 @@
from libervia.backend.core.i18n import _
from libervia.backend.core.log import getLogger
from libervia.backend.core import exceptions
-from sat_frontends.quick_frontend.quick_widgets import QuickWidget
-from sat_frontends.quick_frontend.constants import Const as C
-from sat_frontends.tools import jid
+from libervia.frontends.quick_frontend.quick_widgets import QuickWidget
+from libervia.frontends.quick_frontend.constants import Const as C
+from libervia.frontends.tools import jid
from collections import OrderedDict
log = getLogger(__name__)
diff --git a/sat_frontends/quick_frontend/quick_contact_management.py b/libervia/frontends/quick_frontend/quick_contact_management.py
similarity index 98%
rename from sat_frontends/quick_frontend/quick_contact_management.py
rename to libervia/frontends/quick_frontend/quick_contact_management.py
index ebe5f171..63314d94 100644
--- a/sat_frontends/quick_frontend/quick_contact_management.py
+++ b/libervia/frontends/quick_frontend/quick_contact_management.py
@@ -21,7 +21,7 @@ from libervia.backend.core.i18n import _
from libervia.backend.core.log import getLogger
log = getLogger(__name__)
-from sat_frontends.tools.jid import JID
+from libervia.frontends.tools.jid import JID
class QuickContactManagement(object):
diff --git a/sat_frontends/quick_frontend/quick_game_tarot.py b/libervia/frontends/quick_frontend/quick_game_tarot.py
similarity index 99%
rename from sat_frontends/quick_frontend/quick_game_tarot.py
rename to libervia/frontends/quick_frontend/quick_game_tarot.py
index 5fe61f4a..a33e5deb 100644
--- a/sat_frontends/quick_frontend/quick_game_tarot.py
+++ b/libervia/frontends/quick_frontend/quick_game_tarot.py
@@ -20,7 +20,7 @@
from libervia.backend.core.log import getLogger
log = getLogger(__name__)
-from sat_frontends.tools.jid import JID
+from libervia.frontends.tools.jid import JID
class QuickTarotGame(object):
diff --git a/sat_frontends/quick_frontend/quick_games.py b/libervia/frontends/quick_frontend/quick_games.py
similarity index 96%
rename from sat_frontends/quick_frontend/quick_games.py
rename to libervia/frontends/quick_frontend/quick_games.py
index 61f6ebad..00ab4983 100644
--- a/sat_frontends/quick_frontend/quick_games.py
+++ b/libervia/frontends/quick_frontend/quick_games.py
@@ -23,9 +23,9 @@ log = getLogger(__name__)
from libervia.backend.core.i18n import _
-from sat_frontends.tools import jid
-from sat_frontends.tools import games
-from sat_frontends.quick_frontend.constants import Const as C
+from libervia.frontends.tools import jid
+from libervia.frontends.tools import games
+from libervia.frontends.quick_frontend.constants import Const as C
from . import quick_chat
diff --git a/sat_frontends/quick_frontend/quick_list_manager.py b/libervia/frontends/quick_frontend/quick_list_manager.py
similarity index 100%
rename from sat_frontends/quick_frontend/quick_list_manager.py
rename to libervia/frontends/quick_frontend/quick_list_manager.py
diff --git a/sat_frontends/quick_frontend/quick_menus.py b/libervia/frontends/quick_frontend/quick_menus.py
similarity index 99%
rename from sat_frontends/quick_frontend/quick_menus.py
rename to libervia/frontends/quick_frontend/quick_menus.py
index fb250f2e..27bb4c8b 100644
--- a/sat_frontends/quick_frontend/quick_menus.py
+++ b/libervia/frontends/quick_frontend/quick_menus.py
@@ -30,7 +30,7 @@ from libervia.backend.core.log import getLogger
from libervia.backend.core.i18n import _, language_switch
log = getLogger(__name__)
-from sat_frontends.quick_frontend.constants import Const as C
+from libervia.frontends.quick_frontend.constants import Const as C
from collections import OrderedDict
diff --git a/sat_frontends/quick_frontend/quick_profile_manager.py b/libervia/frontends/quick_frontend/quick_profile_manager.py
similarity index 99%
rename from sat_frontends/quick_frontend/quick_profile_manager.py
rename to libervia/frontends/quick_frontend/quick_profile_manager.py
index 821bbf0c..2367ad40 100644
--- a/sat_frontends/quick_frontend/quick_profile_manager.py
+++ b/libervia/frontends/quick_frontend/quick_profile_manager.py
@@ -21,7 +21,7 @@ from libervia.backend.core.i18n import _
from libervia.backend.core import log as logging
log = logging.getLogger(__name__)
-from sat_frontends.primitivus.constants import Const as C
+from libervia.frontends.primitivus.constants import Const as C
class ProfileRecord(object):
diff --git a/sat_frontends/quick_frontend/quick_utils.py b/libervia/frontends/quick_frontend/quick_utils.py
similarity index 100%
rename from sat_frontends/quick_frontend/quick_utils.py
rename to libervia/frontends/quick_frontend/quick_utils.py
diff --git a/sat_frontends/quick_frontend/quick_widgets.py b/libervia/frontends/quick_frontend/quick_widgets.py
similarity index 99%
rename from sat_frontends/quick_frontend/quick_widgets.py
rename to libervia/frontends/quick_frontend/quick_widgets.py
index 56cf7c11..7706cdbd 100644
--- a/sat_frontends/quick_frontend/quick_widgets.py
+++ b/libervia/frontends/quick_frontend/quick_widgets.py
@@ -21,7 +21,7 @@ from libervia.backend.core.log import getLogger
log = getLogger(__name__)
from libervia.backend.core import exceptions
-from sat_frontends.quick_frontend.constants import Const as C
+from libervia.frontends.quick_frontend.constants import Const as C
classes_map = {}
diff --git a/sat_frontends/tools/__init__.py b/libervia/frontends/tools/__init__.py
similarity index 100%
rename from sat_frontends/tools/__init__.py
rename to libervia/frontends/tools/__init__.py
diff --git a/sat_frontends/tools/composition.py b/libervia/frontends/tools/composition.py
similarity index 100%
rename from sat_frontends/tools/composition.py
rename to libervia/frontends/tools/composition.py
diff --git a/sat_frontends/tools/css_color.py b/libervia/frontends/tools/css_color.py
similarity index 100%
rename from sat_frontends/tools/css_color.py
rename to libervia/frontends/tools/css_color.py
diff --git a/sat_frontends/tools/games.py b/libervia/frontends/tools/games.py
similarity index 100%
rename from sat_frontends/tools/games.py
rename to libervia/frontends/tools/games.py
diff --git a/sat_frontends/tools/host_listener.py b/libervia/frontends/tools/host_listener.py
similarity index 100%
rename from sat_frontends/tools/host_listener.py
rename to libervia/frontends/tools/host_listener.py
diff --git a/sat_frontends/tools/jid.py b/libervia/frontends/tools/jid.py
similarity index 100%
rename from sat_frontends/tools/jid.py
rename to libervia/frontends/tools/jid.py
diff --git a/sat_frontends/tools/misc.py b/libervia/frontends/tools/misc.py
similarity index 100%
rename from sat_frontends/tools/misc.py
rename to libervia/frontends/tools/misc.py
diff --git a/sat_frontends/tools/strings.py b/libervia/frontends/tools/strings.py
similarity index 100%
rename from sat_frontends/tools/strings.py
rename to libervia/frontends/tools/strings.py
diff --git a/sat_frontends/tools/xmltools.py b/libervia/frontends/tools/xmltools.py
similarity index 100%
rename from sat_frontends/tools/xmltools.py
rename to libervia/frontends/tools/xmltools.py
diff --git a/sat_frontends/tools/xmlui.py b/libervia/frontends/tools/xmlui.py
similarity index 99%
rename from sat_frontends/tools/xmlui.py
rename to libervia/frontends/tools/xmlui.py
index d4c4e1a7..50ddfaf7 100644
--- a/sat_frontends/tools/xmlui.py
+++ b/libervia/frontends/tools/xmlui.py
@@ -21,7 +21,7 @@ from libervia.backend.core.i18n import _
from libervia.backend.core.log import getLogger
log = getLogger(__name__)
-from sat_frontends.quick_frontend.constants import Const as C
+from libervia.frontends.quick_frontend.constants import Const as C
from libervia.backend.core import exceptions
diff --git a/setup.py b/setup.py
index 90f885e4..eb33d149 100644
--- a/setup.py
+++ b/setup.py
@@ -132,13 +132,13 @@ setup(
"sat = libervia.backend.core.launcher:Launcher.run",
# CLI + aliases
- "libervia-cli = sat_frontends.jp.base:LiberviaCli.run",
- "li = sat_frontends.jp.base:LiberviaCli.run",
- "jp = sat_frontends.jp.base:LiberviaCli.run",
+ "libervia-cli = libervia.frontends.jp.base:LiberviaCli.run",
+ "li = libervia.frontends.jp.base:LiberviaCli.run",
+ "jp = libervia.frontends.jp.base:LiberviaCli.run",
# TUI + alias
- "libervia-tui = sat_frontends.primitivus.base:PrimitivusApp.run",
- "primitivus = sat_frontends.primitivus.base:PrimitivusApp.run",
+ "libervia-tui = libervia.frontends.primitivus.base:PrimitivusApp.run",
+ "primitivus = libervia.frontends.primitivus.base:PrimitivusApp.run",
],
},
zip_safe=False,