From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on gnuweeb.org X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_ENVFROM_END_DIGIT,FREEMAIL_FROM, RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,SPF_HELO_NONE, SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from mail-pf1-f170.google.com (mail-pf1-f170.google.com [209.85.210.170]) by gnuweeb.org (Postfix) with ESMTPS id D32C27E328 for ; Mon, 18 Jul 2022 11:20:59 +0000 (UTC) Authentication-Results: gnuweeb.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20210112 header.b=P50575NO; dkim-atps=neutral Received: by mail-pf1-f170.google.com with SMTP id b9so10298213pfp.10 for ; Mon, 18 Jul 2022 04:20:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=+jdjG6C0+3OPy46RZYp/LkHwut3y7EQQThDJWIc1PbQ=; b=P50575NOHvuRdTJki/wemiGLxfHVErSY9bRm3vq7eFKV5/yp2Au+gPt1e8PFIeVfOP 7MnOn/m4iF2Ya3MnfgixWAOPb6yKNldKLq9JEaUXR6BhwUaOSCVhsvvexG9Sit1bWtjS QhbDMxJOsaZyGHcEAvRytFwJP4M7ZVWKVsWuQCN6oi+i3Oq6Aw6ux8YNROyv1x8QWC08 1MbfK+j3UuQttTuMlohJDMEaG+jDGuw6D7zP9sCLGtCbn3bJZ47JyYx/wlCGqEQT5rK5 P9GxvpeIG6ETabBE01xxXRVY4UR/rZ1sGjLaSvYgY8EsWvi7XxMkPZtuRodWjxhO0052 3fZw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=+jdjG6C0+3OPy46RZYp/LkHwut3y7EQQThDJWIc1PbQ=; b=5dgBbFH0Vygv+9kpEXsirteQIrEMTsMymuwm/I1LY8esesYB7A7e5stRCQi5iZ6RWx zl8ynVWAaA+zYxAGxv36rIaaqsMdoGQlMGDqYtxynK6GdaNByutHV0cMV/KUuRcFM/Wh fsRsdJHlHdZ1Y0YeEJQChFB0h7FWcy0srY5MC9VbCTgPEUtoP2wXfQf95XLF4e8/xMaP wO54l8Nm8N9ELpxZRViEJJUf8UgWAZsUBYm1hFdBIKOno+xnkI15MNjWu2142zEA6yZ6 MrF8ApTFqj2eaD5+gDDY/0fHhGJ5dqZwgXutA/6bh6025MA1KF4oQsk1cyzdlhjPVDF9 tcEQ== X-Gm-Message-State: AJIora8rqO22l/7h2kyaLBbcglUPE4aJCK7Fdl6bIwWf4b8effQHlPq0 1AfYxAGlZ4vYIdkK6m8q/V7pdBF5MU3gRA== X-Google-Smtp-Source: AGRyM1uB7aLcgklEYs39WE3cR82LmZxSv3ehLwGhc0El296M3AgCTXtXg113V2CcQEb2/wgqo23z6g== X-Received: by 2002:a62:1509:0:b0:528:98a1:1f7e with SMTP id 9-20020a621509000000b0052898a11f7emr28116725pfv.11.1658143259481; Mon, 18 Jul 2022 04:20:59 -0700 (PDT) Received: from localhost.localdomain ([101.128.125.134]) by smtp.gmail.com with ESMTPSA id z14-20020aa7948e000000b0052ad6d627a6sm8991072pfk.166.2022.07.18.04.20.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 18 Jul 2022 04:20:59 -0700 (PDT) From: Muhammad Rizki To: Ammar Faizi Cc: Muhammad Rizki , GNU/Weeb Mailing List Subject: [PATCH v1 10/11] Create fix_utf8_chars function Date: Mon, 18 Jul 2022 18:20:06 +0700 Message-Id: <20220718112007.792-11-riskimuhammmad1@gmail.com> X-Mailer: git-send-email 2.34.1.windows.1 In-Reply-To: <20220718112007.792-1-riskimuhammmad1@gmail.com> References: <20220718112007.792-1-riskimuhammmad1@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit List-Id: Some of the codes are repeated, so I create this function to make it cleaner. Signed-off-by: Muhammad Rizki --- daemon/scraper/utils.py | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/daemon/scraper/utils.py b/daemon/scraper/utils.py index 5335fe2..3f0d254 100644 --- a/daemon/scraper/utils.py +++ b/daemon/scraper/utils.py @@ -183,10 +183,7 @@ def create_template(thread: Message, to=None, cc=None): ret = ret[:4000] + "..." ret = ( - ret.rstrip() - .replace("<", "<") - .replace(">",">") - .replace("�"," ") + fix_utf8_char(ret) ) + "\n------------------------------------------------------------------------" return ret, files, is_patch @@ -213,10 +210,7 @@ def prepare_send_patch(mail, text, url): caption = ( "#patch #ml\n" + - cap.rstrip() - .replace("<", "<") - .replace(">",">") - .replace("�"," ") + fix_utf8_char(cap) ) return tmp, file, caption, url @@ -225,6 +219,15 @@ def clean_up_after_send_patch(tmp): shutil.rmtree(tmp) +def fix_utf8_char(text: str): + return ( + text.rstrip() + .replace("<", "<") + .replace(">",">") + .replace("�"," ") + ) + + EMAIL_MSG_ID_PATTERN = r"<([^\<\>]+)>" def extract_email_msg_id(msg_id): ret = re.search(EMAIL_MSG_ID_PATTERN, msg_id) -- Muhammad Rizki