Changeset 391

Timestamp:

08/19/06 17:32:38 (2 years ago)

Author:

nicfit

Message:

Use gnomevfs.URI instead of homegrown implementation (#200) which also
fixes playlists like "Comp #1" (#181)

Files:

• trunk/po/POTFILES.in (modified) (2 diffs)
• trunk/po/es.po (modified) (6 diffs)
• trunk/po/mesk.pot (modified) (6 diffs)
• trunk/src/album_cover_control.py (modified) (2 diffs)
• trunk/src/audio_control.py (modified) (1 diff)
• trunk/src/config.py (modified) (3 diffs)
• trunk/src/mesk/__init__.py (modified) (1 diff)
• trunk/src/mesk/audio/__init__.py (modified) (2 diffs)
• trunk/src/mesk/audio/mp3.py (modified) (6 diffs)
• trunk/src/mesk/audio/oggvorbis.py (modified) (4 diffs)
• trunk/src/mesk/audio/source.py (modified) (2 diffs)
• trunk/src/mesk/common/uri.py (deleted)
• trunk/src/mesk/playlist.py (modified) (2 diffs)
• trunk/src/mesk/uri.py (added)
• trunk/src/mesk/utils.py (modified) (1 diff)
• trunk/src/playlist_control.py (modified) (10 diffs)

trunk/po/POTFILES.in

@@ -19 +19 @@
-src/mesk/common/i18n.py
-src/mesk/common/__init__.py
-src/mesk/common/uri.py
-src/mesk/gtk_utils.py
-src/mesk/info.py
@@ -29 +28 @@
-src/mesk/plugin/plugin.py
-src/mesk/plugin/provider.py
+src/mesk/uri.py
-src/mesk/utils.py
-src/mesk/window.py

trunk/po/es.po

@@ -8 +8 @@
-"Project-Id-Version: 0.1.1\n"
-"Report-Msgid-Bugs-To: \n"
-8 20:14
+9 17:25
-"PO-Revision-Date: 2006-04-15 17:38-0600\n"
-"Last-Translator: Travis Shirk <travis@pobox.com>\n"
@@ -275 +275 @@
-msgstr "Formato audio sin apoyo: %s"
-
-
+
+
+
+
+
+
-#, fuzzy, python-format
-msgid "Error reading mp3 source for '%s': %s"
-msgstr "Metadata de la fuente de la lectura de error en '%s': %s"
-
-1
+4
-#, fuzzy, python-format
-msgid "Error reading ogg/vorbis source for '%s': %s"
@@ -459 +464 @@
-msgstr "Tipo inválido para '%s'plugin: %s"
-
-49
+50
-msgid "KB"
-msgstr "KB"
-
-0
+1
-msgid "MB"
-msgstr "MB"
-
-1
+2
-msgid "GB"
-msgstr "GB"
-
-4
+5
-msgid "Bytes"
-msgstr "Octetos"
-
-#. Text columns
-2
+1
-msgid "Title"
-msgstr "Título"
-
-3
+2
-msgid "Artist"
-msgstr "Artista"
-
-4
+3
-msgid "Album"
-msgstr "Álbum"
-
-5
+4
-msgid "#"
-msgstr "#"
-
-6
+5
-msgid "Year"
-msgstr "Año"
-
-7
+6
-msgid "Time"
-msgstr "Tiempo"
-
-3
+4
-#, python-format
-msgid "Are you sure you want to delete playlist '%s'?"
-msgstr ""
-
-5
+6
-msgid "All playlist data will be lost."
-msgstr ""
-
-3
+4
-msgid "tracks"
-msgstr "pistas"
-
-3
+6
-#, fuzzy, python-format
-msgid ""
@@ -521 +526 @@
-msgstr "Fuente que cae del error: %s"
-
-1
+4
-#, fuzzy, python-format
-msgid ""
@@ -531 +536 @@
-"%s"
-
-6
+9
-msgid "Add Music"
-msgstr "Agregue La Música"
-
-3
+6
-msgid "All"
-msgstr ""
-
-5
+8
-msgid "Audio"
-msgstr ""
-
-6
+9
-msgid "Playlists"
-msgstr "Playlists"
@@ -550 +555 @@
-#. the checkbox is toggles and files when not since this is not
-#. possible by default
-1
+4
-msgid "Make the _dialog be able/unable to select directories"
-msgstr "Haga que el _diálogo es able/unable para seleccionar directorios"
-
-4
+7
-#, python-format
-msgid "'%s' string not found"

trunk/po/mesk.pot

@@ -9 +9 @@
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-8 20:14
+9 17:25
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
@@ -265 +265 @@
-msgstr ""
-
-
+
+
+
+
+
+
-#, python-format
-msgid "Error reading mp3 source for '%s': %s"
-msgstr ""
-
-1
+4
-#, python-format
-msgid "Error reading ogg/vorbis source for '%s': %s"
@@ -443 +448 @@
-msgstr ""
-
-49
+50
-msgid "KB"
-msgstr ""
-
-0
+1
-msgid "MB"
-msgstr ""
-
-1
+2
-msgid "GB"
-msgstr ""
-
-4
+5
-msgid "Bytes"
-msgstr ""
-
-#. Text columns
+#: ../src/playlist_control.py:171
+msgid "Title"
+msgstr ""
+
-#: ../src/playlist_control.py:172
-Title
+Artist
-msgstr ""
-
-#: ../src/playlist_control.py:173
-rtist
+lbum
-msgstr ""
-
-#: ../src/playlist_control.py:174
-Album
+#
-msgstr ""
-
-#: ../src/playlist_control.py:175
-#
+Year
-msgstr ""
-
-#: ../src/playlist_control.py:176
-msgid "Year"
-msgstr ""
-
-#: ../src/playlist_control.py:177
-msgid "Time"
-msgstr ""
-
-3
+4
-#, python-format
-msgid "Are you sure you want to delete playlist '%s'?"
-msgstr ""
-
-5
+6
-msgid "All playlist data will be lost."
-msgstr ""
-
-3
+4
-msgid "tracks"
-msgstr ""
-
-3
+6
-#, python-format
-msgid ""
@@ -505 +510 @@
-msgstr ""
-
-1
+4
-#, python-format
-msgid ""
@@ -513 +518 @@
-msgstr ""
-
-6
+9
-msgid "Add Music"
-msgstr ""
-
-3
+6
-msgid "All"
-msgstr ""
-
-5
+8
-msgid "Audio"
-msgstr ""
-
-6
+9
-msgid "Playlists"
-msgstr ""
@@ -532 +537 @@
-#. the checkbox is toggles and files when not since this is not
-#. possible by default
-1
+4
-msgid "Make the _dialog be able/unable to select directories"
-msgstr ""
-
-4
+7
-#, python-format
-msgid "'%s' string not found"

trunk/src/album_cover_control.py

@@ -22 +22 @@
-
-import mesk
-control
+mesk.uri
-_ = mesk.common.i18n._
-
@@ -102 +102 @@
-
-        src = new[1]
-src.uri.path
+mesk.uri.unescape(src.uri.path)
-
-        # Compute SHA digest for source metadata

trunk/src/audio_control.py

@@ -410 +410 @@
-    def _set_source(self, src):
-        self._set_track_scale(0.0)
-rc.uri.to_string(
+tr(src.uri
-        self._current_audio_src = src
-

trunk/src/config.py

@@ -21 +21 @@
-
-import mesk
+import mesk.uri
-_ = mesk.common.i18n._
-from mesk.common.uri import Uri
-
-def get_playlist_uri(pl_name):
-    pl_dir = mesk.config.get(mesk.CONFIG_MAIN, 'playlist_dir')
-
+
+
-    return uri
-
@@ -59 +60 @@
-        if self._section and mesk.config.has_section(self._section):
-            # Initialize from config
-U
+mesk.uri.make_u
-            self.current = mesk.config.getint(self._section, 'current')
-            self.repeat = mesk.config.getboolean(self._section, 'repeat')
@@ -74 +75 @@
-            mesk.config.add_section(self._section)
-            pl_dir = mesk.config.get(mesk.CONFIG_MAIN, 'playlist_dir')
-
+
+
+
-            self.update(None)
-
-    def update(self, playlist):
-        '''Update the config with latest playlist state'''
-
-
+
-
-        if playlist:

trunk/src/mesk/__init__.py

@@ -135 +135 @@
-import mesk.log
-import mesk.playlist
-import mesk.utils
-# FIXME
+#import mesk.utils
-#import mesk.audio

trunk/src/mesk/audio/__init__.py

@@ -23 +23 @@
-
-import mesk
-
+, mesk.uri
-# At least versions
-REQUIRE_GST_VERSION = (0, 10, 8)
@@ -78 +78 @@
-    '''Thrown when a audio format is not supported'''
-
-from mesk.common.uri import Uri
-def load(uri):
-    '''Given a URI, attempt to load an AudioSource.  If this cannot be done,
-    a UnsupportedFormat exception, or other related error is thrown.'''
-isinstance(uri, U
-U
+mesk.uri.is_uri(u
+mesk.uri.make_u
-
-
+
+
-    if not mt or not supported_mimetypes.has_key(mt):
-        raise UnsupportedFormat(_('Unsupported audio format: %s') % \

trunk/src/mesk/audio/mp3.py

@@ -20 +20 @@
-import sys
-import gst
+
-import mesk
-
+, mesk.uri
-_ = mesk.common.i18n._
-
@@ -64 +65 @@
-        # Use URI if we don't have a title
-        if not self.meta_data.title:
-elf.uri.to_string(
+tr(self.uri
-
-    def get_native_tag(self):
@@ -71 +72 @@
-            return None
-
+        uri_path = mesk.uri.unescape(self.uri.path)
-        try:
-            tag = eyeD3.Tag()
-self.uri.
+uri_
-                return tag
-        except TagException, ex:
+            mesk.log.warning(_('Error loading ID3 tag for \'%s\': %s') % \
+                             (uri_path, str(ex)))
-            return None
-
@@ -94 +98 @@
-
-from eyeD3 import TagException, InvalidAudioFormatException
-from mesk.common.uri import Uri
-class Mp3MetaData(AudioMetaData):
-
@@ -102 +105 @@
-        if not uri or uri.scheme != 'file':
-            return
+        uri_path = mesk.uri.unescape(uri.path)
-
-        audio_file = None
-        try:
-.
+_
-        except (TagException, InvalidAudioFormatException), ex:
-            mesk.log.warning(_('Error reading mp3 source for \'%s\': %s') % \
-.
+_
-        else:
-            self.time_secs = audio_file.getPlayTime()
@@ -121 +125 @@
-                self.has_images = len(tag.getImages()) > 0
-                self.frozen = True
+
+# The factory class for mp3 files
-factory = Mp3AudioSource
-

trunk/src/mesk/audio/oggvorbis.py

@@ -20 +20 @@
-import os, stat
-import ogg.vorbis, gst
+
-import mesk
+import mesk.uri
-_ = mesk.common.i18n._
-
@@ -45 +47 @@
-        # Use URI if we don't have a title
-        if not self.meta_data.title:
-elf.uri.to_string(
+tr(self.uri
-
-    def get_native_tag(self):
@@ -65 +67 @@
-            return
-
+        uri_path = mesk.uri.unescape(uri.path)
-        audio_file = None
-        try:
-.
+_
-        except (VorbisError), ex:
-            mesk.log.warning(_('Error reading ogg/vorbis source for \'%s\': '
-.
+_
-        else:
-            self.time_secs = int(audio_file.time_total(0))
-
+
+
-            tag = audio_file.comment()
-            if tag:
@@ -92 +96 @@
-                                self.track_total = int(values[1])
-                self.frozen = True
+
+# Factory class for Ogg Vorbis files
-factory = OggAudioSource

trunk/src/mesk/audio/source.py

@@ -21 +21 @@
-
-import mesk
-from mesk.common.uri import U
+import mesk.u
-from mesk.common.i18n import _
-
@@ -45 +45 @@
-class AudioSource:
-    def __init__(self, uri):
-
-
-
-
+
-        self.meta_data = AudioMetaData()
-

trunk/src/mesk/playlist.py

@@ -24 +24 @@
-import utils
-import log
-import common.uri
-
-# Mapping from mime types to factory classes for supported formats
@@ -105 +104 @@
-            fp.write(src.uri.path)
-        else:
-rc.uri.to_string(
+tr(src.uri
-        fp.write('\n')
-    fp.close()

trunk/src/mesk/utils.py

@@ -25 +25 @@
-_ = common.i18n._
-
+# Time and memory string formatting
-def format_track_time(curr, total = None):
-    def time_tuple(ts):

trunk/src/playlist_control.py

@@ -24 +24 @@
-import pango
-
-
+, mesk.utils, mesk.gtk_utils, mesk.uri
-_ = mesk.common.i18n._
-import mesk.gtk_utils
-
-import config, control
@@ -178 +177 @@
-
-        # Load playlist
-self._pl_config.uri.path
+mesk.uri.unescape(self._pl_config.uri.path)
-        pl.set_shuffle(self._pl_config.shuffle)
-        pl.set_repeat(self._pl_config.repeat)
@@ -208 +207 @@
-    def _save_playlist(self):
-        self._pl_config.update(self._playlist)
-
+
+
-        self._debug_show_playlist()
-
@@ -247 +247 @@
-    def _new_model_row(self, src):
-        model_data = self._get_model_metadata(src)
-
+
+
-                model_data[MODEL_NUM],
-                model_data[MODEL_TITLE],
@@ -461 +462 @@
-        
-        # Delete
-self._pl_config.uri.path
+mesk.uri.unescape(self._pl_config.uri.path)
-        self._pl_config.delete()
-        self.emit('control_request_close')
@@ -532 +533 @@
-                                  buttons = gtk.BUTTONS_OK)
-            d.set_markup('<b>%s</b>' % err_msg)
-audio_src.uri.path
+mesk.uri.unescape(audio_src.uri.path)
-            d.connect('response', self._on_dialog_close)
-            d.show()
@@ -919 +920 @@
-            msg = 'Modified Playlist:\n'
-            for src in self._playlist:
-rc.uri.to_string(quoted = False
+tr(src.uri
-            mesk.log.debug(msg)
-
@@ -925 +926 @@
-        orig_size = self._playlist.get_length()
-        count = 0
+
-        for uri in uris:
-
-
-
+
+
+
+
-            try:
-                # Handle files/directories
-.
+_
-                    # Recurse into a directory
-.
+_
-                        # Add files in this directory
-                        dir_files = []
@@ -951 +954 @@
-                        break
-                else:
-a file
+local and remote URIs
-                    srcs = []
-.
+_
-                    ext = os.path.splitext(fname)[1]
-                    try:
-                        if ext == '.m3u':
+                            # FIXME: This may be remote, fetching would be nice
+
-                            # Playlists
-                            pl = mesk.playlist.Playlist()
-.
+_
-                            for src in pl:
-                                srcs.append(src)
-                            del pl
-                        else:
-                            # Presumably, an audio file
-                            src = mesk.audio.load(uri)
-                            srcs.append(src)
-                    except UnsupportedFormat, ex:
-
-
+
-                        continue
-
@@ -1222 +1225 @@
-    ### Clipboard and cuty/copy/paste functions ###
-    def _clipboard_set_cb(self, clipboard, selection, info, op_info):
-ri
+RI
-        uris = []
-        for uri in op_info.uris:
-uri.to_string(
+str(uri
-
-        selection.set_uris(uris)