tiny-dlna 0.5.2__tar.gz → 0.6.0__tar.gz

{tiny-dlna-0.5.2 → tiny-dlna-0.6.0}/PKG-INFO

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

{tiny-dlna-0.5.2 → tiny-dlna-0.6.0}/setup.py

@@ -28,7 +28,7 @@ Note: mpv needs to be installed on your system.
 
 setup(
     name='tiny-dlna',
-    version='0.5.2',
+    version='0.6.0',
     description='a tiny DLNA receiver',
     long_description=DESC,
     url='https://github.com/mitnk/tiny-dlna',

{tiny-dlna-0.5.2 → tiny-dlna-0.6.0}/tiny_dlna.egg-info/PKG-INFO

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

{tiny-dlna-0.5.2 → tiny-dlna-0.6.0}/tiny_render.py

@@ -1,3 +1,4 @@
+import argparse
 import html
 import logging
 import re
@@ -7,12 +8,11 @@ import time
 import xml.etree.ElementTree as ET
 
 from flask import Flask, request, Response
-from tiny_ssdp import ssdp_listener, RENDER_PORT, UUID
+from tiny_ssdp import get_uuid, ssdp_listener, RENDER_PORT
 
 app = Flask(__name__)
 logger = logging.getLogger('tiny_render')
 
-
 XML_DESC_PTN = """<?xml version="1.0" encoding="UTF-8"?>
 <root xmlns:dlna="urn:schemas-dlna-org:device-1-0" xmlns="urn:schemas-upnp-org:device-1-0">
   <specVersion>
@@ -22,20 +22,32 @@ XML_DESC_PTN = """<?xml version="1.0" encoding="UTF-8"?>
   <device>
     <deviceType>urn:schemas-upnp-org:device:MediaRenderer:1</deviceType>
     <friendlyName>{}</friendlyName>
+    <UDN>uuid:{}</UDN>
     <manufacturer>mitnk</manufacturer>
     <modelName>Tiny-Render</modelName>
     <modelDescription>AVTransport Media Renderer</modelDescription>
-    <UDN>uuid:{}</UDN>
     <dlna:X_DLNADOC xmlns:dlna="urn:schemas-dlna-org:device-1-0">DMR-1.50</dlna:X_DLNADOC>
-      <serviceList>
-        <service>
+    <serviceList>
+      <service>
         <serviceType>urn:schemas-upnp-org:service:AVTransport:1</serviceType>
         <serviceId>urn:upnp-org:serviceId:AVTransport</serviceId>
-        <SCPDURL>AVTransport/scpd.xml</SCPDURL>
         <controlURL>AVTransport/control</controlURL>
-        <eventSubURL>AVTransport/event</eventSubURL>
-        </service>
-      </serviceList>
+      </service>
+      <service>
+        <serviceType>urn:schemas-upnp-org:service:RenderingControl:1</serviceType>
+        <serviceId>urn:upnp-org:serviceId:RenderingControl</serviceId>
+        <controlURL>RenderingControl/action</controlURL>
+        <eventSubURL>RenderingControl/event</eventSubURL>
+        <SCPDURL>dlna/RenderingControl.xml</SCPDURL>
+      </service>
+      <service>
+        <serviceType>urn:schemas-upnp-org:service:ConnectionManager:1</serviceType>
+        <serviceId>urn:upnp-org:serviceId:ConnectionManager</serviceId>
+        <controlURL>ConnectionManager/action</controlURL>
+        <eventSubURL>ConnectionManager/event</eventSubURL>
+        <SCPDURL>dlna/ConnectionManager.xml</SCPDURL>
+      </service>
+    </serviceList>
   </device>
 </root>"""
 
@@ -55,6 +67,14 @@ XML_PLAY_DONE = """
 </s:Envelope>
 """
 
+XML_SEEK_DONE = """
+<s:Envelope s:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" xmlns:s="http://schemas.xmlsoap.org/soap/envelope/">
+  <s:Body>
+    <u:SeekResponse xmlns:u="urn:schemas-upnp-org:service:AVTransport:1"/>
+  </s:Body>
+</s:Envelope>
+"""
+
 XML_POSINFO = """
 <s:Envelope s:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" xmlns:s="http://schemas.xmlsoap.org/soap/envelope/">
   <s:Body>
@@ -123,8 +143,11 @@ _DATA = {
 @app.route('/description.xml')
 def description():
     friendly_name = app.config['FRIENDLY_NAME']
-    xml = XML_DESC_PTN.format(friendly_name, UUID)
-    return Response(xml, mimetype="text/xml")
+    uuid_str = get_uuid()
+    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.6'
+    return resp
 
 def to_track_time(seconds):
     hours = seconds // 3600
@@ -236,8 +259,8 @@ def control():
         return Response(XML_STOP_DONE, mimetype="text/xml")
 
     elif is_seek(request):
-        logger.debug('seek')
-        return Response('To Seek', status=500)
+        logger.debug('action:seek')
+        return Response(XML_SEEK_DONE, mimetype="text/xml")
 
     logger.error(f'action not support: {request.data}')
     return Response('Action Not Supported', status=500)
@@ -249,26 +272,24 @@ class SSDPServer(threading.Thread):
 
 
 def main():
-    import argparse
-
     parser = argparse.ArgumentParser(prog='tiny-render')
-    parser.add_argument('--http-log', action='store_true', help='Enable server logs')
+    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')
 
     args = parser.parse_args()
 
     logging.basicConfig(
-        level=logging.INFO,
+        level=logging.ERROR,
         format='[%(asctime)s][%(levelname)s] %(message)s',
     )
 
-    if not args.http_log:
+    if not args.http_logs:
         logging.getLogger('werkzeug').setLevel(logging.ERROR)
-        logging.getLogger('ssdp').setLevel(logging.ERROR)
+        logging.getLogger('tiny_ssdp').setLevel(logging.ERROR)
 
     if args.verbose:
-        logging.basicConfig(level=logging.DEBUG)
+        logger.setLevel(logging.DEBUG)
 
     ssdp = SSDPServer()
     ssdp.start()

{tiny-dlna-0.5.2 → tiny-dlna-0.6.0}/tiny_ssdp.py

@@ -1,5 +1,7 @@
 import datetime
+import json
 import logging
+import os
 import psutil
 import socket
 import uuid
@@ -7,8 +9,27 @@ import uuid
 SSDP_MULTICAST_IP = '239.255.255.250'
 SSDP_PORT = 1900
 RENDER_PORT = 55000
-UUID = f'{uuid.uuid4()}'
-logger = logging.getLogger('ssdp')
+logger = logging.getLogger('tiny_ssdp')
+ST_VALUE_MEDIARENDERER = 'mediarenderer'
+ST_VALUE_AVTRANSPORT = 'avtransport'
+
+
+def get_uuid():
+    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')
+
+    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']
+
+    uuid_str = f'{uuid.uuid4()}'
+    with open(config_file, 'w') as f:
+        configs = {'UUID': uuid_str}
+        json.dump(configs, f)
 
 
 def get_host_ip():
@@ -28,22 +49,33 @@ def get_host_ip():
     return ips[0]
 
 
-def build_m_search_response():
+def build_m_search_response(st):
     now = datetime.datetime.utcnow()
     date_str = now.strftime("%a, %d %b %Y %H:%M:%S GMT")
     host_ip = get_host_ip()
     location = f'http://{host_ip}:{RENDER_PORT}/description.xml'
+    uuid_str = get_uuid()
 
     text = 'HTTP/1.1 200 OK\r\n'
-    text += f'USN: uuid:{UUID}::urn:schemas-upnp-org:service:AVTransport:1\r\n'
+    if st == ST_VALUE_MEDIARENDERER:
+        text += 'ST: urn:schemas-upnp-org:device:MediaRenderer:1\r\n'
+        text += f'USN: uuid:{uuid_str}::urn:schemas-upnp-org:device:MediaRenderer:1\r\n'
+    else:
+        text += 'ST: urn:schemas-upnp-org:service:AVTransport:1\r\n'
+        text += f'USN: uuid:{uuid_str}::urn:schemas-upnp-org:service:AVTransport:1\r\n'
     text += f'Location: {location}\r\n'
-    text += 'ST: urn:schemas-upnp-org:service:AVTransport:1\r\n'
     text += 'EXT: \r\n'
-    text += 'Server: Werkzeug/3.0.3 Python/3.11.0\r\n'
+    text += 'Server: Werkzeug/3.0 TinyRender/0.6\r\n'
     text += 'Cache-Control: max-age=70\r\n'
     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():
     sock = socket.socket(socket.AF_INET, socket.SOCK_DGRAM, socket.IPPROTO_UDP)
     sock.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
@@ -56,8 +88,9 @@ def ssdp_listener():
     while True:
         data, addr = sock.recvfrom(1024)
         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(), addr)
+            sock.sendto(build_m_search_response(st), addr)
 
 if __name__ == '__main__':
     ssdp_listener()