From f20e1e4f0d3366c35ff075735c5c802cef8c2b51 Mon Sep 17 00:00:00 2001 From: Labrys of Knossos Date: Sun, 31 Mar 2019 11:45:04 -0400 Subject: [PATCH 1/6] Add pywin32 to setup.py install_requires on Windows --- setup.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/setup.py b/setup.py index 803f430b..b2f78439 100644 --- a/setup.py +++ b/setup.py @@ -53,6 +53,9 @@ setup( author_email='fock_wulf@hotmail.com', url='https://github.com/clinton-hall/nzbToMedia', packages=['core'], + install_requires=[ + 'pywin32;platform_system=="Windows"', + ], classifiers=[ # complete classifier list: http://pypi.python.org/pypi?%3Aaction=list_classifiers 'Development Status :: 5 - Production/Stable', From a531f4480e33dc720568da6ac38487e8b62333c6 Mon Sep 17 00:00:00 2001 From: Labrys of Knossos Date: Sun, 31 Mar 2019 12:13:11 -0400 Subject: [PATCH 2/6] Add source install cleanup test --- azure-pipelines.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index a609703b..485f214f 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -40,6 +40,13 @@ jobs: pytest tests --doctest-modules --junitxml=junit/test-results.xml displayName: 'pytest' + - script: + rm -rf .git + python cleanup.py + python TorrentToMedia.py + python nzbToMedia.py + displayName: 'Test source install cleanup' + - task: PublishTestResults@2 inputs: testResultsFiles: '**/test-results.xml' From 02813a6eaf865157433dadfccaf9ee651c64e6d7 Mon Sep 17 00:00:00 2001 From: Labrys of Knossos Date: Sun, 31 Mar 2019 12:39:12 -0400 Subject: [PATCH 3/6] Add source install cleanup test --- azure-pipelines.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 485f214f..96321a5b 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -40,7 +40,7 @@ jobs: pytest tests --doctest-modules --junitxml=junit/test-results.xml displayName: 'pytest' - - script: + - script: | rm -rf .git python cleanup.py python TorrentToMedia.py From 16b7c1149511528972751d1b986558ead0b188be Mon Sep 17 00:00:00 2001 From: Labrys of Knossos Date: Sun, 31 Mar 2019 12:45:07 -0400 Subject: [PATCH 4/6] Force cleanup errors for confirming CI test --- cleanup.py | 4 ---- 1 file changed, 4 deletions(-) diff --git a/cleanup.py b/cleanup.py index d313f2b4..43dc5775 100644 --- a/cleanup.py +++ b/cleanup.py @@ -15,10 +15,6 @@ FOLDER_STRUCTURE = { 'win', ], 'core': [ - 'auto_process', - 'extractor', - 'plugins', - 'utils', ], } From f5fdc145774b936b592d33ad523a43ec2a8eb204 Mon Sep 17 00:00:00 2001 From: Labrys of Knossos Date: Sun, 31 Mar 2019 12:49:32 -0400 Subject: [PATCH 5/6] Revert "Force cleanup errors for confirming CI test" This reverts commit 16b7c1149511528972751d1b986558ead0b188be. --- cleanup.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/cleanup.py b/cleanup.py index 43dc5775..d313f2b4 100644 --- a/cleanup.py +++ b/cleanup.py @@ -15,6 +15,10 @@ FOLDER_STRUCTURE = { 'win', ], 'core': [ + 'auto_process', + 'extractor', + 'plugins', + 'utils', ], } From 825b48a6c121a12f398dea3ea23410155383e737 Mon Sep 17 00:00:00 2001 From: Clinton Hall Date: Thu, 4 Apr 2019 11:34:25 +1300 Subject: [PATCH 6/6] add h265 to MKV profile allow. Fixes #1592 --- core/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/__init__.py b/core/__init__.py index 3087ff55..56f08bce 100644 --- a/core/__init__.py +++ b/core/__init__.py @@ -746,7 +746,7 @@ def configure_transcoder(): }, 'mkv': { 'VEXTENSION': '.mkv', 'VCODEC': 'libx264', 'VPRESET': None, 'VFRAMERATE': None, 'VBITRATE': None, 'VCRF': None, 'VLEVEL': None, - 'VRESOLUTION': None, 'VCODEC_ALLOW': ['libx264', 'h264', 'h.264', 'AVC', 'avc', 'mpeg4', 'msmpeg4', 'MPEG-4', 'mpeg2video'], + 'VRESOLUTION': None, 'VCODEC_ALLOW': ['libx264', 'h264', 'h.264', 'h265', 'libx265', 'h.265', 'AVC', 'avc', 'mpeg4', 'msmpeg4', 'MPEG-4', 'mpeg2video'], 'ACODEC': 'dts', 'ACODEC_ALLOW': ['libfaac', 'dts', 'ac3', 'mp2', 'mp3'], 'ABITRATE': None, 'ACHANNELS': 8, 'ACODEC2': None, 'ACODEC2_ALLOW': [], 'ABITRATE2': None, 'ACHANNELS2': None, 'ACODEC3': 'ac3', 'ACODEC3_ALLOW': ['libfaac', 'dts', 'ac3', 'mp2', 'mp3'], 'ABITRATE3': None, 'ACHANNELS3': 8,