tiny-dlna 0.7.3__tar.gz → 0.9.0__tar.gz

{tiny-dlna-0.7.3 → tiny-dlna-0.9.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: tiny-dlna
-Version: 0.7.3
+Version: 0.9.0
 Summary: a tiny DLNA sender & receiver
 Home-page: https://github.com/mitnk/tiny-dlna
 Author: mitnk

{tiny-dlna-0.7.3 → tiny-dlna-0.9.0}/README.md

@@ -1,12 +1,14 @@
 # Tiny DLNA
 
+[![PyPI](https://img.shields.io/pypi/v/tiny-dlna.svg)](https://pypi.org/project/tiny-dlna/)
+
 ## Install
 
 ```
 $ pip install tiny-dlna
 ```
 
-## Tiny DLNA Render
+## Usage for Tiny DLNA Render
 
 Just to support subtitles.
 
@@ -19,7 +21,13 @@ from apps like 虎牙直播, Bilibili, and other video platforms. Additionally,
 can also use `tiny-cli play` (see below) to play local videos (like in your
 RaspberryPi) on it.
 
-## Tiny DLNA Cli
+### Save video streaming into a file (Stream Recording)
+
+```
+$ tiny-render --dump-to ~/Movie/lol-msi-2024.mp4
+```
+
+## Usage for Tiny DLNA Cli
 
 List available DLNA devices:
 ```

{tiny-dlna-0.7.3 → tiny-dlna-0.9.0}/setup.py

@@ -40,7 +40,7 @@ Play a video on the DLNA device having "TV" in its name.
 
 setup(
     name='tiny-dlna',
-    version='0.7.3',
+    version='0.9.0',
     description='a tiny DLNA sender & receiver',
     long_description=DESC,
     url='https://github.com/mitnk/tiny-dlna',

{tiny-dlna-0.7.3 → tiny-dlna-0.9.0}/tiny_dlna/tiny_cli.py

@@ -13,6 +13,7 @@ import xml.etree.ElementTree as ET
 
 from flask import Flask, send_from_directory
 from xml.sax.saxutils import escape as xmlescape
+from urllib.error import URLError
 from .tiny_ssdp import SSDP_MULTICAST_IP, SSDP_PORT, get_host_ip
 from .tiny_xmls import *  # NOQA
 
@@ -104,7 +105,12 @@ def get_dlna_devices():
     while True:
         try:
             data, addr = sock.recvfrom(1024)
-            device = _parse_ssdp_response(data.decode('utf-8'))
+            try:
+                device = _parse_ssdp_response(data.decode('utf-8'))
+            except URLError:
+                # render url does not respond
+                continue
+
             location = device.get('location')
             logger.debug(f'got reply from {addr}, Location: {location}')
             if device and location not in known_locations:

{tiny-dlna-0.7.3 → tiny-dlna-0.9.0}/tiny_dlna/tiny_render.py

@@ -2,6 +2,8 @@ import argparse
 import html
 import logging
 import re
+import os.path
+import signal
 import subprocess
 import threading
 import time
@@ -9,25 +11,31 @@ import xml.etree.ElementTree as ET
 
 from flask import Flask, request, Response
 from .tiny_ssdp import get_uuid, ssdp_listener
+from .tiny_ssdp import register_render, unregister_render
 from .tiny_xmls import *  # NOQA
 
 app = Flask(__name__)
 logger = logging.getLogger('tiny_render')
+PORT_DEFAULT = 59876
 
 
 class MPVRenderer:
     def __init__(self):
         self.process = None
 
-    def play_media(self, url, title=None, srt=None):
+    def play_media(self, url, title=None, srt=None, dump_to=None):
         self.stop_media()  # Stop any existing media
         cmd = ['mpv', url]
+
+        if dump_to:
+            path_abs = os.path.abspath(dump_to)
+            cmd.append(f'--stream-record={path_abs}')
         if title:
             cmd.append('--title={}'.format(title))
         if srt:
             cmd.append('--sub-file={}'.format(srt))
 
-        logger.debug(f'running mpv: {cmd}')
+        logger.debug('running: {}'.format(' '.join(cmd)))
         self.process = subprocess.Popen(cmd, stderr=subprocess.DEVNULL)
 
     def stop_media(self):
@@ -42,6 +50,7 @@ _DATA = {
     'CURRENT_URI': '',
     'CURRENT_SRT': '',
     'VIDEO_TITLE': '',
+    'DUMP_TO': None,
     'STARTED_AT': 0,
 }
 
@@ -49,7 +58,7 @@ _DATA = {
 @app.route('/description.xml')
 def description():
     friendly_name = app.config['FRIENDLY_NAME']
-    uuid_str = get_uuid()
+    uuid_str = get_uuid(app.config['PORT'])
     xml = XML_DESC_PTN.format(friendly_name, uuid_str)
     resp = Response(xml, mimetype="text/xml")
     resp.headers['Server'] = 'UPnP/1.0 Werkzeug/3.0 TinyRender/0.7'
@@ -161,12 +170,17 @@ def control():
         return Response(XML_AVSET_DONE, mimetype="text/xml")
 
     elif is_play(request):
+        if _DATA['STARTED_AT'] > 0 and _DATA['DUMP_TO']:
+            app.config['STOP'] = True
+            exit(0)
+
         _DATA['STARTED_AT'] = time.time()
         url = _DATA['CURRENT_URI']
         srt = _DATA['CURRENT_SRT']
         title = _DATA['VIDEO_TITLE']
+        dump_to = _DATA['DUMP_TO']
         logger.debug(f'action: Play: {url}')
-        renderer.play_media(url, title, srt)
+        renderer.play_media(url, title, srt, dump_to)
         return Response(XML_PLAY_DONE, mimetype="text/xml")
 
     elif is_getpos(request):
@@ -183,6 +197,11 @@ def control():
     elif is_stop(request):
         logger.debug('stopping')
 
+        if _DATA['STARTED_AT'] > 0 and _DATA['DUMP_TO']:
+            app.config['STOP'] = True
+            logger.info('stopping the recorder as a whole')
+            exit(0)
+
         _DATA['CURRENT_URI'] = ''
         _DATA['CURRENT_SRT'] = ''
         _DATA['VIDEO_TITLE'] = ''
@@ -199,19 +218,60 @@ def control():
 
 
 class SSDPServer(threading.Thread):
-    def __init__(self, render_port):
+    def __init__(self):
         super().__init__()
-        self.render_port = render_port
 
     def run(self):
-        ssdp_listener(self.render_port)
+        while True:
+            try:
+                ssdp_listener()
+            except OSError:
+                # another SSDP Server is running
+                time.sleep(0.05)
+                continue
+            break
+
+
+def _get_friendly_name(args):
+    if not args.name:
+        return 'Tiny Recorder' if args.dump_to else 'Tiny Render'
+
+    if args.dump_to:
+        return args.name + f' (Recorder)'
+
+    return args.name
+
+
+def flask_app_monitor(uuid, port):
+    to_stop = app.config.get('STOP')
+    while app.config.get('STOP') is None:
+        time.sleep(0.05)
+
+    unregister_render(uuid)
+    logger.debug(f'unregistered render: {uuid}')
+    logger.info('killing render process. mpv process is left open')
+    pid = os.getpid()
+    os.kill(pid, signal.SIGTERM)
+
+
+def signal_handler(signal, frame):
+    logger.debug('got killing signal')
+    uuid = get_uuid(app.config['PORT'])
+    unregister_render(uuid)
+    logger.debug(f'unregistered render: {uuid}')
+    exit(0)
+
+signal.signal(signal.SIGINT, signal_handler)
+signal.signal(signal.SIGTERM, signal_handler)
 
 
 def main():
     parser = argparse.ArgumentParser(prog='tiny-render')
     parser.add_argument('--http-logs', action='store_true', help='Enable server logs')
     parser.add_argument('--verbose', '-v', action='store_true', help='Enable debug logs')
-    parser.add_argument('--name', type=str, default='Tiny Render', help='Change render name')
+    parser.add_argument('--name', type=str, help='Specify render name')
+    parser.add_argument('--port', type=int, default=0, help='Server Port')
+    parser.add_argument('--dump-to', type=str, help='dump streaming to a file')
 
     args = parser.parse_args()
 
@@ -226,15 +286,48 @@ def main():
 
     if args.verbose:
         logger.setLevel(logging.DEBUG)
+    else:
+        logger.setLevel(logging.INFO)
+
+    port = PORT_DEFAULT
+    if args.dump_to:
+        file_dump = os.path.abspath(args.dump_to)
+        if os.path.exists(file_dump):
+            logger.error(f'target file exists: {file_dump}')
+            exit(1)
 
-    port = 59876
-    ssdp = SSDPServer(port)
+        _DATA['DUMP_TO'] = args.dump_to
+        port += 1
+
+    if args.port:
+        port = args.port
+
+    ssdp = SSDPServer()
     ssdp.start()
 
-    friendly_name = args.name
+    friendly_name = _get_friendly_name(args)
     app.config['FRIENDLY_NAME'] = friendly_name
-    logging.info(f'Starting DLNA Receiver: {friendly_name}')
-    app.run(host="0.0.0.0", port=port, debug=False)
+    app.config['PORT'] = port
+    logger.info(f'Starting DLNA Receiver: {friendly_name}')
+    if args.dump_to:
+        logger.info(f'Recording stream to {args.dump_to}')
+
+    uuid = get_uuid(port)
+    register_render(uuid, friendly_name, port)
+    logger.debug(f'registered render {uuid}')
+
+    app_server = threading.Thread(
+        target=app.run,
+        kwargs={'host': '0.0.0.0', 'port': port},
+    )
+    app_server.start()
+
+    thread = threading.Thread(
+        target=flask_app_monitor,
+        kwargs={'uuid': uuid, 'port': port},
+    )
+    thread.start()
+    thread.join()
 
 
 if __name__ == "__main__":

{tiny-dlna-0.7.3 → tiny-dlna-0.9.0}/tiny_dlna/tiny_ssdp.py

@@ -9,27 +9,85 @@ import uuid
 SSDP_MULTICAST_IP = '239.255.255.250'
 SSDP_PORT = 1900
 logger = logging.getLogger('tiny_ssdp')
+logger.setLevel(logging.DEBUG)
+
 ST_VALUE_MEDIARENDERER = 'mediarenderer'
 ST_VALUE_AVTRANSPORT = 'avtransport'
 
 
-def get_uuid():
+def get_config_file(file_name):
     home_dir = os.path.expanduser('~')
     app_data_dir = os.path.join(home_dir, '.config', 'tiny-dlna')
     os.makedirs(app_data_dir, exist_ok=True)
-    config_file = os.path.join(app_data_dir, 'tiny-render.json')
+    return os.path.join(app_data_dir, file_name)
+
+
+def register_render(uuid, name, port):
+    config_file = get_config_file('live-renders.json')
+    data = {'renders': []}
+    if os.path.exists(config_file):
+        with open(config_file) as f:
+            data = json.load(f)
+
+    found = False
+    for render in data.get('renders', []):
+        if render['uuid'] == uuid:
+            found = True
+            break
+
+    if found:
+        return
 
+    if 'renders' not in data:
+        data['renders'] = []
+
+    data['renders'].append({'uuid': uuid, 'name': name, 'port': port})
+    with open(config_file, 'w') as f:
+        json.dump(data, f, sort_keys=True, indent=4)
+
+
+def unregister_render(uuid):
+    config_file = get_config_file('live-renders.json')
+    if os.path.exists(config_file):
+        with open(config_file) as f:
+            data = json.load(f)
+    else:
+        data = {'renders': []}
+
+    if 'renders' not in data:
+        return
+
+    found = False
+    others = []
+    for render in data.get('renders', []):
+        if render['uuid'] == uuid:
+            found = True
+        else:
+            others.append(render)
+
+    if not found:
+        return
+
+    data = {'renders': others}
+    with open(config_file, 'w') as f:
+        json.dump(data, f, sort_keys=True, indent=4)
+
+
+def get_uuid(port):
+    config_file = get_config_file('tiny-render.json')
     if os.path.exists(config_file):
         with open(config_file) as f:
             configs = json.load(f)
             if 'UUID' in configs and configs['UUID']:
-                return configs['UUID']
+                return configs['UUID'] + f'-{port}'
 
-    uuid_str = f'{uuid.uuid4()}'
+    uuid_str = str(uuid.uuid4()).rsplit('-', 1)[0]
     with open(config_file, 'w') as f:
         configs = {'UUID': uuid_str}
         json.dump(configs, f)
 
+    return uuid_str + f'-{port}'
+
 
 def get_host_ip():
     ips = []
@@ -55,7 +113,7 @@ def build_m_search_response(st, render_port):
     date_str = now.strftime("%a, %d %b %Y %H:%M:%S GMT")
     render_ip = get_host_ip()
     location = f'http://{render_ip}:{render_port}/description.xml'
-    uuid_str = get_uuid()
+    uuid_str = get_uuid(render_port)
 
     text = 'HTTP/1.1 200 OK\r\n'
     if st == ST_VALUE_MEDIARENDERER:
@@ -71,16 +129,29 @@ def build_m_search_response(st, render_port):
     text += f'Date: {date_str}\r\n\r\n'
     return text.encode('utf-8')
 
+
 def get_search_target(data):
     if b':device:MediaRenderer:1' in data:
         return ST_VALUE_MEDIARENDERER
     else:
         return ST_VALUE_AVTRANSPORT
 
-def ssdp_listener(render_port):
+
+def _get_live_render_ports():
+    config_file = get_config_file('live-renders.json')
+    if not os.path.exists(config_file):
+        return []
+
+    with open(config_file) as f:
+        configs = json.load(f)
+        return [x['port'] for x in configs.get('renders', [])]
+
+
+def ssdp_listener():
     sock = socket.socket(socket.AF_INET, socket.SOCK_DGRAM, socket.IPPROTO_UDP)
     sock.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
     sock.bind(('0.0.0.0', SSDP_PORT))
+    logger.debug(f'SSDP server running at {SSDP_PORT}')
 
     # Join the SSDP multicast group
     mreq = socket.inet_aton(SSDP_MULTICAST_IP) + socket.inet_aton('0.0.0.0')
@@ -91,4 +162,5 @@ def ssdp_listener(render_port):
         if b'M-SEARCH' in data and b'ssdp:discover' in data:
             st = get_search_target(data)
             logger.info(f'Received M-SEARCH from {addr}, sending response...')
-            sock.sendto(build_m_search_response(st, render_port), addr)
+            for render_port in _get_live_render_ports():
+                sock.sendto(build_m_search_response(st, render_port), addr)

{tiny-dlna-0.7.3 → tiny-dlna-0.9.0}/tiny_dlna.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: tiny-dlna
-Version: 0.7.3
+Version: 0.9.0
 Summary: a tiny DLNA sender & receiver
 Home-page: https://github.com/mitnk/tiny-dlna
 Author: mitnk