Changeset 9bdd2cd691eb

Timestamp:

11/06/08 02:35:24 (2 months ago)

Author:

Milosz Derezynski <monostatic77@…>

Branch:

trunk

Message:

* Display artist+album horizontally in the album list, which is easier to read

Files:

• com/view-albums.cc (modified) (2 diffs)
• python/plugins/mpxdj/__init__.py.in (modified) (3 diffs)

com/view-albums.cc

@@ -894 +894 @@
                                 {
                                         (*iter)[Columns.Text] =
-        (boost::format("<span size='8000'><span size='12000'><b>%2%</b></span>\n<span size='12000'>%1%</span>\n<span size='9000'>%3% %4%\n%5%</span></span>")
+        (boost::format("<span size='8000'><span size='12000'><b>%2%</b>: %1%</span>\n<span size='9000'>%3% %4%\n%5%</span></span>")
                                                  % Markup::escape_text(album).c_str()
                                                  % Markup::escape_text(artist).c_str()
@@ -905 +905 @@
                                 {
                                         (*iter)[Columns.Text] =
-        (boost::format("<span size='8000'><span size='12000'><b>%2%</b></span>\n<span size='12000'>%1%</span>\n<span size='9000'>%3%\n%4%</span></span>")
+        (boost::format("<span size='8000'><span size='12000'><b>%2%</b>: %1%</span>\n<span size='9000'>%3%\n%4%</span></span>")
                                                  % Markup::escape_text(album).c_str()
                                                  % Markup::escape_text(artist).c_str()

python/plugins/mpxdj/__init__.py.in

@@ -277 +277 @@
                 print "Error running run_similar_artist: " + str(e) 
 
+    def run_markov(self, lib, v):
+        
+        track = self.model[len(self.model)-1]
+        id = track[mpx.AttributeId.MPX_TRACK_ID].get()
+        markov_id = lib.markovGetRandomProbableTrack(id)
+        if markov_id and markov_id != 0:
+            v.append(markov_id)
+
     def run(self):
 
@@ -285 +293 @@
             return
 
-        tries = 5
-
-        while tries:
+        # I know this is really lazy, i should just create a list of indexes instead and call the subroutines in sequence
+        for n in range(0,5):
 
                 choice = random.randint(0,2)
@@ -296 +303 @@
                     return
 
-                tries -= 1
+        if not len(self.v):
+            self.run_markov(self.lib, self.v)
 
         self.finished.set()