Move MPD connection in a separate class

[mpdbot.git] / src / PEPThread.m

diff --git a/src/PEPThread.m b/src/PEPThread.m
index cd13eb382ca57452cf979da8426fc777f83c4131..80577e100fc73e19977a51b39b8e8f842f318f36 100644 (file)
--- a/src/PEPThread.m
+++ b/src/PEPThread.m
@@ -31,52 +31,15 @@
 @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: mpd_host
-                                      port: mpd_port];
-                       return;
-               } @catch (id e) {
-                       [of_stderr writeFormat: @"Connection failed, retrying"
-                               @" in %" PRIi64 @" seconds\n", 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
 {
+       OFString *mpd_host;
+       uint16_t mpd_port;
        OFDictionary *environment = [OFApplication environment];
        OFString *mpd_port_string;
        mpd_host = [environment objectForKey: @"MPD_HOST"];
@@ -87,8 +50,9 @@
                mpd_port = (uint16_t) [mpd_port_string decimalValue];
        else
                mpd_port = 6600;
-       [self MPD_connect];
-       [self MPD_responseFromSocket: sock];
+       conn = [[MPDConnection alloc] initWithHost: mpd_host
+                                             port: mpd_port];
+       [conn connect];
        while (1) {
                OFAutoreleasePool *pool = [[OFAutoreleasePool alloc] init];
                @try {
@@ -113,12 +77,12 @@
                        tune = [OFXMLElement elementWithName: @"tune"
                                                   namespace: NS_TUNE];
                        [item addChild: tune];
-                       [sock writeLine: @"status"];
-                       response = [self MPD_responseFromSocket: sock];
+                       [conn send: @"status"];
+                       response = [conn response];
                        if ([[response objectForKey: @"state"]
                            isEqual: @"play"]) {
-                               [sock writeLine: @"currentsong"];
-                               response = [self MPD_responseFromSocket: sock];
+                               [conn send: @"currentsong"];
+                               response = [conn response];
                                if ((answer =
                                    [response objectForKey: @"Artist"]))
                                        [tune addChild: [OFXMLElement
@@ -150,11 +114,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];