Port for macOS (#311)

* merged moonlight-mac with moonlight-ios

* reverted to the original project.pbxproj

* cleaned up the code, fixed lots of unnecessary code duplications

* multicontroller support (not tested)

* new class that can be used for further modularization of the MainFrameViewController

Limelight/Network/AppAssetResponse.m

@@ -16,10 +16,16 @@
     self.statusMessage = @"App asset has no status message";
     self.statusCode = -1;
 }
-
+#if TARGET_OS_IPHONE
 - (UIImage*) getImage {
     UIImage* appImage = [[UIImage alloc] initWithData:self.data];
     return appImage;
 }
+#else
+- (NSImage*) getImage {
+    return nil;
+}
+#endif
+
 
 @end

Limelight/Network/AppAssetRetriever.m

@@ -18,16 +18,27 @@ static const double RETRY_DELAY = 2; // seconds
 static const int MAX_ATTEMPTS = 5;
 
 - (void) main {
+
+#if TARGET_OS_IPHONE
     UIImage* appImage = nil;
+#else
+    NSImage* appImage = nil;
+#endif
+    
     int attempts = 0;
     while (![self isCancelled] && appImage == nil && attempts++ < MAX_ATTEMPTS) {
         
         HttpManager* hMan = [[HttpManager alloc] initWithHost:_host.activeAddress uniqueId:[IdManager getUniqueId] deviceName:deviceName cert:[CryptoManager readCertFromFile]];
         AppAssetResponse* appAssetResp = [[AppAssetResponse alloc] init];
         [hMan executeRequestSynchronously:[HttpRequest requestForResponse:appAssetResp withUrlRequest:[hMan newAppAssetRequestWithAppId:self.app.id]]];
-        
+
+#if TARGET_OS_IPHONE
         appImage = [UIImage imageWithData:appAssetResp.data];
         self.app.image = UIImagePNGRepresentation(appImage);
+#else
+        
+#endif
+
         
         if (![self isCancelled] && appImage == nil) {
             [NSThread sleepForTimeInterval:RETRY_DELAY];

Limelight/Network/ConnectionHelper.h

@@ -0,0 +1,22 @@
+//
+//  ConnectionHelper.h
+//  Moonlight macOS
+//
+//  Created by Felix on 22.03.18.
+//  Copyright © 2018 Felix. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+#import "AppListResponse.h"
+
+#ifndef ConnectionHelper_h
+#define ConnectionHelper_h
+
+
+@interface ConnectionHelper : NSObject
+
++(AppListResponse*) getAppListForHostWithHostIP:(NSString*) hostIP deviceName:(NSString*)deviceName cert:(NSData*) cert uniqueID:(NSString*) uniqueId;
+
+@end
+
+#endif /* ConnectionHelper_h */

Limelight/Network/ConnectionHelper.m

@@ -0,0 +1,40 @@
+//
+//  ConnectionHelper.m
+//  Moonlight macOS
+//
+//  Created by Felix on 22.03.18.
+//  Copyright © 2018 Felix. All rights reserved.
+//
+
+#import "ConnectionHelper.h"
+#import "ServerInfoResponse.h"
+#import "HttpManager.h"
+#import "PairManager.h"
+#import "DiscoveryManager.h"
+
+@implementation ConnectionHelper
+
++(AppListResponse*) getAppListForHostWithHostIP:(NSString*) hostIP deviceName:(NSString*)deviceName cert:(NSData*) cert uniqueID:(NSString*) uniqueId {
+    HttpManager* hMan = [[HttpManager alloc] initWithHost:hostIP uniqueId:uniqueId deviceName:deviceName cert:cert];
+    
+    // Try up to 5 times to get the app list
+    AppListResponse* appListResp;
+    for (int i = 0; i < 5; i++) {
+        appListResp = [[AppListResponse alloc] init];
+        [hMan executeRequestSynchronously:[HttpRequest requestForResponse:appListResp withUrlRequest:[hMan newAppListRequest]]];
+        if (appListResp == nil || ![appListResp isStatusOk] || [appListResp getAppList] == nil) {
+            Log(LOG_W, @"Failed to get applist on try %d: %@", i, appListResp.statusMessage);
+            
+            // Wait for one second then retry
+            [NSThread sleepForTimeInterval:1];
+        }
+        else {
+            Log(LOG_I, @"App list successfully retreived - took %d tries", i);
+            return appListResp;
+        }
+    }
+    return nil;
+}
+
+@end
+