aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--main.py35
-rw-r--r--slack/__init__.py11
-rw-r--r--slack/init.py26
3 files changed, 36 insertions, 36 deletions
diff --git a/main.py b/main.py
deleted file mode 100644
index 94f01b3..0000000
--- a/main.py
+++ /dev/null
@@ -1,35 +0,0 @@
-import os
-import sys
-
-import weechat
-
-sys.path.append(os.path.dirname(os.path.realpath(__file__)))
-from slack.config import SlackConfig
-from slack.init import init # pylint: disable=wrong-import-position
-from slack.shared import shared # pylint: disable=wrong-import-position
-from slack.task import create_task # pylint: disable=wrong-import-position
-from slack.util import get_callback_name # pylint: disable=wrong-import-position
-
-shared.weechat_callbacks = globals()
-
-
-def shutdown_cb():
- weechat.config_write(shared.config.weechat_config.pointer)
- return weechat.WEECHAT_RC_OK
-
-
-if __name__ == "__main__":
- if weechat.register(
- shared.SCRIPT_NAME,
- shared.SCRIPT_AUTHOR,
- shared.SCRIPT_VERSION,
- shared.SCRIPT_LICENSE,
- shared.SCRIPT_DESC,
- get_callback_name(shutdown_cb),
- "",
- ):
- shared.weechat_version = int(weechat.info_get("version_number", "") or 0)
- shared.workspaces = {}
- shared.config = SlackConfig()
- shared.config.config_read()
- create_task(init(), final=True)
diff --git a/slack/__init__.py b/slack/__init__.py
index e69de29..431484a 100644
--- a/slack/__init__.py
+++ b/slack/__init__.py
@@ -0,0 +1,11 @@
+import os
+import sys
+
+sys.path.append(os.path.dirname(os.path.realpath(__file__)))
+from slack.init import main # pylint: disable=wrong-import-position
+from slack.shared import shared # pylint: disable=wrong-import-position
+
+shared.weechat_callbacks = globals()
+
+if __name__ == "__main__":
+ main()
diff --git a/slack/init.py b/slack/init.py
index 27a3a40..38efa6e 100644
--- a/slack/init.py
+++ b/slack/init.py
@@ -1,7 +1,14 @@
import weechat
-from slack.config import SlackWorkspace
+from slack.config import SlackConfig, SlackWorkspace
from slack.shared import shared
+from slack.task import create_task
+from slack.util import get_callback_name
+
+
+def shutdown_cb():
+ weechat.config_write(shared.config.weechat_config.pointer)
+ return weechat.WEECHAT_RC_OK
async def init():
@@ -18,3 +25,20 @@ async def init():
print(workspace)
print(workspace.config.slack_timeout.value)
print(shared.config.color.reaction_suffix.value)
+
+
+def main():
+ if weechat.register(
+ shared.SCRIPT_NAME,
+ shared.SCRIPT_AUTHOR,
+ shared.SCRIPT_VERSION,
+ shared.SCRIPT_LICENSE,
+ shared.SCRIPT_DESC,
+ get_callback_name(shutdown_cb),
+ "",
+ ):
+ shared.weechat_version = int(weechat.info_get("version_number", "") or 0)
+ shared.workspaces = {}
+ shared.config = SlackConfig()
+ shared.config.config_read()
+ create_task(init(), final=True)