=== modified file 'plugins/streamripper/PLUGININFO'
--- plugins/streamripper/PLUGININFO	2009-08-20 08:36:14 +0000
+++ plugins/streamripper/PLUGININFO	2010-02-23 15:42:18 +0000
@@ -1,4 +1,4 @@
-Version='0.0.1'
-Authors=['Adam Olsen <arolsen@gmail.com>']
+Version='0.0.2'
+Authors=['Adam Olsen <arolsen@gmail.com>, Johannes Schwarz <johannes.schw@gmx.de']
 Name=_('Streamripper')
 Description=_('Allows you to record streams with streamripper.\nDepends: streamripper')

=== modified file 'plugins/streamripper/__init__.py'
--- plugins/streamripper/__init__.py	2009-11-15 03:34:44 +0000
+++ plugins/streamripper/__init__.py	2010-02-26 12:58:34 +0000
@@ -14,168 +14,140 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-import subprocess, logging, os
-from xl import event, xdg
+import subprocess, logging, os, shutil
+import gtk
+from xl import event
 from xl.nls import gettext as _
 from xl import settings
-from xlgui import guiutil
-import time, sys
+from xlgui import commondialogs
 import srprefs
 
-# trying to not rely on the gui parts of exaile
-try:
-    from xlgui import commondialogs
-except ImportError:
-    commondialogs = None
-
 logger = logging.getLogger(__name__)
 
-BUTTON = None
-CURRENT_TRACK = None
-STREAMRIPPER_PID = None
-STREAMRIPPER_OUT = None
-APP = None
+STREAMRIPPER = None
 
 def get_prefs_pane():
     return srprefs
 
-def toggle_record(widget=None, event=None):
-    global STREAMRIPPER_PID, CURRENT_TRACK, STREAMRIPPER_OUT
-
-    import gst
-
-    track = APP.player.current
-
-    if not STREAMRIPPER_PID:
-        if not track: return True
-        if track.is_local():
+class Streamripper(object):
+    def __init__(self):
+        self.savedir = None
+
+    def toggle_record(self, add_call):
+        current_track = self.exaile.player.current
+        if not current_track:
+            return True
+        if current_track.is_local():
             logger.warning('Streamripper can only record streams')
-            if commondialogs:
-                commondialogs.error(APP.gui.main.window, _('Streamripper '
-                    'can only record streams.'))
             return True
 
-        savedir = settings.get_option(
-                    'plugin/streamripper/save_location',
-                    os.getenv('HOME'))
+        self.savedir = settings.get_option('plugin/streamripper/save_location',
+                            os.getenv('HOME'))
+        options = []
+        options.append('streamripper')
+        options.append(self.exaile.player.playbin.get_property('uri'))
+        options.append('-D')
+        options.append('%A/%a/%T')
+        if settings.get_option('plugin/streamripper/single_file', False):
+			options.append("-a")
+			options.append("-A")
+        options.append("-r")
+        options.append(settings.get_option('plugin/streamripper/relay_port', '8888'))
+        options.append("-d")
+        options.append(self.savedir)
 
         try:
-            port = int(settings.get_option(
-                'plugin/streamripper/relay_port', 8888))
-        except ValueError:
-            port = 8888
-
-        outfile = "%s/streamripper.log" % xdg.get_config_dir()
-        STREAMRIPPER_OUT = open(outfile, "w+", 0)
-        STREAMRIPPER_OUT.write("Streamripper log file started: %s\n" %
-            time.strftime("%c", time.localtime()))
-        STREAMRIPPER_OUT.write(
-            "-------------------------------------------------\n\n\n")
-
-
-        APP.player.playbin.set_state(gst.STATE_NULL)
-        sub = subprocess.Popen(['streamripper',
-            APP.player.playbin.get_property('uri'), '-r',
-            str(port), '-d', savedir], stdout=STREAMRIPPER_OUT)
-        ret = sub.poll()
-
-        logger.info("Using streamripper to play location: %s" % track['__loc'])
-
-        if ret != None:
-            logger.warning('There was an error executing streamripper')
-            if commondialogs:
-                commondialogs.error(APP.gui.main.window, _("Error "
-                    "executing streamripper"))
-                return True
-
-        STREAMRIPPER_PID = sub.pid
-        logger.info("Proxy location: http://127.0.0.1:%d" % port)
-        APP.player.playbin.set_property('uri', 'http://127.0.0.1:%d' % port)
-        time.sleep(1)
-
-        APP.player.playbin.set_state(gst.STATE_PLAYING)
-        CURRENT_TRACK = track
-
+            self.process = subprocess.Popen(options, 0, None, subprocess.PIPE,
+                        subprocess.PIPE, subprocess.PIPE)
+        except OSError:
+            logger.error('There was an error executing streamripper')
+            commondialogs.error(self.exaile.gui.main.window, _('Error '
+                    'executing streamripper'))
+            return True
+
+        if add_call:
+            event.add_callback(self.start_track, 'playback_track_start')
+            event.add_callback(self.stop_playback, 'playback_player_end')
         return False
-    else:
-        os.system('kill -9 %d' % STREAMRIPPER_PID)
-        APP.player.playbin.set_state(gst.STATE_READY)
-        APP.player.playbin.set_property('uri', track.get_loc_for_io())
-        CURRENT_TRACK = None
-        APP.player.playbin.set_state(gst.STATE_PLAYING)
-        STREAMRIPPER_PID = None
-        if STREAMRIPPER_OUT:
+
+    def stop_ripping(self):
+        try:
+            self.process.terminate()
+        except Exception:
+            pass
+        if settings.get_option('plugin/streamripper/delete_incomplete', True):
             try:
-                STREAMRIPPER_OUT.close()
+                shutil.rmtree(self.savedir + "/incomplete")
             except OSError:
                 pass
 
-    return False
-
-def playback_stop(type, player, object):
-    global STREAMRIPPER_OUT, STREAMRIPPER_PID
-    if BUTTON:
-        BUTTON.set_active(False)
-
-    if STREAMRIPPER_OUT:
-        try:
-            STREAMRIPPER_OUT.close()
-        except OSError:
-            pass
-        STREAMRIPPER_OUT = None
-
-    if STREAMRIPPER_PID:
-        os.system("kill -9 %d" % STREAMRIPPER_PID)
-        STREAMRIPPER_PID = None
-
-def initialize(type, exaile, stuff=None):
-    global BUTTON, APP
-
-    APP = exaile
-
-    # if the gui is available, add the record button
-    if exaile.gui:
-        import gtk
-
-        BUTTON = gtk.ToggleButton()
-        BUTTON.connect('button-release-event', toggle_record)
+    def stop_playback(self, type, player, track):
+        self.stop_ripping()
+        self.button.set_active(False)
+        self.remove_callbacks()
+
+    def start_track(self, type, player, track):
+        self.stop_ripping()
+        if self.toggle_record(False):
+            self.button.set_active(False)
+            self.remove_callbacks()
+
+    def remove_callbacks(self):
+        event.remove_callback(self.start_track, 'playback_track_start')
+        event.remove_callback(self.stop_playback, 'playback_player_end')
+
+
+class Button(Streamripper):
+    def __init__(self, exaile):
+        self.exaile = exaile
+        self.button = gtk.ToggleButton()
         image = gtk.Image()
         image.set_from_stock('gtk-media-record', gtk.ICON_SIZE_SMALL_TOOLBAR)
-        BUTTON.set_image(image)
-
-        toolbar = exaile.gui.play_toolbar
-        toolbar.pack_start(BUTTON, False, False)
-        toolbar.reorder_child(BUTTON, 3)
-
-        BUTTON.show()
-
-    event.add_callback(playback_stop, 'playback_player_end',
-        exaile.player)
+        self.button.set_image(image)
+
+        toolbar = self.exaile.gui.play_toolbar
+        toolbar.pack_start(self.button, False, False)
+        toolbar.reorder_child(self.button, 3)
+
+        self.button.show()
+
+        self.button.connect('button-release-event', self.toggle_button_callback)
+
+    def toggle_button_callback(self, widget, data):
+        if widget.get_active():
+            self.stop_ripping()
+            self.remove_callbacks()
+        else:
+            if self.toggle_record(True): #couldn't record stream
+                self.button.set_active(True)
+                self.remove_callbacks()
+
+    def remove_button(self):
+        self.exaile.gui.play_toolbar.remove(self.button)
+        self.button.hide()
+        self.button.destroy()
+        self.remove_callbacks()
+
 
 def enable(exaile):
-    """
-        Enables the streamripper plugin
-    """
-    try:
+    try: #just test if streamripper is installed
         subprocess.call(['streamripper'], stdout=-1, stderr=-1)
     except OSError:
         raise NotImplementedError('Streamripper is not available.')
         return False
 
-    if exaile.loading:
-        event.add_callback(initialize, 'exaile_loaded', exaile)
+    if (exaile.loading):
+        event.add_callback(_enable, 'exaile_loaded')
     else:
-        initialize(None, exaile)
+        _enable(None, exaile, None)
+
+
+def _enable(eventname, exaile, nothing):
+    global STREAMRIPPER
+    STREAMRIPPER = Button(exaile)
+
 
 def disable(exaile):
-    global BUTTON
-
-    if BUTTON:
-        exaile.gui.play_toolbar.remove(BUTTON)
-        BUTTON.hide()
-        BUTTON.destroy()
-
-        BUTTON = None
-
-    event.remove_callback(playback_stop, 'playback_player_end',
-        exaile.player)
+    global STREAMRIPPER
+    STREAMRIPPER.remove_button()
+    STREAMRIPPER = None

=== modified file 'plugins/streamripper/srprefs.py'
--- plugins/streamripper/srprefs.py	2009-11-14 22:05:25 +0000
+++ plugins/streamripper/srprefs.py	2010-02-23 16:37:08 +0000
@@ -30,3 +30,11 @@
 class PortPreference(widgets.PrefsItem):
     default = '8888'
     name = 'plugin/streamripper/relay_port'
+    
+class FilePreference(widgets.CheckPrefsItem):
+    default = False
+    name = 'plugin/streamripper/single_file'
+    
+class DeletePreference(widgets.CheckPrefsItem):
+    default = True
+    name = 'plugin/streamripper/delete_incomplete'

=== modified file 'plugins/streamripper/streamripper.ui'
--- plugins/streamripper/streamripper.ui	2009-11-14 22:05:25 +0000
+++ plugins/streamripper/streamripper.ui	2010-02-26 12:51:54 +0000
@@ -6,108 +6,95 @@
     <child>
       <object class="GtkVBox" id="prefs_pane">
         <property name="visible">True</property>
-        <property name="border_width">3</property>
+        <property name="orientation">vertical</property>
         <child>
           <object class="GtkTable" id="table1">
             <property name="visible">True</property>
-            <property name="n_rows">2</property>
+            <property name="n_rows">4</property>
             <property name="n_columns">2</property>
             <child>
-              <object class="GtkHBox" id="hbox2">
-                <property name="visible">True</property>
-                <child>
-                  <object class="GtkEntry" id="plugin/streamripper/relay_port">
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="max_length">15</property>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="position">0</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkLabel" id="label5">
-                    <property name="visible">True</property>
-                  </object>
-                  <packing>
-                    <property name="position">1</property>
-                  </packing>
-                </child>
-              </object>
-              <packing>
-                <property name="left_attach">1</property>
-                <property name="right_attach">2</property>
-                <property name="top_attach">1</property>
-                <property name="bottom_attach">2</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkHBox" id="hbox1">
-                <property name="visible">True</property>
-                <child>
-                  <object class="GtkFileChooserButton" id="plugin/streamripper/save_location">
-                    <property name="visible">True</property>
-                    <property name="action">select-folder</property>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="position">0</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkLabel" id="label4">
-                    <property name="visible">True</property>
-                  </object>
-                  <packing>
-                    <property name="position">1</property>
-                  </packing>
-                </child>
-              </object>
-              <packing>
-                <property name="left_attach">1</property>
-                <property name="right_attach">2</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkLabel" id="label3">
+              <object class="GtkLabel" id="label1">
                 <property name="visible">True</property>
                 <property name="xalign">0</property>
-                <property name="label" translatable="yes">Relay Port:</property>
+                <property name="xpad">5</property>
+                <property name="label" translatable="yes">Save location:</property>
               </object>
-              <packing>
-                <property name="top_attach">1</property>
-                <property name="bottom_attach">2</property>
-                <property name="x_options">GTK_FILL</property>
-              </packing>
             </child>
             <child>
               <object class="GtkLabel" id="label2">
                 <property name="visible">True</property>
                 <property name="xalign">0</property>
-                <property name="label" translatable="yes">Save Location:</property>
-              </object>
-              <packing>
-                <property name="x_options">GTK_FILL</property>
+                <property name="xpad">5</property>
+                <property name="label" translatable="yes">Relay port:</property>
+              </object>
+              <packing>
+                <property name="top_attach">1</property>
+                <property name="bottom_attach">2</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkFileChooserButton" id="plugin/streamripper/save_location">
+                <property name="visible">True</property>
+                <property name="show_hidden">True</property>
+                <property name="action">select-folder</property>
+              </object>
+              <packing>
+                <property name="left_attach">1</property>
+                <property name="right_attach">2</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkEntry" id="plugin/streamripper/relay_port">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="invisible_char">&#x25CF;</property>
+              </object>
+              <packing>
+                <property name="left_attach">1</property>
+                <property name="right_attach">2</property>
+                <property name="top_attach">1</property>
+                <property name="bottom_attach">2</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkCheckButton" id="plugin/streamripper/single_file">
+                <property name="label" translatable="yes">Rip to single file</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">False</property>
+                <property name="draw_indicator">True</property>
+              </object>
+              <packing>
+                <property name="top_attach">2</property>
+                <property name="bottom_attach">3</property>
+              </packing>
+            </child>
+            <child>
+              <placeholder/>
+            </child>
+            <child>
+              <placeholder/>
+            </child>
+            <child>
+              <object class="GtkCheckButton" id="plugin/streamripper/delete_incomplete">
+                <property name="label" translatable="yes">Delete incomplete files</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">False</property>
+                <property name="draw_indicator">True</property>
+              </object>
+              <packing>
+                <property name="top_attach">3</property>
+                <property name="bottom_attach">4</property>
               </packing>
             </child>
           </object>
           <packing>
             <property name="expand">False</property>
+            <property name="fill">False</property>
             <property name="position">0</property>
           </packing>
         </child>
-        <child>
-          <placeholder/>
-        </child>
-        <child>
-          <object class="GtkLabel" id="label1">
-            <property name="visible">True</property>
-          </object>
-          <packing>
-            <property name="position">2</property>
-          </packing>
-        </child>
       </object>
     </child>
   </object>