@@ -3,11 +3,11 @@
 # title: Shoutcast.com
 # description: Primary list of shoutcast servers (now managed by radionomy).
 # type: channel
 # category: radio
 # priority: default
-# version: 1.4
+# version: 1.5
 # depends: pq, re, http
 # author: Mario
 # original: Jean-Yves Lefort
 #
 # Shoutcast is a server software for audio streaming. It automatically spools
@@ -21,11 +21,11 @@
 # the eligibility of open source desktop apps for an authhash.
 #
 # Therefore we'll be retrieving stuff from the homepage still. The new
 # interface conveniently uses JSON already, so let's use that:
 #
-#   POST http://www.shoutcast.com/Home/BrowseByGenre {genreid: 9}
+#   POST http://www.shoutcast.com/Home/BrowseByGenre {genrename: Pop}
 #
 # We do need a catmap now too, but that's easy to aquire and will be kept
 # within the cache dirs.
 #
 #
@@ -72,31 +72,26 @@
     # stores a catmap (title => id)
     def update_categories(self):
         html = http.get(self.base_url)
         #__print__( dbg.DATA, html )
         self.categories = []
-
-        # Main genres from mobile dropdown
-        """ <option value="1">Alternative</option> """
-        rx = re.compile(r'<option value="(\d+)">(\w+\h*\w+)<')
-        main = rx.findall(html)
+        
         # Genre list in sidebar
-        """ <li><a href="#c-genre-2" onclick="loadStationsByGenre(2, true)">Adult Alternative</a></li> """
-        rx = re.compile(r'c-genre-(\d+).+?>(\w[\w\h]*\w)<')
+        """  <li><a id="genre-90" href="/Genre?name=Adult" onclick="loadStationsByGenre('Adult', 90, 89); return false;">Adult</a></li> """
+        rx = re.compile(r"loadStationsByGenre\(  '([^']+)' [,\s]* (\d+) [,\s]* (\d+)  \)", re.X)
         subs = rx.findall(html)
-        print main
-        print subs
 
         # group
-        for (id, title) in subs:
-            if (id,title) in main:
+        current = []
+        for (title, id, main) in subs:
+            self.catmap[title] = int(id)
+            if not int(main):
                 self.categories.append(title)
                 current = []
                 self.categories.append(current)
             else:
                 current.append(title)
-            self.catmap[title] = int(id)
         self.save()
 
 
     # downloads stream list from shoutcast for given category
     def update_streams(self, cat):
@@ -106,11 +101,11 @@
             return []
         id = self.catmap[cat]
 
         # page
         url = "http://www.shoutcast.com/Home/BrowseByGenre"
-        params = { "genreid": int(id) }
+        params = { "genrename": cat }
         referer = None
         json = http.get(url, params=params, referer=referer, post=1, ajax=1)
         self.parent.status(0.75)
 
         # remap JSON