github/nzbToMedia
1
0
Fork 0
mirror of https://github.com/clinton-hall/nzbToMedia.git synced 2025-08-22 06:13:19 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'nightly' into UserScript-1

Browse source
This commit is contained in:
clinton-hall 2019-08-02 13:15:39 +12:00
commit b60bf8df2d
2 changed files with 26 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

50
azure-pipelines.yml
View file

@ -24,42 +24,42 @@ jobs:
maxParallel: 4 maxParallel: 4
steps: steps:
- script: | #- script: |
# Make sure all packages are pulled from latest # Make sure all packages are pulled from latest
sudo apt-get update #sudo apt-get update
# Fail out if any setups fail # Fail out if any setups fail
set -e #set -e
# Delete old Pythons # Delete old Pythons
rm -rf $AGENT_TOOLSDIRECTORY/Python/2.7.16 #rm -rf $AGENT_TOOLSDIRECTORY/Python/2.7.16
rm -rf $AGENT_TOOLSDIRECTORY/Python/3.5.7 #rm -rf $AGENT_TOOLSDIRECTORY/Python/3.5.7
rm -rf $AGENT_TOOLSDIRECTORY/Python/3.7.3 #rm -rf $AGENT_TOOLSDIRECTORY/Python/3.7.3
# Download new Pythons # Download new Pythons
azcopy --recursive \ #azcopy --recursive \
--source https://vstsagenttools.blob.core.windows.net/tools/hostedtoolcache/linux/Python/2.7.15 \ #--source https://vstsagenttools.blob.core.windows.net/tools/hostedtoolcache/linux/Python/2.7.15 \
--destination $AGENT_TOOLSDIRECTORY/Python/2.7.15 #--destination $AGENT_TOOLSDIRECTORY/Python/2.7.15
azcopy --recursive \ #azcopy --recursive \
--source https://vstsagenttools.blob.core.windows.net/tools/hostedtoolcache/linux/Python/3.5.5 \ #--source https://vstsagenttools.blob.core.windows.net/tools/hostedtoolcache/linux/Python/3.5.5 \
--destination $AGENT_TOOLSDIRECTORY/Python/3.5.5 #--destination $AGENT_TOOLSDIRECTORY/Python/3.5.5
azcopy --recursive \ #azcopy --recursive \
--source https://vstsagenttools.blob.core.windows.net/tools/hostedtoolcache/linux/Python/3.7.2 \ #--source https://vstsagenttools.blob.core.windows.net/tools/hostedtoolcache/linux/Python/3.7.2 \
--destination $AGENT_TOOLSDIRECTORY/Python/3.7.2 #--destination $AGENT_TOOLSDIRECTORY/Python/3.7.2
# Install new Pythons # Install new Pythons
original_directory=$PWD #original_directory=$PWD
setups=$(find $AGENT_TOOLSDIRECTORY/Python -name setup.sh) #setups=$(find $AGENT_TOOLSDIRECTORY/Python -name setup.sh)
for setup in $setups; do #for setup in $setups; do
chmod +x $setup; #chmod +x $setup;
cd $(dirname $setup); #cd $(dirname $setup);
./$(basename $setup); #./$(basename $setup);
cd $original_directory; #cd $original_directory;
done; #done;
displayName: 'Workaround: update apt and roll back Python versions' #displayName: 'Workaround: update apt and roll back Python versions'
- task: UsePythonVersion@0 - task: UsePythonVersion@0
inputs: inputs:
versionSpec: '$(python.version)' versionSpec: '$(python.version)'

2
libs/custom/utorrent/client.py
View file

@ -59,7 +59,7 @@ class UTorrentClient(object):
url = urljoin(self.base_url, 'token.html') url = urljoin(self.base_url, 'token.html')
response = self.opener.open(url) response = self.opener.open(url)
token_re = "<div id='token' style='display:none;'>([^<>]+)</div>" token_re = "<div id='token' style='display:none;'>([^<>]+)</div>"
match = re.search(token_re, response.read()) match = re.search(token_re, str(response.read()))
return match.group(1) return match.group(1)
def list(self, **kwargs): def list(self, **kwargs):