tiny-dlna 0.3.0__tar.gz → 0.4.0__tar.gz

{tiny-dlna-0.3.0 → tiny-dlna-0.4.0}/PKG-INFO

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

{tiny-dlna-0.3.0 → tiny-dlna-0.4.0}/setup.py

@@ -23,7 +23,7 @@ Usages
 
 setup(
     name='tiny-dlna',
-    version='0.3.0',
+    version='0.4.0',
     description='a tiny DLNA receiver',
     long_description=DESC,
     url='https://github.com/mitnk/tiny-dlna',

{tiny-dlna-0.3.0 → tiny-dlna-0.4.0}/ssdp.py

@@ -1,24 +1,27 @@
+import datetime
 import logging
 import socket
 
 SSDP_MULTICAST = '239.255.255.250'
 SSDP_PORT = 1900
-LOCATION = "http://192.168.1.228:5000/description.xml"
-USN = 'uuid:dlna-tiny-render-t001::upnp:rootdevice'
+RENDER_PORT = 55000
+LOCATION = f'http://192.168.1.228:{RENDER_PORT}/description.xml'
+UUID = 'd095ee0c-7bed-43d0-bf98-f815496e8383'
+logger = logging.getLogger('ssdp')
 
-ssdp_response = (
-    'HTTP/1.1 200 OK\r\n'
-    'CACHE-CONTROL: max-age=1800\r\n'
-    'EXT:\r\n'
-    f'LOCATION: {LOCATION}\r\n'
-    'HOSTNAME: 192.168.1.228\r\n'
-    'SERVER: Custom/1.0 UPnP/1.0 DLNADOC/1.50\r\n'
-    f'ST: urn:schemas-upnp-org:service:AVTransport:1\r\n'
-    f'USN: {USN}\r\n'
-    '\r\n'
-)
+def build_m_search_response():
+    now = datetime.datetime.utcnow()
+    date_str = now.strftime("%a, %d %b %Y %H:%M:%S GMT")
 
-logger = logging.getLogger('ssdp')
+    text = 'HTTP/1.1 200 OK\r\n'
+    text += f'USN: uuid:{UUID}::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 += 'Cache-Control: max-age=70\r\n'
+    text += f'Date: {date_str}\r\n\r\n'
+    return text.encode('utf-8')
 
 def ssdp_listener():
     sock = socket.socket(socket.AF_INET, socket.SOCK_DGRAM, socket.IPPROTO_UDP)
@@ -33,7 +36,7 @@ def ssdp_listener():
         data, addr = sock.recvfrom(1024)
         if b'M-SEARCH' in data and b'ssdp:discover' in data:
             logger.info(f'Received M-SEARCH from {addr}, sending response...')
-            sock.sendto(ssdp_response.encode('utf-8'), addr)
+            sock.sendto(build_m_search_response(), addr)
 
 if __name__ == '__main__':
     ssdp_listener()

{tiny-dlna-0.3.0 → tiny-dlna-0.4.0}/tiny_dlna.egg-info/PKG-INFO

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

{tiny-dlna-0.3.0 → tiny-dlna-0.4.0}/tiny_render.py

@@ -7,11 +7,38 @@ import time
 import xml.etree.ElementTree as ET
 
 from flask import Flask, request, Response
-from ssdp import ssdp_listener
+from ssdp import ssdp_listener, RENDER_PORT, UUID
 
 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>
+    <major>1</major>
+    <minor>0</minor>
+  </specVersion>
+  <device>
+    <deviceType>urn:schemas-upnp-org:device:MediaRenderer:1</deviceType>
+    <friendlyName>{}</friendlyName>
+    <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>
+        <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>
+  </device>
+</root>"""
+
 XML_AVSET_DONE = """
 <s:Envelope xmlns:s="http://schemas.xmlsoap.org/soap/envelope/" s:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/">
   <s:Body>
@@ -95,47 +122,8 @@ _DATA = {
 
 @app.route('/description.xml')
 def description():
-    desc_ptn = """<?xml version="1.0"?>
-      <root xmlns="urn:schemas-upnp-org:device-1-0" xmlns:dlna="urn:schemas-dlna-org:device-1-0">
-      <specVersion>
-          <major>1</major>
-          <minor>0</minor>
-      </specVersion>
-      <device>
-          <deviceType>urn:schemas-upnp-org:device:MediaRenderer:1</deviceType>
-          <friendlyName>{}</friendlyName>
-          <manufacturer>mitnk</manufacturer>
-          <modelName>T001</modelName>
-          <UDN>uuid:dlna-tiny-render-t001</UDN>
-          <dlna:X_DLNADOC xmlns:dlna="urn:schemas-dlna-org:device-1-0">DMR-1.50</dlna:X_DLNADOC>
-              <serviceList>
-                  <service>
-                  <serviceType>urn:schemas-upnp-org:service:AVTransport:1</serviceType>
-                  <serviceId>urn:upnp-org:serviceId:AVTransport</serviceId>
-                  <SCPDURL>AVTransport/82d8-eb72-b097/scpd.xml</SCPDURL>
-                  <controlURL>AVTransport/82d8-eb72-b097/control</controlURL>
-                  <eventSubURL>AVTransport/82d8-eb72-b097/event</eventSubURL>
-                  </service>
-                  <service>
-                  <serviceType>urn:schemas-upnp-org:service:ConnectionManager:1</serviceType>
-                  <serviceId>urn:upnp-org:serviceId:ConnectionManager</serviceId>
-                  <SCPDURL>ConnectionManager/82d8-eb72-b097/scpd.xml</SCPDURL>
-                  <controlURL>ConnectionManager/82d8-eb72-b097/control</controlURL>
-                  <eventSubURL>ConnectionManager/82d8-eb72-b097/event</eventSubURL>
-                  </service>
-                  <service>
-                  <serviceType>urn:schemas-upnp-org:service:RenderingControl:1</serviceType>
-                  <serviceId>urn:upnp-org:serviceId:RenderingControl</serviceId>
-                  <SCPDURL>RenderingControl/82d8-eb72-b097/scpd.xml</SCPDURL>
-                  <controlURL>RenderingControl/82d8-eb72-b097/control</controlURL>
-                  <eventSubURL>RenderingControl/82d8-eb72-b097/event</eventSubURL>
-                  </service>
-              </serviceList>
-      </device>
-    </root>"""
-
     friendly_name = app.config['FRIENDLY_NAME']
-    xml = desc_ptn.format(friendly_name)
+    xml = XML_DESC_PTN.format(friendly_name, UUID)
     return Response(xml, mimetype="text/xml")
 
 def to_track_time(seconds):
@@ -202,7 +190,7 @@ def get_metadata(request):
     }
 
 
-@app.route('/AVTransport/82d8-eb72-b097/control', methods=['POST'])
+@app.route('/AVTransport/control', methods=['POST'])
 def control():
     if is_setav(request):
         metadata = get_metadata(request)
@@ -288,7 +276,7 @@ def main():
     friendly_name = args.name
     app.config['FRIENDLY_NAME'] = friendly_name
     logging.info(f'Starting DLNA Receiver: {friendly_name}')
-    app.run(host="0.0.0.0", port=5000, debug=False)
+    app.run(host="0.0.0.0", port=RENDER_PORT, debug=False)
 
 
 if __name__ == "__main__":