CC-3224: "On-the-fly" stream rebroadcasting

- A section where user can setup port and mount point for harbor input in
stream setting page(front-end and back-end)
- updated the part where it rewrites the liquidsoap.cfg file

airtime_mvc/application/controllers/ApiController.php

@@ -805,8 +805,11 @@ class ApiController extends Zend_Controller_Action
             print 'You are not allowed to access this resource.';
             exit;
         }
-
+        
-        $this->view->msg = Application_Model_StreamSetting::getStreamSetting();
+        $info = Application_Model_StreamSetting::getStreamSetting();
+        $info[] = (array("keyname" =>"harbor_input_port", "value"=>Application_Model_Preference::GetLiveSteamPort(), "type"=>"integer"));
+        $info[] = (array("keyname" =>"harbor_input_mount_point", "value"=>Application_Model_Preference::GetLiveSteamMountPoint(), "type"=>"string"));
+        $this->view->msg = $info;
     }
 
     public function statusAction() {

airtime_mvc/application/controllers/PreferenceController.php

@@ -207,6 +207,8 @@ class PreferenceController extends Zend_Controller_Action
                 Application_Model_StreamSetting::setStreamSetting($values);
                 $data = array();
                 $data['setting'] = Application_Model_StreamSetting::getStreamSetting();
+                $data['setting']['harbor_input_port'] = $values["harbor_input_port"];
+                $data['setting']['harbor_input_mount_point'] = $values["harbor_input_mount_point"];
                 for($i=1;$i<=$num_of_stream;$i++){
                     Application_Model_StreamSetting::setLiquidsoapError($i, "waiting");
                 }
@@ -215,7 +217,8 @@ class PreferenceController extends Zend_Controller_Action
                 Application_Model_Preference::SetLiveSteamAutoEnable($values["auto_enable_live_stream"]);
                 Application_Model_Preference::SetLiveSteamMasterUsername($values["master_username"]);
                 Application_Model_Preference::SetLiveSteamMasterPassword($values["master_password"]);
-                
+                Application_Model_Preference::SetLiveSteamPort($values["harbor_input_port"]);
+                Application_Model_Preference::SetLiveSteamMountPoint($values["harbor_input_mount_point"]);
                 // store stream update timestamp
                 Application_Model_Preference::SetStreamUpdateTimestamp();
                 Application_Model_RabbitMq::SendMessageToPypo("update_stream_setting", $data);

airtime_mvc/application/forms/LiveStreamingPreferences.php

@@ -36,5 +36,22 @@ class Application_Form_LiveStreamingPreferences extends Zend_Form_SubForm
                         ->setFilters(array('StringTrim'))
                         ->setDecorators(array('ViewHelper'));
         $this->addElement($master_password);
+        
+        //liquidsoap harbor.input port
+        $port = new Zend_Form_Element_Text('harbor_input_port');
+        $port->setLabel("Port to Connect")
+                ->setValue(Application_Model_Preference::GetLiveSteamPort())
+                ->setValidators(array(new Zend_Validate_Between(array('min'=>0, 'max'=>99999))))
+                ->addValidator('regex', false, array('pattern'=>'/^[0-9]+$/', 'messages'=>array('regexNotMatch'=>'Only numbers are allowed.')))
+                ->setDecorators(array('ViewHelper'));
+        $this->addElement($port);
+        
+        $mount = new Zend_Form_Element_Text('harbor_input_mount_point');
+        $mount->setLabel("Mount Point to Connect")
+                ->setValue(Application_Model_Preference::GetLiveSteamMountPoint())
+                ->setValidators(array(
+                        array('regex', false, array('/^[^ &<>]+$/', 'messages' => 'Invalid character entered'))))
+                ->setDecorators(array('ViewHelper'));
+        $this->addElement($mount);
     }
 }

airtime_mvc/application/models/Preference.php

@@ -729,6 +729,21 @@ class Application_Model_Preference
         return self::GetValue("live_stream_master_password");
     }
     
+    public static function SetLiveSteamPort($value){
+        self::SetValue("live_stream_port", $value, false);
+    }
+    
+    public static function GetLiveSteamPort(){
+        return self::GetValue("live_stream_port");
+    }
+    
+    public static function SetLiveSteamMountPoint($value){
+        self::SetValue("live_stream_mp", $value, false);
+    }
+    
+    public static function GetLiveSteamMountPoint(){
+        return self::GetValue("live_stream_mp");
+    }
     /* User specific preferences end */
 }
 

airtime_mvc/application/views/scripts/form/preferences_livestream.phtml

@@ -43,5 +43,33 @@
                 </ul>
             <?php endif; ?> 
         </dd>
+        <dt id="harbor_input_port-label">
+            <label class="optional" for="harbor_input_port"><?php echo $this->element->getElement('harbor_input_port')->getLabel() ?> :
+            </label>
+        </dt>
+        <dd id="harbor_input_port-element">
+            <?php echo $this->element->getElement('harbor_input_port') ?>
+            <?php if($this->element->getElement('harbor_input_port')->hasErrors()) : ?>
+                <ul class='errors'>
+                    <?php foreach($this->element->getElement('harbor_input_port')->getMessages() as $error): ?>
+                        <li><?php echo $error; ?></li>
+                    <?php endforeach; ?>
+                </ul>
+            <?php endif; ?> 
+        </dd>
+        <dt id="harbor_input_mount_point-label">
+            <label class="optional" for="harbor_input_mount_point"><?php echo $this->element->getElement('harbor_input_mount_point')->getLabel() ?> :
+            </label>
+        </dt>
+        <dd id="harbor_input_mount_point-element">
+            <?php echo $this->element->getElement('harbor_input_mount_point') ?>
+            <?php if($this->element->getElement('harbor_input_mount_point')->hasErrors()) : ?>
+                <ul class='errors'>
+                    <?php foreach($this->element->getElement('harbor_input_mount_point')->getMessages() as $error): ?>
+                        <li><?php echo $error; ?></li>
+                    <?php endforeach; ?>
+                </ul>
+            <?php endif; ?> 
+        </dd>
     </dl>
 </fieldset>

airtime_mvc/public/css/styles.css

@@ -2110,9 +2110,6 @@ dd .info-text-small {
 .simple-formblock .display_field dd {
 	min-width:68%;
 }
-.stream-config dd input[id$=port] {
-    width:152px;
-}
 
 dt.block-display.info-block {
     width: auto;

python_apps/pypo/liquidsoap_scripts/ls_script.liq

@@ -54,7 +54,7 @@ def check_client(user,password) =
         end
 end
 
-live = input.harbor("test", port=8080, auth=check_client)
+live = input.harbor(harbor_input_mount_point, port=harbor_input_port, auth=check_client)
 
 s = fallback(track_sensitive=false, [live, queue, default])
 

python_apps/pypo/pypofetch.py

@@ -155,6 +155,10 @@ class PypoFetch(Thread):
                 if (existing[s[u'keyname']] != s[u'value']):
                     self.logger.info("'Need-to-restart' state detected for %s...", s[u'keyname'])
                     restart = True;
+            elif "harbor_input_mount_point" in s[u'keyname'] or "harbor_input_port" in s[u'keyname']:
+                if (existing[s[u'keyname']] != s[u'value']):
+                    logger.info("'Need-to-restart' state detected for %s...", s[u'keyname'])
+                    restart = True;
             else:
                 stream, dump = s[u'keyname'].split('_',1)
                 if "_output" in s[u'keyname']: