In AppDelegate, the updateCurrentTasksText method will include the icecastStatusDictionary obtained from the Icecast server at /admin/stats .

In EZStreamController and IcecastController, the server config files for Icecast and EZStream are changed to use the Icecast password generated by the app.

In IcecastController, the icecastStatusDictionary method sets a flag when an update query is in progress.  If an update is in progress when icecastStatusDictionary is called, a copy of the most recent dictionary is returned.

In WebServerConnection, some instrumentation was added to log requests and file responses.

Author: dsward2

LocalRadio/AppDelegate.m

@@ -248,12 +248,21 @@ - (void)updateCurrentTasksText
 
         [tasksString appendFormat:@"%@ %@\n\n",
             self.icecastController.quotedIcecastPath, self.icecastController.icecastTaskArgsString];
+
+        AppDelegate * appDelegate = (AppDelegate *)[NSApp delegate];
+        IcecastController * icecastController = appDelegate.icecastController;
+        NSDictionary * icecastStatusDictionary = [icecastController icecastStatusDictionary];
+
+        NSString * icecastStatusString = [icecastStatusDictionary description];
+        [tasksString appendString:icecastStatusString];
+
+        [tasksString appendString:@"\n\n"];
     }
     else
     {
         [tasksString appendString:@"No tasks currently running\n\n"];
     }
-    
+
     [tasksString appendString:@"--- EZStream tasks ---"];
 
     NSString * ezStreamTasksString = self.ezStreamController.ezStreamTaskPipelineManager.tasksInfoString;

LocalRadio/Base.lproj/MainMenu.xib

@@ -972,7 +972,7 @@ Gw
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <clipView key="contentView" ambiguous="YES" id="pWY-8B-R8i">
                             <rect key="frame" x="1" y="0.0" width="673" height="315"/>
-                            <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                            <autoresizingMask key="autoresizingMask"/>
                             <subviews>
                                 <tableView verticalHuggingPriority="750" allowsExpansionToolTips="YES" multipleSelection="NO" emptySelection="NO" autosaveColumns="NO" typeSelect="NO" rowHeight="20" rowSizeStyle="automatic" headerView="xpx-kQ-Qcl" viewBased="YES" floatsGroupRows="NO" id="3dz-1S-5uR">
                                     <rect key="frame" x="0.0" y="0.0" width="673" height="292"/>
@@ -1354,11 +1354,11 @@ Gw
                         <tabViewItems>
                             <tabViewItem label="LocalRadio" identifier="" id="8Qy-d0-fpa">
                                 <view key="view" id="bIe-XZ-nnh">
-                                    <rect key="frame" x="10" y="33" width="450" height="548"/>
+                                    <rect key="frame" x="10" y="33" width="197" height="0.0"/>
                                     <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                     <subviews>
                                         <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" fixedFrame="YES" allowsCharacterPickerTouchBarItem="YES" translatesAutoresizingMaskIntoConstraints="NO" id="uQZ-Iv-hbS" customClass="URLTextField">
-                                            <rect key="frame" x="15" y="505" width="420" height="32"/>
+                                            <rect key="frame" x="15" y="-43" width="420" height="32"/>
                                             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                                             <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" allowsUndo="NO" sendsActionOnEndEditing="YES" alignment="center" id="x1K-dl-dH5">
                                                 <font key="font" size="22" name="CourierNewPSMT"/>
@@ -1371,14 +1371,14 @@ Gw
                                             </connections>
                                         </textField>
                                         <customView fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="T93-lK-wzp">
-                                            <rect key="frame" x="-3" y="-3" width="452" height="500"/>
+                                            <rect key="frame" x="-3" y="-551" width="452" height="500"/>
                                             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                                         </customView>
                                     </subviews>
                                 </view>
                             </tabViewItem>
                             <tabViewItem label="Status" identifier="" id="GvX-g5-9UV">
-                                <view key="view" ambiguous="YES" id="qnk-kF-EPU">
+                                <view key="view" id="qnk-kF-EPU">
                                     <rect key="frame" x="10" y="33" width="450" height="548"/>
                                     <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                     <subviews>
@@ -1394,7 +1394,7 @@ Gw
                                                         <autoresizingMask key="autoresizingMask"/>
                                                         <clipView key="contentView" ambiguous="YES" id="XFC-hX-hWd">
                                                             <rect key="frame" x="1" y="1" width="432" height="184"/>
-                                                            <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                                                            <autoresizingMask key="autoresizingMask"/>
                                                             <subviews>
                                                                 <textView ambiguous="YES" editable="NO" importsGraphics="NO" richText="NO" verticallyResizable="YES" findStyle="panel" allowsNonContiguousLayout="YES" id="ydX-HH-DPt">
                                                                     <rect key="frame" x="0.0" y="0.0" width="432" height="184"/>
@@ -1412,7 +1412,7 @@ Gw
                                                             <autoresizingMask key="autoresizingMask"/>
                                                         </scroller>
                                                         <scroller key="verticalScroller" verticalHuggingPriority="750" doubleValue="1" horizontal="NO" id="St6-kL-Qjl">
-                                                            <rect key="frame" x="417" y="1" width="16" height="184"/>
+                                                            <rect key="frame" x="-15" y="1" width="16" height="0.0"/>
                                                             <autoresizingMask key="autoresizingMask"/>
                                                         </scroller>
                                                     </scrollView>
@@ -1748,7 +1748,7 @@ Gw
                                 </view>
                             </tabViewItem>
                             <tabViewItem label="Configuration" identifier="" id="Amd-pe-F7E">
-                                <view key="view" id="QdK-3V-Sdm">
+                                <view key="view" ambiguous="YES" id="QdK-3V-Sdm">
                                     <rect key="frame" x="10" y="33" width="450" height="548"/>
                                     <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                     <subviews>
@@ -1897,7 +1897,7 @@ Gw
                                                     <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" fixedFrame="YES" allowsCharacterPickerTouchBarItem="YES" translatesAutoresizingMaskIntoConstraints="NO" id="uJW-ps-tz3">
                                                         <rect key="frame" x="182" y="33" width="215" height="17"/>
                                                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
-                                                        <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="myPassword123" id="90O-nw-YGp">
+                                                        <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" sendsActionOnEndEditing="YES" title="myPassword123" id="90O-nw-YGp">
                                                             <font key="font" metaFont="system"/>
                                                             <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
                                                             <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
@@ -2067,7 +2067,7 @@ Gw
                     </tabView>
                 </subviews>
             </view>
-            <point key="canvasLocation" x="-270" y="208"/>
+            <point key="canvasLocation" x="-474" y="224"/>
         </window>
     </objects>
 </document>

LocalRadio/EZStreamController.m

@@ -182,8 +182,10 @@ - (NSString *)writeEZStreamConfig
 {
     // write a fresh copy of ezstream_mp3.xml to the (sandboxed) Application Support directory for this app, and return the path
 
+    NSNumber * httpServerPortNumber = [self.appDelegate.localRadioAppSettings integerForKey:@"HTTPServerPort"];
     NSNumber * icecastServerModeNumber = [self.appDelegate.localRadioAppSettings integerForKey:@"IcecastServerMode"];
     NSString * icecastServerHost = [self.appDelegate.localRadioAppSettings valueForKey:@"IcecastServerHost"];
+    NSString * icecastServerSourcePassword = [self.appDelegate.localRadioAppSettings valueForKey:@"IcecastServerSourcePassword"];
     NSString * icecastServerMountName = [self.appDelegate.localRadioAppSettings valueForKey:@"IcecastServerMountName"];
     NSNumber * icecastServerPortNumber = [self.appDelegate.localRadioAppSettings integerForKey:@"IcecastServerPort"];
 
@@ -293,7 +295,16 @@ - (NSString *)writeEZStreamConfig
         NSXMLElement * svrinfopublicElement = svrinfopublicResultArray.firstObject;
         [svrinfopublicElement setStringValue:@"0"];
     }
-    
+
+    // <sourcepassword>sourcepassword</sourcepassword>
+    NSString * sourcePasswordQuery = @"sourcepassword";
+    NSArray * sourcePasswordResultArray = [rootElement nodesForXPath:sourcePasswordQuery error:&error];
+    if (sourcePasswordResultArray.count > 0)
+    {
+        NSXMLElement * sourcePasswordElement = sourcePasswordResultArray.firstObject;
+        [sourcePasswordElement setStringValue:icecastServerSourcePassword];
+    }
+
     NSString * xmlString = [xmlDocument XMLString];
     NSString * newEZStreamConfigPath = [applicationSupportDirectoryPath stringByAppendingPathComponent:@"ezstream_mp3.xml"];
     NSError * writeError = NULL;

LocalRadio/IcecastController.h

@@ -28,6 +28,9 @@
 @property (strong) NSString * icecastTaskArgsString;
 @property (strong) NSString * quotedIcecastPath;
 
+@property (strong) NSDictionary * lastIcecastStatusDictionary;
+@property (assign) BOOL icecastStatusBusy;
+
 @property (assign) int icecastTaskProcessID;
 
 - (void)terminateTasks;