From: Muhammad Rizki <[email protected]>
To: Ammar Faizi <[email protected]>
Cc: Muhammad Rizki <[email protected]>,
GNU/Weeb Mailing List <[email protected]>
Subject: [PATCH v2 14/18] Remove prepare patch and clean up patch
Date: Tue, 19 Jul 2022 07:17:40 +0700 [thread overview]
Message-ID: <[email protected]> (raw)
In-Reply-To: <[email protected]>
From: Muhammad Rizki <[email protected]>
These functions already moved to scaper/utils.py, so I decide to remove
it in scaper/bot.py and change some of the code that required to change.
Signed-off-by: Muhammad Rizki <[email protected]>
---
daemon/scraper/bot.py | 39 ++-------------------------------------
1 file changed, 2 insertions(+), 37 deletions(-)
diff --git a/daemon/scraper/bot.py b/daemon/scraper/bot.py
index 33a9eaa..1abfa98 100644
--- a/daemon/scraper/bot.py
+++ b/daemon/scraper/bot.py
@@ -160,50 +160,15 @@ class Bot():
async def __send_patch_msg(self, mail, tg_chat_id, reply_to, text, url):
print("[__send_patch_msg]")
- tmp, doc, caption, url = Bot.prepare_send_patch(mail, text, url)
+ tmp, doc, caption, url = utils.prepare_send_patch(mail, text, url)
ret = await self.__handle_telegram_floodwait(
self.client.send_patch_email,
*[tg_chat_id, doc, caption, reply_to, url]
)
- Bot.clean_up_after_send_patch(tmp)
+ utils.clean_up_after_send_patch(tmp)
return ret
- @staticmethod
- def prepare_send_patch(mail, text, url):
- tmp = utils.gen_temp(url)
- fnm = str(mail.get("subject"))
- sch = re.search(utils.PATCH_PATTERN, fnm, re.IGNORECASE)
-
- nr_patch = sch.group(1)
- if not nr_patch:
- nr_patch = 1
- else:
- nr_patch = int(nr_patch)
-
- num = "%04d" % nr_patch
- fnm = slugify(sch.group(3)).replace("_", "-")
- file = f"{tmp}/{num}-{fnm}.patch"
- cap = text.split("\n\n")[0]
-
- with open(file, "wb") as f:
- f.write(bytes(text, encoding="utf8"))
-
- caption = (
- "#patch #ml\n" +
- cap.rstrip()
- .replace("<", "<")
- .replace(">",">")
- .replace("�"," ")
- )
- return tmp, file, caption, url
-
-
- @staticmethod
- def clean_up_after_send_patch(tmp):
- shutil.rmtree(tmp)
-
-
async def __send_text_msg(self, *args):
return await self.__handle_telegram_floodwait(
self.client.send_text_email,
--
Muhammad Rizki
next prev parent reply other threads:[~2022-07-19 0:18 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-07-19 0:17 [PATCH v2 00/18] Plan to redesign codes Muhammad Rizki
2022-07-19 0:17 ` [PATCH v2 01/18] Fix __send_patch_msg function parameter Muhammad Rizki
2022-07-19 0:17 ` [PATCH v2 02/18] Fix import problem Muhammad Rizki
2022-07-19 0:17 ` [PATCH v2 03/18] Add default temporary directory Muhammad Rizki
2022-07-19 0:17 ` [PATCH v2 04/18] Move the Telegram bot session into the storage directory Muhammad Rizki
2022-07-19 0:17 ` [PATCH v2 05/18] daemon: Fix raw lore URL on the inline keyboard button Muhammad Rizki
2022-07-19 0:17 ` [PATCH v2 06/18] daemon: Use traceback.format_exc() to get the error detail Muhammad Rizki
2022-07-19 0:17 ` [PATCH v2 07/18] Re-design send email message to Telegram Muhammad Rizki
2022-07-19 0:17 ` [PATCH v2 08/18] Move ____send_patch_msg Muhammad Rizki
2022-07-19 0:17 ` [PATCH v2 09/18] Move prepare for patch and clean up patch functions Muhammad Rizki
2022-07-19 0:17 ` [PATCH v2 10/18] Create fix_utf8_chars function Muhammad Rizki
2022-07-19 8:20 ` Ammar Faizi
2022-07-19 0:17 ` [PATCH v2 11/18] Recode some codes Muhammad Rizki
2022-07-19 0:17 ` [PATCH v2 12/18] Fix indentation issue Muhammad Rizki
2022-07-19 8:15 ` Ammar Faizi
2022-07-19 0:17 ` [PATCH v2 13/18] Remove whitespace Muhammad Rizki
2022-07-19 0:17 ` Muhammad Rizki [this message]
2022-07-19 0:17 ` [PATCH v2 15/18] daemon: Remove unused imports Muhammad Rizki
2022-07-19 0:17 ` [PATCH v2 16/18] daemon: Add @handle_flood decorator and remove some functions Muhammad Rizki
2022-07-19 0:17 ` [PATCH v2 17/18] daemon: Remove __send_patch_msg() Muhammad Rizki
2022-07-19 0:17 ` [PATCH v2 18/18] daemon: Remove unused imports Muhammad Rizki
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
[email protected] \
[email protected] \
[email protected] \
[email protected] \
[email protected] \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox