From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: AS22989 209.51.188.0/24 X-Spam-Status: No, score=-4.1 required=3.0 tests=AWL,BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI,SPF_HELO_PASS,SPF_PASS, T_SCC_BODY_TEXT_LINE shortcircuit=no autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dcvr.yhbt.net (Postfix) with ESMTPS id 5C2521F545 for ; Mon, 3 Jul 2023 01:11:39 +0000 (UTC) Authentication-Results: dcvr.yhbt.net; dkim=pass (1024-bit key; unprotected) header.d=80x24.org header.i=@80x24.org header.a=rsa-sha256 header.s=selector1 header.b=JusFZwrK; dkim-atps=neutral Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qG86D-0003rx-NS; Sun, 02 Jul 2023 21:11:29 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qG86C-0003rk-Q7 for dtas-all@nongnu.org; Sun, 02 Jul 2023 21:11:28 -0400 Received: from dcvr.yhbt.net ([173.255.242.215]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qG86B-0002W5-Ae for dtas-all@nongnu.org; Sun, 02 Jul 2023 21:11:28 -0400 Received: from localhost (dcvr.yhbt.net [127.0.0.1]) by dcvr.yhbt.net (Postfix) with ESMTP id 5AB9A1F545 for ; Mon, 3 Jul 2023 01:11:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=80x24.org; s=selector1; t=1688346686; bh=OdqNnLYfp7Ygr93XWeDfNcl6YS4U4iaOsq8Wn6exdBs=; h=From:To:Subject:Date:From; b=JusFZwrKOD3SYsQzVgkvAwLN2+SwDlJLz/eixQavOL4NV1cs59ljPky59xazc3v/3 0gyo055dNJw95aYCUYLIPDp4SEVsLIX6GMXHG6upBZLqFYni0irnCnLpxhq4RshzFs +IXPXLls/KNasOMLFMU0XxrqP8I9tYzr36zlANGU= From: Eric Wong To: dtas-all@nongnu.org Subject: [PATCH] dtas-tl: reto: force ASCII-8BIT regexp match Date: Mon, 3 Jul 2023 01:11:26 +0000 Message-ID: <20230703011126.955068-1-e@80x24.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=173.255.242.215; envelope-from=e@80x24.org; helo=dcvr.yhbt.net X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: dtas-all@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: duct tape audio suite List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dtas-all-bounces+e=80x24.org@nongnu.org Sender: dtas-all-bounces+e=80x24.org@nongnu.org POSIX path names aren't guaranteed to be UTF-8, and dtas should be capable of playing non-UTF-8 path names from read-only legacy FSes. --- bin/dtas-tl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bin/dtas-tl b/bin/dtas-tl index 66e0612..c7f4c83 100755 --- a/bin/dtas-tl +++ b/bin/dtas-tl @@ -188,9 +188,9 @@ def add_after(c, argv, last_id) re = ARGV[1] time = ARGV[2] re = Regexp.quote(re) if fixed - re = ignorecase ? %r{#{re}}i : %r{#{re}} + re = ignorecase ? %r{#{re}}in : %r{#{re}}n each_track(c) do |line| - line.sub!(/\A(\d+)=/, '') + line.sub!(/\A(\d+)=/n, '') or abort "unexpected line=#{line.inspect}\n" track_id = $1 if re =~ line req = %W(tl goto #{track_id})