nicer naming scheme for streamer and porter

2 files changed, 17 insertions, 14 deletions

diff --git a/src/examples/elevate2018.yml b/src/examples/elevate2018.yml
index 5968b9a..38f24cf 100644
--- a/src/examples/elevate2018.yml
+++ b/src/examples/elevate2018.yml
@@ -1,7 +1,7 @@
 globals:
   templates: default
   version: 0.10.1
-  name: elevate-live
+  name: emc18
   description: "Live from Elevate Festival 2018"
   manager:
     machine: dione
@@ -34,12 +34,12 @@ globals:
     mjpeg: { 720p25: 95 }
   workers:
     dione: [ "input-*", "resize-*", "resample-*", "encode-*" ]
-    helene: [ "encode-sdi-orig-vp8-*", "encode-sdi-orig-h264-360p25", "mux-*", "port-local1*", "http-local1*", "record-*" ]
-    emc-00: [ "repeater-public*" ]
-    emc-01: [ "port-public1*", "http-public1*" ]
-    emc-02: [ "port-public2*", "http-public2*" ]
-    emc-03: [ "port-public3*", "http-public3*" ]
-    emc-04: [ "port-public4*", "http-public4*" ]
+    helene: [ "encode-sdi-orig-vp8-*", "encode-sdi-orig-h264-360p25", "mux-*", "http-local1*", "record-*" ]
+    emc-00: [ "repeat-public*" ]
+    emc-01: [ "http-public1*" ]
+    emc-02: [ "http-public2*" ]
+    emc-03: [ "http-public3*" ]
+    emc-04: [ "http-public4*" ]
 inputs:
   sdi-orig:
     type: decklink
diff --git a/src/flufigut.py b/src/flufigut.py
index 99631de..1f25c7a 100755
--- a/src/flufigut.py
+++ b/src/flufigut.py
@@ -311,17 +311,20 @@ class Planet:
 
     #
     # streams
-    def __create_porter(self, stream, idx, port, interface=None):
-        comp_name = 'port-%s%i-%i' % (stream, idx + 1, port)
+    def __create_porter(self, protocol, stream, idx, port, interface=None):
+        if protocol != "http":
+            raise Exception("unknown porter protocol '%s', currently only http porters are supported" % protocol)
+
+        comp_name = '%s-%s%i-port-%i' % (protocol, stream, idx + 1, port)
         addr = '*:%i' % (port)
         if interface:
-            comp_name = 'port-%s%i-%s-%i' % (stream, idx + 1, interface, port)
+            comp_name = '%s-%s%i-port-%s-%i' % (protocol, stream, idx + 1, interface, port)
             addr = '%s:%i' % (interface, port)
 
         porter = Porter(comp_name, interface, port)
         self.atmosphere[porter.name] = {
             'type': "porter",
-            'desc': "Porter for %s%i on %s" % (stream, idx + 1, addr),
+            'desc': "%s porter %s%i on %s" % (protocol, stream, idx + 1, addr),
             'worker': self.__get_worker(comp_name),
             'properties': {
                 'port': port,
@@ -336,7 +339,7 @@ class Planet:
         return porter
 
     def __generate_stream_mux_repeater(self, stream, mux, format, profile, feeder):
-        comp_name = 'repeater-%s-%s-%s-%s' % (stream, mux, format, profile)
+        comp_name = 'repeat-%s-%s-%s-%s' % (stream, mux, format, profile)
 
         if comp_name in self.flow['repeaters']:
             return comp_name
@@ -388,7 +391,7 @@ class Planet:
         if 'repeater' in stream:
             feeder = self.__generate_stream_mux_repeater(stream_name, mux, format, profile, muxer_feed)
 
-        comp_name = '%s-%s%i-%s-%s-%s' % (stream['type'], stream_name, idx + 1, mux, format, profile)
+        comp_name = '%s-%s%i-stream-%s-%s-%s' % (stream['type'], stream_name, idx + 1, mux, format, profile)
         mount_point = '/%s-%s-%s.%s' % (mux, format, profile, self._desc.globals['formats'][format]['muxer'])
         hostname = stream['hostname']
         hostname_next = None
@@ -423,7 +426,7 @@ class Planet:
         interface = None
         if 'interface' in stream:
             interface = stream['interface']
-        porter = self.__create_porter(stream_name, idx, port, interface)
+        porter = self.__create_porter(stream['type'], stream_name, idx, port, interface)
         for mux_name in stream['muxes']:
             for format_name, format in self._desc.muxes[mux_name]['formats'].items():
                 for profile_name in format: