Changeset 393

Timestamp:

08/20/06 16:22:21 (2 years ago)

Author:

nicfit

Message:

Fetch remote playlists (#203)

Files:

• trunk/launch.sh (modified) (1 diff)
• trunk/po/es.po (modified) (9 diffs)
• trunk/po/mesk.pot (modified) (9 diffs)
• trunk/src/audio_control.py (modified) (1 diff)
• trunk/src/mesk/__init__.py (modified) (1 diff)
• trunk/src/mesk/playlist.py (modified) (4 diffs)
• trunk/src/playlist_control.py (modified) (3 diffs)

trunk/launch.sh

@@ -1 +1 @@
-#!/bin/sh
+
+die()
+{
+    echo "$1"
+    exit 1
+}
-
-ROOT=`dirname $0`
-cd $ROOT
-if test ! -e ./src/mesk/info.py; then
-
+
+
-fi
-

trunk/po/es.po

@@ -8 +8 @@
-"Project-Id-Version: 0.1.1\n"
-"Report-Msgid-Bugs-To: \n"
-19 17:25
+20 16:21
-"PO-Revision-Date: 2006-04-15 17:38-0600\n"
-"Last-Translator: Travis Shirk <travis@pobox.com>\n"
@@ -230 +230 @@
-msgstr ""
-
+#: ../src/audio_control.py:665
+msgid "Mute Volume"
+msgstr ""
+
-#: ../src/audio_control.py:667
-msgid "Mute Volume"
-msgstr ""
-
-#: ../src/audio_control.py:669
-msgid "Restore Volume"
-msgstr ""
@@ -257 +257 @@
-"DEBUG"
-
-
+
+
+
+
+
+
-msgid "Run using python profiler."
-msgstr ""
-
-1
+3
-msgid "Run using python debugger."
-msgstr ""
@@ -270 +275 @@
-msgstr "Playlist '%s' del cargamento del error"
-
-9
+8
-#, python-format
-msgid "Unsupported audio format: %s"
@@ -358 +363 @@
-
-#: ../src/mesk/__init__.py:85
-the
+a
-msgstr ""
-
@@ -481 +486 @@
-
-#. Text columns
-1
+0
-msgid "Title"
-msgstr "Título"
-
-2
+1
-msgid "Artist"
-msgstr "Artista"
-
-3
+2
-msgid "Album"
-msgstr "Álbum"
-
-4
+3
-msgid "#"
-msgstr "#"
-
-5
+4
-msgid "Year"
-msgstr "Año"
-
-6
+5
-msgid "Time"
-msgstr "Tiempo"
-
-4
+3
-#, python-format
-msgid "Are you sure you want to delete playlist '%s'?"
-msgstr ""
-
-6
+5
-msgid "All playlist data will be lost."
-msgstr ""
-
-4
+3
-msgid "tracks"
-msgstr "pistas"
-
-6
+3
-#, fuzzy, python-format
-msgid ""
@@ -526 +531 @@
-msgstr "Fuente que cae del error: %s"
-
-4
+1
-#, fuzzy, python-format
-msgid ""
@@ -536 +541 @@
-"%s"
-
-9
+6
-msgid "Add Music"
-msgstr "Agregue La Música"
-
+#: ../src/playlist_control.py:1063
+msgid "All"
+msgstr ""
+
+#: ../src/playlist_control.py:1065
+msgid "Audio"
+msgstr ""
+
-#: ../src/playlist_control.py:1066
-msgid "All"
-msgstr ""
-
-#: ../src/playlist_control.py:1068
-msgid "Audio"
-msgstr ""
-
-#: ../src/playlist_control.py:1069
-msgid "Playlists"
-msgstr "Playlists"
@@ -555 +560 @@
-#. the checkbox is toggles and files when not since this is not
-#. possible by default
-4
+1
-msgid "Make the _dialog be able/unable to select directories"
-msgstr "Haga que el _diálogo es able/unable para seleccionar directorios"
-
-7
+4
-#, python-format
-msgid "'%s' string not found"

trunk/po/mesk.pot

@@ -9 +9 @@
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-19 17:25
+20 16:21
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
@@ -224 +224 @@
-msgstr ""
-
+#: ../src/audio_control.py:665
+msgid "Mute Volume"
+msgstr ""
+
-#: ../src/audio_control.py:667
-msgid "Mute Volume"
-msgstr ""
-
-#: ../src/audio_control.py:669
-msgid "Restore Volume"
-msgstr ""
@@ -247 +247 @@
-msgstr ""
-
-
+
+
+
+
+
+
-msgid "Run using python profiler."
-msgstr ""
-
-1
+3
-msgid "Run using python debugger."
-msgstr ""
@@ -260 +265 @@
-msgstr ""
-
-9
+8
-#, python-format
-msgid "Unsupported audio format: %s"
@@ -343 +348 @@
-
-#: ../src/mesk/__init__.py:85
-the
+a
-msgstr ""
-
@@ -465 +470 @@
-
-#. Text columns
+#: ../src/playlist_control.py:170
+msgid "Title"
+msgstr ""
+
-#: ../src/playlist_control.py:171
-Title
+Artist
-msgstr ""
-
-#: ../src/playlist_control.py:172
-rtist
+lbum
-msgstr ""
-
-#: ../src/playlist_control.py:173
-Album
+#
-msgstr ""
-
-#: ../src/playlist_control.py:174
-#
+Year
-msgstr ""
-
-#: ../src/playlist_control.py:175
-msgid "Year"
-msgstr ""
-
-#: ../src/playlist_control.py:176
-msgid "Time"
-msgstr ""
-
-4
+3
-#, python-format
-msgid "Are you sure you want to delete playlist '%s'?"
-msgstr ""
-
-6
+5
-msgid "All playlist data will be lost."
-msgstr ""
-
-4
+3
-msgid "tracks"
-msgstr ""
-
-6
+3
-#, python-format
-msgid ""
@@ -510 +515 @@
-msgstr ""
-
-4
+1
-#, python-format
-msgid ""
@@ -518 +523 @@
-msgstr ""
-
-9
+6
-msgid "Add Music"
-msgstr ""
-
+#: ../src/playlist_control.py:1063
+msgid "All"
+msgstr ""
+
+#: ../src/playlist_control.py:1065
+msgid "Audio"
+msgstr ""
+
-#: ../src/playlist_control.py:1066
-msgid "All"
-msgstr ""
-
-#: ../src/playlist_control.py:1068
-msgid "Audio"
-msgstr ""
-
-#: ../src/playlist_control.py:1069
-msgid "Playlists"
-msgstr ""
@@ -537 +542 @@
-#. the checkbox is toggles and files when not since this is not
-#. possible by default
-4
+1
-msgid "Make the _dialog be able/unable to select directories"
-msgstr ""
-
-7
+4
-#, python-format
-msgid "'%s' string not found"

trunk/src/audio_control.py

@@ -531 +531 @@
-        position, self._duration = self.get_position()
-        if position != gst.CLOCK_TIME_NONE:
-
+
+
+
+
-            self._set_track_scale(value)
-

trunk/src/mesk/__init__.py

@@ -82 +82 @@
-    'compact_main_window_pos_y': [int, -1, 
-                                  _('Main window y origin in compact mode')],
-int, 1
-the
+bool, False
+a
-    'show_tip_window_on_startup': [bool, True,
-                                   _('Show tips window each time Mesk is '

trunk/src/mesk/playlist.py

@@ -22 +22 @@
-
-import audio.source
-
-
+
-
-# Mapping from mime types to factory classes for supported formats
@@ -30 +29 @@
-supported_extensions = ['m3u']
-
-source
+uri
-    '''Load a playlist, currently only m3u is supported'''
+    pl_path = uri.unescape(pl_uri.path)
+    if os.path.splitext(pl_path)[1] != '.m3u':
+        raise PlaylistException('Unsupported playlist type')
+
-    pl = Playlist()
-
-
-
+
+
+
+
-            fp.close()
-
+
+
+
+
-    else:
-
+
+
+
+
+
-    return pl
-
-file
-fp = file(pl_file, 'r')
+data
+'''Load an m3u in pl.  pl_data must support readlines()'''
-
-    meta_time = 0
@@ -49 +60 @@
-    meta_artist = u''
-
-fp
+pl_data.readlines()
-        line = line.strip()
-        if not line:
@@ -88 +99 @@
-        meta_title = u''
-        meta_artist = u''
-    fp.close()
-
-def save_m3u(pl_file, pl):

trunk/src/playlist_control.py

@@ -176 +176 @@
-
-        # Load playlist
-mesk.uri.unescape(self._pl_config.uri.path)
+self._pl_config.uri
-        pl.set_shuffle(self._pl_config.shuffle)
-        pl.set_repeat(self._pl_config.repeat)
@@ -726 +726 @@
-        print "I'm called!!!!!!!!!!!!!!!!!!!!!"
-        return self._on_playlist_control_key_press_event(widget, event)
+
-    def _on_playlist_view_key_press_event(self, widget, event):
-        # This handler is for key press events on just the treeview, 
@@ -959 +960 @@
-                    try:
-                        if ext == '.m3u':
-                            # TODO: This may be remote, fetching would be nice
-
-                            # Playlists
-
-
+
-                            for src in pl:
-                                srcs.append(src)