diff options
| -rwxr-xr-x | combine.sh | 7 | ||||
| -rw-r--r-- | slack.py | 21 | ||||
| -rw-r--r-- | slack/http.py | 2 | ||||
| -rw-r--r-- | slack/main.py | 20 |
4 files changed, 29 insertions, 21 deletions
diff --git a/combine.sh b/combine.sh new file mode 100755 index 0000000..688d3c1 --- /dev/null +++ b/combine.sh @@ -0,0 +1,7 @@ +#!/bin/bash + +contents="$(cat slack/globals.py slack/log.py slack/util.py slack/task.py slack/http.py slack/api.py slack/config.py slack/main.py slack.py | grep -Ev '^from (\.|slack)' | sed 's/G\.//')" + +echo "$contents" | grep '^from __future__' | sort -u > combined.py +echo "$contents" | grep -v '^from __future__' | grep -E '^(import|from)' | sort -u >> combined.py +echo "$contents" | grep -Ev '^(import|from)' >> combined.py @@ -1,5 +1,3 @@ -from __future__ import annotations - import os import sys @@ -7,7 +5,8 @@ import weechat sys.path.append(os.path.dirname(os.path.realpath(__file__))) from slack import globals as G # pylint: disable=wrong-import-position -from slack.config import SlackConfig, SlackWorkspace +from slack.config import SlackConfig +from slack.main import init # 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 @@ -19,22 +18,6 @@ def shutdown_cb(): return weechat.WEECHAT_RC_OK -async def init(): - print(G.workspaces) - if "wee-slack-test" not in G.workspaces: - G.workspaces["wee-slack-test"] = SlackWorkspace("wee-slack-test") - G.workspaces[ - "wee-slack-test" - ].config.api_token.value = weechat.config_get_plugin("api_token") - G.workspaces[ - "wee-slack-test" - ].config.api_cookies.value = weechat.config_get_plugin("api_cookie") - workspace = G.workspaces["wee-slack-test"] - print(workspace) - print(workspace.config.slack_timeout.value) - print(G.config.color.reaction_suffix.value) - - if __name__ == "__main__": if weechat.register( G.SCRIPT_NAME, diff --git a/slack/http.py b/slack/http.py index ba30339..24681a0 100644 --- a/slack/http.py +++ b/slack/http.py @@ -1,5 +1,3 @@ -from __future__ import annotations - import os import resource from io import StringIO diff --git a/slack/main.py b/slack/main.py new file mode 100644 index 0000000..667e108 --- /dev/null +++ b/slack/main.py @@ -0,0 +1,20 @@ +import weechat + +from slack import globals as G +from slack.config import SlackWorkspace + + +async def init(): + print(G.workspaces) + if "wee-slack-test" not in G.workspaces: + G.workspaces["wee-slack-test"] = SlackWorkspace("wee-slack-test") + G.workspaces[ + "wee-slack-test" + ].config.api_token.value = weechat.config_get_plugin("api_token") + G.workspaces[ + "wee-slack-test" + ].config.api_cookies.value = weechat.config_get_plugin("api_cookie") + workspace = G.workspaces["wee-slack-test"] + print(workspace) + print(workspace.config.slack_timeout.value) + print(G.config.color.reaction_suffix.value) |