1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
|
See PR pending https://github.com/multani/sonata/pull/167.patch
tagedit: fix import w/ >=tagpy-2022.1
tagpy stopped exporting StringType from tagpy in 2022.1
use _tagpy.StringType which works w/ older versions too
remove an outdated version check that relies on the old import too
--- a/sonata/tagedit.py
+++ b/sonata/tagedit.py
@@ -117,13 +117,7 @@ def on_tags_edit(self, files, temp_mpdpaths, music_dir):
return
# Set default tag encoding to utf8.. fixes some reported bugs.
import tagpy.id3v2 as id3v2
- id3v2.FrameFactory.instance().setDefaultTextEncoding(tagpy.StringType.UTF8)
-
- # Make sure tagpy is at least 0.91
- if hasattr(tagpy.Tag.title, '__call__'):
- ui.show_msg(self.window, _("Tagpy version < 0.91. Please upgrade to a newer version, tag editing support disabled."), _("Edit Tags"), 'editTagsError', Gtk.ButtonsType.CLOSE, response_cb=ui.dialog_destroy)
- ui.change_cursor(None)
- return
+ id3v2.FrameFactory.instance().setDefaultTextEncoding(id3v2._tagpy.StringType.UTF8)
if not os.path.isdir(music_dir):
ui.show_msg(self.window, _("The path %s does not exist. Please specify a valid music directory in preferences.") % music_dir, _("Edit Tags"), 'editTagsError', Gtk.ButtonsType.CLOSE, response_cb=ui.dialog_destroy)
|