@@ -416,7 +416,7 @@ * TODO Add MusicBrainz support It would be helpful to have external metadata support beyond FreeDB, since FreeDB is very primitive. -** TODO Ensure that MusicBrainz is interchangeable with FreeDB/XMCD +** DONE Ensure that MusicBrainz is interchangeable with FreeDB/XMCD *** DONE Unify track2xmcd/track2mb, cd2xmcd/cd2mb Based on preliminary testing, MusicBrainz's output is better than FreeDB's but its album coverage is not as broad. @@ -430,7 +430,7 @@ Therefore, editxmcd should be extended with additional fields to handle XML backend data if necessary. *** DONE Handle multiple Release entries with single Disc ID -*** TODO Allow MusicBrainz XML output for new editxmcd files +*** DONE Allow MusicBrainz XML output for new editxmcd files FreeDB output should also be an option, however. ** DONE Add MusicBrainz protocol/format documentation ** DONE Add MusicBrainz-specific unit tests TODO @@ -310,10 +310,13 @@ class EditXMCD: metadata_update = xmcd_update - def new(self,caller): - self.xml.get_widget("selecttracks").run() + def new_xmcd(self,caller): + self.xml.get_widget("select_xmcd_tracks").run() - def from_tracks(self,dialog,signal): + def new_mbxml(self,caller): + self.xml.get_widget("select_mbxml_tracks").run() + + def from_xmcd_tracks(self,dialog,signal): dialog.hide() if (signal == -5): self.read_xmcd(audiotools.XMCD.from_files( @@ -322,6 +325,15 @@ class EditXMCD: self.filename = None self.set_title() + def from_mbxml_tracks(self,dialog,signal): + dialog.hide() + if (signal == -5): + self.read_mbxml(audiotools.MusicBrainzReleaseXML.from_files( + audiotools.open_files(dialog.get_filenames()))) + self.edited = False + self.filename = None + self.set_title() + def save(self,caller): if (self.xmcd is None): return @@ -645,8 +657,10 @@ if (__name__ == '__main__'): xml.signal_connect("on_paste1_activate",editxmcd.paste) xml.signal_connect("on_delete1_activate",editxmcd.clear) - xml.signal_connect("on_new1_activate",editxmcd.new) - xml.signal_connect("tracks_selected",editxmcd.from_tracks) + xml.signal_connect("on_new1_activate",editxmcd.new_xmcd) + xml.signal_connect("on_new2_activate",editxmcd.new_mbxml) + xml.signal_connect("xmcd_tracks_selected",editxmcd.from_xmcd_tracks) + xml.signal_connect("mbxml_tracks_selected",editxmcd.from_mbxml_tracks) xml.signal_connect("on_save_as1_activate",editxmcd.saveas) xml.signal_connect("save_file",editxmcd.save) editxmcd @@ -43,11 +43,47 @@ <widget class="GtkMenu" id="menuitem1_menu"> <child> - <widget class="GtkImageMenuItem" id="new"> + <widget class="GtkImageMenuItem" id="new-submenu"> <property name="visible">True</property> - <property name="label">gtk-new</property> - <property name="use_stock">True</property> - <signal name="activate" handler="on_new1_activate" last_modification_time="Wed, 31 Dec 2008 19:35:25 GMT"/> + <property name="label" translatable="yes">_New</property> + <property name="use_underline">True</property> + + <child internal-child="image"> + <widget class="GtkImage" id="image9"> + <property name="visible">True</property> + <property name="stock">gtk-new</property> + <property name="icon_size">1</property> + <property name="xalign">0.5</property> + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> + </widget> + </child> + + <child> + <widget class="GtkMenu" id="new-submenu_menu"> + + <child> + <widget class="GtkMenuItem" id="new-xmcd"> + <property name="visible">True</property> + <property name="label" translatable="yes">XMCD File</property> + <property name="use_underline">True</property> + <signal name="activate" handler="on_new1_activate" last_modification_time="Mon, 21 Sep 2009 15:53:23 GMT"/> + <accelerator key="N" modifiers="GDK_CONTROL_MASK" signal="activate"/> + </widget> + </child> + + <child> + <widget class="GtkMenuItem" id="new-mbxml"> + <property name="visible">True</property> + <property name="label" translatable="yes">MusicBrainz File</property> + <property name="use_underline">True</property> + <signal name="activate" handler="on_new2_activate" last_modification_time="Mon, 21 Sep 2009 15:53:23 GMT"/> + <accelerator key="N" modifiers="GDK_CONTROL_MASK | GDK_SHIFT_MASK" signal="activate"/> + </widget> + </child> + </widget> + </child> </widget> </child> @@ -115,7 +151,7 @@ <accelerator key="Z" modifiers="GDK_CONTROL_MASK" signal="activate"/> <child internal-child="image"> - <widget class="GtkImage" id="image4"> + <widget class="GtkImage" id="image10"> <property name="visible">True</property> <property name="stock">gtk-undo</property> <property name="icon_size">1</property> @@ -137,7 +173,7 @@ <accelerator key="Z" modifiers="GDK_CONTROL_MASK | GDK_SHIFT_MASK" signal="activate"/> <child internal-child="image"> - <widget class="GtkImage" id="image5"> + <widget class="GtkImage" id="image11"> <property name="visible">True</property> <property name="stock">gtk-redo</property> <property name="icon_size">1</property> @@ -808,7 +844,7 @@ </child> </widget> -<widget class="GtkFileChooserDialog" id="selecttracks"> +<widget class="GtkFileChooserDialog" id="select_xmcd_tracks"> <property name="border_width">5</property> <property name="action">GTK_FILE_CHOOSER_ACTION_OPEN</property> <property name="local_only">True</property> @@ -1296,4 +1332,75 @@ </child> </widget> +<widget class="GtkFileChooserDialog" id="select_mbxml_tracks"> + <property name="border_width">5</property> + <property name="action">GTK_FILE_CHOOSER_ACTION_OPEN</property> + <property name="local_only">True</property> + <property name="select_multiple">True</property> + <property name="show_hidden">False</property> + <property name="do_overwrite_confirmation">False</property> + <property name="title" translatable="yes">Select Audio Tracks</property> + <property name="type">GTK_WINDOW_TOPLEVEL</property> + <property name="window_position">GTK_WIN_POS_NONE</property> + <property name="modal">True</property> + <property name="resizable">True</property> + <property name="destroy_with_parent">False</property> + <property name="decorated">True</property> + <property name="skip_taskbar_hint">False</property> + <property name="skip_pager_hint">False</property> + <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property> + <property name="gravity">GDK_GRAVITY_NORTH_WEST</property> + <property name="focus_on_map">True</property> + <property name="urgency_hint">False</property> + <signal name="response" handler="mbxml_tracks_selected" last_modification_time="Mon, 21 Sep 2009 16:33:13 GMT"/> + + <child internal-child="vbox"> + <widget class="GtkVBox" id="dialog-vbox7"> + <property name="visible">True</property> + <property name="homogeneous">False</property> + <property name="spacing">2</property> + + <child internal-child="action_area"> + <widget class="GtkHButtonBox" id="dialog-action_area7"> + <property name="visible">True</property> + <property name="layout_style">GTK_BUTTONBOX_END</property> + + <child> + <widget class="GtkButton" id="button7"> + <property name="visible">True</property> + <property name="can_default">True</property> + <property name="can_focus">True</property> + <property name="label">gtk-cancel</property> + <property name="use_stock">True</property> + <property name="relief">GTK_RELIEF_NORMAL</property> + <property name="focus_on_click">True</property> + <property name="response_id">-6</property> + </widget> + </child> + + <child> + <widget class="GtkButton" id="button8"> + <property name="visible">True</property> + <property name="can_default">True</property> + <property name="has_default">True</property> + <property name="can_focus">True</property> + <property name="label">gtk-open</property> + <property name="use_stock">True</property> + <property name="relief">GTK_RELIEF_NORMAL</property> + <property name="focus_on_click">True</property> + <property name="response_id">-5</property> + </widget> + </child> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="pack_type">GTK_PACK_END</property> + </packing> + </child> + </widget> + </child> +</widget> + </glade-interface> glade/editxmcd.glade @@ -77,7 +77,7 @@ if (__name__ == '__main__'): sys.exit(1) except audiotools.DecodingError,err: msg.error(unicode(err)) - sys.exit(2) + sys.exit(1) elif (os.path.isdir(args[0]) and os.path.isdir(args[1])): returnval = 0 trackcmp faa389762235eb19ccc600e557e8ed3aa678edbc Brian Langenberger bjl@usa.net http://github.com/tuffy/python-audio-tools/commit/20d83d34c4878577b099cbfb70a043dee6628d96 20d83d34c4878577b099cbfb70a043dee6628d96 2009-09-21T09:42:27-07:00 2009-09-21T09:42:27-07:00 Add support for MusicBrainz XML files to editxmcd's "New" menu. 5a6cd279d1bf6e1dca2a6e850e0d2d89dff1a867 Brian Langenberger bjl@usa.net