dedupe, don't getpass if no keyfil (just print command), increase test robustness and coverage

Author: scivision

PyLivestream/__init__.py

@@ -1,5 +1,4 @@
 from pathlib import Path
-from getpass import getpass
 import numpy as np
 import subprocess as sp
 import logging,os,sys
@@ -86,8 +85,8 @@ def get_resolution(fn:Path) -> tuple:
 # %% top level
 class Stream:
 
-    def __init__(self,ini,site,vidsource,image=False,loop=False,infn=None):
-        self.ini = ini
+    def __init__(self,ini:Path, site:str, vidsource:str, image:bool=False, loop:bool=False, infn:Path=None):
+        self.ini = Path(ini).expanduser()
         self.site = site
         self.vidsource = vidsource
         self.image = image
@@ -98,6 +97,8 @@ def __init__(self,ini,site,vidsource,image=False,loop=False,infn=None):
     def osparam(self):
         """load OS specific config"""
 
+        assert self.ini.is_file(),'{} not found.'.format(self.ini)
+
         C = ConfigParser()
         C.read(str(self.ini))
 
@@ -200,7 +201,7 @@ def audiocomp(self) -> list:
                 '-ar', self.audiofs]
 
 
-    def video_bitrate(self) -> list:
+    def video_bitrate(self):
         """get "best" video bitrate.
         Based on YouTube Live minimum specified stream rate."""
         if self.video_kbps: # per-site override
@@ -304,7 +305,7 @@ class Livestream(Stream):
     def __init__(self,ini,site,vidsource,image=False,loop=False,infn=None):
         super().__init__(ini,site,vidsource,image,loop,infn)
 
-        self.site = site
+        self.site = site.lower()
 
         self.osparam()
 
@@ -322,8 +323,7 @@ def __init__(self,ini,site,vidsource,image=False,loop=False,infn=None):
         if self.key:
             streamid = self.key
         else:
-            print('\n',' '.join(cmd),'\n')
-            streamid = getpass('{} Live Stream ID: '.format(self.site))
+            streamid = ''
 
         self.sink = [self.server + streamid]
 
@@ -333,7 +333,7 @@ def __init__(self,ini,site,vidsource,image=False,loop=False,infn=None):
     def golive(self, sinks:list=None):
         """finally start the stream(s)"""
 
-        if self.sink[0].endswith('test'):
+        if self.key is None:
             print('\n',' '.join(self.cmd),'\n')
             return
 
@@ -362,9 +362,6 @@ def __init__(self, ini:Path, sites:list):
         if isinstance(sites,str):
             sites = [sites]
 
-        sites = [site.lower() for site in sites]
-        ini=Path(ini).expanduser()
-
         streams = []
         for site in sites:
             print('Config',site)
@@ -388,9 +385,6 @@ def __init__(self, ini:Path, sites:list):
         if isinstance(sites,str):
             sites = [sites]
 
-        sites = [site.lower() for site in sites]
-        ini=Path(ini).expanduser()
-
         streams = []
         for site in sites:
             print('Config',site)
@@ -409,9 +403,7 @@ class FileIn(Livestream):
 
     def __init__(self, ini:Path, site:str, infn:Path, loop:bool=False, image:bool=False):
 
-        site = site.lower()
         vidsource = 'file'
-        ini=Path(ini).expanduser()
 
         stream = Livestream(ini, site, vidsource, image, loop, infn)
 
@@ -428,7 +420,6 @@ def __init__(self, ini:Path, outfn:Path=None, clobber:bool=False):
         """
         site = 'file'
         vidsource = 'screen'
-        ini=Path(ini).expanduser()
 
         super().__init__(ini,site,vidsource)
 

tests/test.ini

@@ -35,37 +35,37 @@ exe: /usr/bin/ffmpeg
 # per-site config
 [youtube]
 server: rtmp://a.rtmp.youtube.com/live2/
-key: test.key
+key:
 
 [periscope]
 video_kbps: 800
 audio_bps: 64k
 server: rtmp://va.pscp.tv:80/x/
-key: test.key
+key:
 
 [facebook]
 server: rtmp://live-api.facebook.com:80/rtmp/
-key: test.key
+key:
 
 [twitch]
 audio_bps: 96k
 server: rtmp://live-jfk.twitch.tv/app/
-key: test.key
+key:
 
 [mixer]
 keyframe_sec: 1
 server: rtmp://ingest-wdc.mixer.com:1935/beam
-key: test.key
+key:
 
 [ustream]
 keyframe_sec: 1
 audio_bps: 128k
 server:
-key: test.key
+key:
 
 [vimeo]
 server: rtmp://rtmp.cloud.vimeo.com/
-key: test.key
+key:
 
 [file]
 video_kbps: 3000

tests/test.key

@@ -1,12 +1,11 @@
 #!/usr/bin/env python
 from pathlib import Path
-import os
+import numpy
 import PyLivestream
 
 rdir = Path(__file__).parent
-os.chdir(str(rdir))
 
-inifn =  'test.ini'
+inifn =  rdir/'test.ini'
 sites = ['periscope','youtube','facebook','twitch','mixer','ustream','vimeo']
 
 
@@ -22,9 +21,13 @@ def test_webcam():
 
 def test_loop():
     for s in sites:
-        PyLivestream.FileIn(inifn,s, 'star_collapse_out.avi')
+        PyLivestream.FileIn(inifn,s, rdir/'star_collapse_out.avi')
 
 
 def test_disk():
     for s in sites:
-        PyLivestream.SaveDisk(inifn, '')
+        PyLivestream.SaveDisk(inifn, '')
+
+
+if __name__ == '__main__':
+    numpy.testing.run_module_suite()