Fetch track information using comand lists

[mpdbot.git] / src / PEPThread.m

diff --git a/src/PEPThread.m b/src/PEPThread.m
index 496ebe6110d0b0bc2e278fb8d6b8fd3730787998..4daaefc3636f2d86ba94fab416b1a55bba12e08d 100644 (file)
--- a/src/PEPThread.m
+++ b/src/PEPThread.m
@@ -1,3 +1,25 @@
+/*
+ * Copyright (c) 2011, Florian Zeitz <florob@babelmonkeys.de>
+ *
+ * http://cgit.babelmonkeys.de/cgit.cgi/mpdbot/
+ *
+ * Permission to use, copy, modify, and/or distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice is present in all copies.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
 #import <ObjFW/ObjFW.h>
 #import <ObjXMPP/ObjXMPP.h>
 
@@ -9,54 +31,28 @@
 @implementation PEPThread: OFThread
 - (void)dealloc
 {
-       [sock release];
+       [conn release];
 
        [super dealloc];
 }
 
-- (void)MPD_connect
-{
-       int64_t pause = 1;
-       while(1) {
-               @try {
-                       [sock release];
-                       sock = [[OFTCPSocket alloc] init];
-                       [sock connectToHost: @"localhost"
-                                      port: 6600];
-                       return;
-               } @catch (id e) {
-                       of_log(@"Connection failed, retrying in %" PRIi64
-                                       " seconds", pause);
-                       [OFThread sleepForTimeInterval: pause];
-                       if (pause < 120)
-                               pause *= 2;
-                       [e release];
-               }
-       }
-}
-
-- (OFMutableDictionary*)MPD_responseFromSocket: (OFTCPSocket*)sock
-{
-       OFString *answer;
-       OFMutableDictionary *response = [OFMutableDictionary dictionary];
-       while ((answer = [sock readLine]) && ![answer hasPrefix: @"OK"]) {
-               size_t index;
-               index = [answer indexOfFirstOccurrenceOfString: @":"];
-               if (index == OF_INVALID_INDEX)
-                       continue;
-               [response setObject: [answer substringFromIndex: index + 2
-                                                       toIndex: answer.length]
-                            forKey: [answer substringFromIndex: 0
-                                                       toIndex: index]];
-       }
-
-       return response;
-}
-
 - (id)main
 {
-       [self MPD_connect];
-       [self MPD_responseFromSocket: sock];
+       OFString *mpd_host;
+       uint16_t mpd_port;
+       OFDictionary *environment = [OFApplication environment];
+       OFString *mpd_port_string;
+       mpd_host = [environment objectForKey: @"MPD_HOST"];
+       if (mpd_host == nil)
+               mpd_host = @"localhost";
+       mpd_port_string = [environment objectForKey: @"MPD_PORT"];
+       if (mpd_port_string && [mpd_port_string decimalValue] <= UINT16_MAX)
+               mpd_port = (uint16_t) [mpd_port_string decimalValue];
+       else
+               mpd_port = 6600;
+       conn = [[MPDConnection alloc] initWithHost: mpd_host
+                                             port: mpd_port];
+       [conn connect];
        while (1) {
                OFAutoreleasePool *pool = [[OFAutoreleasePool alloc] init];
                @try {
@@ -81,12 +77,15 @@
                        tune = [OFXMLElement elementWithName: @"tune"
                                                   namespace: NS_TUNE];
                        [item addChild: tune];
-                       [sock writeLine: @"status"];
-                       response = [self MPD_responseFromSocket: sock];
+
+                       [conn send: @"command_list_begin"];
+                       [conn send: @"status"];
+                       [conn send: @"currentsong"];
+                       [conn send: @"command_list_end"];
+                       response = [conn response];
+
                        if ([[response objectForKey: @"state"]
                            isEqual: @"play"]) {
-                               [sock writeLine: @"currentsong"];
-                               response = [self MPD_responseFromSocket: sock];
                                if ((answer =
                                    [response objectForKey: @"Artist"]))
                                        [tune addChild: [OFXMLElement
@@ -110,6 +109,12 @@
                                            elementWithName: @"title"
                                                  namespace: NS_TUNE
                                                stringValue: answer]];
+                               else if ((answer =
+                                   [response objectForKey: @"file"]))
+                                       [tune addChild: [OFXMLElement
+                                           elementWithName: @"title"
+                                                 namespace: NS_TUNE
+                                               stringValue: answer]];
                                if ((answer =
                                    [response objectForKey: @"Track"]))
                                        [tune addChild: [OFXMLElement
@@ -118,11 +123,9 @@
                                                stringValue: answer]];
                        }
                        [object sendStanza: tuneIQ];
-                       [sock writeLine: @"idle player"];
-                       [self MPD_responseFromSocket: sock];
+                       [conn idle];
                } @catch (id e) {
-                       [self MPD_connect];
-                       [self MPD_responseFromSocket: sock];
+                       [conn connect];
                        [e release];
                }
                [pool release];