Merge pull request #27 from elan-ev/issue-25

Accurate Capture Agent from SOP

Author: ferishili

.gitignore

@@ -1,4 +1,6 @@
 node_modules
 .vscode
 assets
-*.zip
+*.zip
+.DS_Store
+.gitignore

LiveStreaming.php

@@ -10,7 +10,6 @@
  * published by the Free Software Foundation; either version 2 of
  * the License, or (at your option) any later version.
  */
-require_once __DIR__ . '/lib/locallib.inc.php';
 
 class LiveStreaming extends StudIPPlugin implements StandardPlugin, SystemPlugin
 {
@@ -27,7 +26,8 @@ public function __construct()
         bind_textdomain_codeset(static::GETTEXT_DOMAIN, 'UTF-8');
 
         StudipAutoloader::addClassLookups([
-            'LiveStream'        => __DIR__ . '/lib/LiveStream.php',
+            'LiveStream' => __DIR__ . '/lib/Models/LiveStream.php',
+            'LiveStreamLib' => __DIR__ . '/lib/LiveStreamLib.php',
         ]);
 
         if ($perm->have_perm('admin')) {
@@ -133,9 +133,10 @@ public function perform($unconsumed_path)
             $blubber = new Blubber();
             $blubber->addStylesheet('assets/stylesheets/blubber.less');
         }
-    
-        PageLayout::addStylesheet($this->getPluginURL() . '/assets/css/livestream.css');
-        PageLayout::addScript($this->getPluginURL() . '/assets/javascripts/livestream.js');
+
+        $plugin_version = $this->getLiveStreamingVersion();
+        PageLayout::addStylesheet($this->getPluginURL() . '/assets/css/livestream.css?v=' . $plugin_version);
+        PageLayout::addScript($this->getPluginURL() . '/assets/javascripts/livestream.js?v=' . $plugin_version);
 
         parent::perform($unconsumed_path);
     }
@@ -230,4 +231,20 @@ function checkOpenCast($cid = null) {
         }
         return false;
     }
+
+    /**
+     * Get the Plugin Version
+     *
+     * get the plugin manifest from PluginManager getPluginManifest method
+     *
+     * @return string plugin version
+     */
+    public function getLiveStreamingVersion()
+    {
+        $plugin_manager = \PluginManager::getInstance();
+        $this_plugin = $plugin_manager->getPluginInfo(__CLASS__);
+        $plugin_path = \get_config('PLUGINS_PATH') . '/' .$this_plugin['path'];
+        $manifest = $plugin_manager->getPluginManifest($plugin_path);
+        return $manifest['version'];
+    }
 }

assets/css/videoplayer.css

@@ -53,11 +53,11 @@ public function admin_action()
         $this->oc_player_url        = $livestream_config['oc_player_url'];
         $this->opencast_installed   = $this->plugin->checkOpenCast();
 
-        $this->url_placeholder  = URLPLACEHOLDER;
+        $this->url_placeholder  = LiveStreamLib::URLPLACEHOLDER;
 
     }
 
-     /**
+    /**
     * Inserts new player data or updates old data (streaming url, username, password)
     */
     public function admin_change_playerdata_action()
@@ -108,8 +108,8 @@ public function admin_change_playerdata_action()
                 //Clear all course in order to avoid conflict
                 $livestreams = LiveStream::findAll();
                 foreach ($livestreams as $livestream) {
-                    if ($livestream->mode == MODE_OPENCAST) {
-                        $livestream->mode = MODE_DEFAULT;
+                    if ($livestream->mode == LiveStreamLib::MODE_OPENCAST) {
+                        $livestream->mode = LiveStreamLib::MODE_DEFAULT;
                         $livestream->store();
                     }
                 }
@@ -123,7 +123,7 @@ public function admin_change_playerdata_action()
 
     private function checkUrl($url) {
         $res = true;
-        if (!filter_var($url, FILTER_VALIDATE_URL) || strpos($url, URLPLACEHOLDER) === FALSE) {
+        if (!filter_var($url, FILTER_VALIDATE_URL) || strpos($url, LiveStreamLib::URLPLACEHOLDER) === FALSE) {
             $res = false;
         }
         return $res;