From 33c7c3ee127e1f3a4e3ee802323f7f972b13c5a3 Mon Sep 17 00:00:00 2001
From: Dispatch <45262335+DispatchCommit@users.noreply.github.com>
Date: Fri, 10 Jul 2020 05:39:46 -0700
Subject: [PATCH 1/2] Fixes HLS .m3u8 and DASH .mpd extension

HLS uses a playlist .m3u8 file to provide video content Transport Segments (.ts) files.
DASH uses a playlist .mpd file to provide video content of a few different containers.
---
 lbry/schema/mime_types.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lbry/schema/mime_types.py b/lbry/schema/mime_types.py
index 3344179e7..06c5be6b9 100644
--- a/lbry/schema/mime_types.py
+++ b/lbry/schema/mime_types.py
@@ -47,7 +47,7 @@ types_map = {
     '.latex': ('application/x-latex', 'binary'),
     '.m1v': ('video/mpeg', 'video'),
     '.m3u': ('application/vnd.apple.mpegurl', 'audio'),
-    '.m3u8': ('application/vnd.apple.mpegurl', 'audio'),
+    '.m3u8': ('application/vnd.apple.mpegurl', 'video'),
     '.man': ('application/x-troff-man', 'document'),
     '.markdown': ('text/markdown', 'document'),
     '.md': ('text/markdown', 'document'),
@@ -61,6 +61,7 @@ types_map = {
     '.mp3': ('audio/mpeg', 'audio'),
     '.mp4': ('video/mp4', 'video'),
     '.mpa': ('video/mpeg', 'video'),
+    '.mpd': ('application/dash+xml', 'video'),
     '.mpe': ('video/mpeg', 'video'),
     '.mpeg': ('video/mpeg', 'video'),
     '.mpg': ('video/mpeg', 'video'),

From 6c75a8978b1432b5c5c97928373d07e7fdf031ab Mon Sep 17 00:00:00 2001
From: Dispatch <45262335+DispatchCommit@users.noreply.github.com>
Date: Fri, 10 Jul 2020 07:03:03 -0700
Subject: [PATCH 2/2] Fix bug in python CICD pipeline

implemented fix recommended by:
https://stackoverflow.com/a/61693590
https://github.com/pypa/setuptools/issues/1963
---
 .github/workflows/main.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index bea9fa1be..f6e974ff2 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -67,6 +67,9 @@ jobs:
         run: |
           pip install pyinstaller
           pip install -e .
+          # https://stackoverflow.com/a/61693590
+          # https://github.com/pypa/setuptools/issues/1963
+          pip install --upgrade 'setuptools<45.0.0'
       - if: startsWith(matrix.os, 'windows') == false
         name: Build & Run (Unix)
         run: |