From e0622651bf4ed80fb631cb56551200402a6c48e2 Mon Sep 17 00:00:00 2001 From: Pikari0 Date: Tue, 15 Jul 2025 18:41:56 +0200 Subject: [PATCH] Change encoding to ascii and better renaming --- ipod-shuffle-4g.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/ipod-shuffle-4g.py b/ipod-shuffle-4g.py index 8225a56..013102b 100755 --- a/ipod-shuffle-4g.py +++ b/ipod-shuffle-4g.py @@ -32,7 +32,8 @@ def make_dir_if_absent(path): def raises_unicode_error(str): try: - str.encode('latin-1') + + str.encode('ascii') return False except (UnicodeEncodeError, UnicodeDecodeError): return True @@ -686,14 +687,15 @@ def check_unicode(path): ret_flag = True if raises_unicode_error(item): src = os.path.join(path, item) - dest = os.path.join(path, hash_error_unicode(item)) + os.path.splitext(item)[1].lower() + new_name = os.path.splitext(item)[0].encode("ascii","ignore").decode("ascii") + dest = os.path.join(path, new_name) + os.path.splitext(item)[1].lower() print('Renaming %s -> %s' % (src, dest)) os.rename(src, dest) else: ret_flag = (check_unicode(os.path.join(path, item)) or ret_flag) if ret_flag and raises_unicode_error(item): src = os.path.join(path, item) - new_name = hash_error_unicode(item) + new_name = item.encode("ascii","ignore").decode("ascii") dest = os.path.join(path, new_name) print('Renaming %s -> %s' % (src, dest)) os.rename(src, dest)