bacow/AV_Data_Capture
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #346 from 68cdrBxM8YdoJ/fix-actions-deprecate-warning

Browse Source 
Fix actions deprecate warning
This commit is contained in:
Yoshiko2
2020-11-05 19:17:10 +08:00
committed by GitHub
parent d9bcecb116 1645583c4b
commit e28440ed74
2 changed files with 54 additions and 139 deletions
Download Patch File Download Diff File Expand all files Collapse all files

126
.github/workflows/main.yml vendored
View File

@@ -9,8 +9,12 @@ on:
- master
jobs:
Linux:
runs-on: ubuntu-latest
build:
runs-on: ${{ matrix.os }}
strategy:
matrix:
os: [windows-latest, macos-latest, ubuntu-latest]
steps:
- uses: actions/checkout@v2
@@ -23,137 +27,47 @@ jobs:
- name: Install dependencies
run: |
python -m pip install --upgrade pip
sed -i '$a pyinstaller' requirements.txt
pip install -r requirements.txt
pip install pyinstaller
- name: Test number_perser.get_number
run: |
python number_parser.py -v
- name: Set VERSION variable
run: |
version=$(cat AV_Data_Capture.py | grep "version = " | tr -d "version = '")
echo "::set-env name=VERSION::$version"
- name: Set CLOUDSCRAPER_PATH variable
run: |
cloudscraper_path=$(python -c 'import cloudscraper as _; print(_.__path__[0])' | tail -n 1)
echo "::set-env name=CLOUDSCRAPER_PATH::$cloudscraper_path"
- name: Build with PyInstaller
- name: Build with PyInstaller for macos/ubuntu
if: matrix.os == 'macos-latest' || matrix.os == 'ubuntu-latest'
run: |
pyinstaller \
--onefile AV_Data_Capture.py \
--hidden-import ADC_function.py \
--hidden-import core.py \
--add-data "$CLOUDSCRAPER_PATH:cloudscraper"
--add-data "$(python -c 'import cloudscraper as _; print(_.__path__[0])'):cloudscraper"
- name: Copy config.ini
run: |
cp config.ini dist/
- name: Upload build artifact
uses: actions/upload-artifact@v1
with:
name: AV_Data_Capture-CLI-${{ env.VERSION }}-linux-amd64
path: dist
Windows:
runs-on: windows-latest
steps:
- uses: actions/checkout@v2
- name: Setup Python 3.8
uses: actions/setup-python@v2
with:
python-version: 3.8
- name: Install dependencies
run: |
python -m pip install --upgrade pip
sed -i '$a pyinstaller' requirements.txt
pip install -r requirements.txt
- name: Test number_perser.get_number
run: |
python number_parser.py -v
- name: Set VERSION variable
run: |
$version=$(cat AV_Data_Capture.py | grep "version = " | tr -d "version = '")
echo "::set-env name=VERSION::$version"
- name: Set CLOUDSCRAPER_PATH variable
run: |
$cloudscraper_path=$(python -c 'import cloudscraper as _; print(_.__path__[0])' | select -Last 1)
echo "::set-env name=CLOUDSCRAPER_PATH::$cloudscraper_path"
- name: Build with PyInstaller
- name: Build with PyInstaller for windows
if: matrix.os == 'windows-latest'
run: |
pyinstaller `
--onefile AV_Data_Capture.py `
--hidden-import ADC_function.py `
--hidden-import core.py `
--add-data "$env:CLOUDSCRAPER_PATH;cloudscraper"
--add-data "$(python -c 'import cloudscraper as _; print(_.__path__[0])');cloudscraper"
- name: Copy config.ini
run: |
cp config.ini dist/
- name: Upload build artifact
uses: actions/upload-artifact@v1
with:
name: AV_Data_Capture-CLI-${{ env.VERSION }}-windows-amd64
path: dist
MacOS:
runs-on: macos-latest
steps:
- uses: actions/checkout@v2
- name: Setup Python 3.8
uses: actions/setup-python@v2
with:
python-version: 3.8
- name: Install dependencies
- name: Set VERSION variable for macos/ubuntu
if: matrix.os == 'macos-latest' || matrix.os == 'ubuntu-latest'
run: |
python -m pip install --upgrade pip
sed -i '' '$a\
pyinstaller
' requirements.txt
pip install -r requirements.txt
echo "VERSION=$(python AV_Data_Capture.py --version)" >> $GITHUB_ENV
- name: Test number_perser.get_number
- name: Set VERSION variable for windows
if: matrix.os == 'windows-latest'
run: |
python number_parser.py -v
- name: Set VERSION variable
run: |
version=$(cat AV_Data_Capture.py | grep "version = " | tr -d "version = '")
echo "::set-env name=VERSION::$version"
- name: Set CLOUDSCRAPER_PATH variable
run: |
cloudscraper_path=$(python -c 'import cloudscraper as _; print(_.__path__[0])' | tail -n 1)
echo "::set-env name=CLOUDSCRAPER_PATH::$cloudscraper_path"
- name: Build with PyInstaller
run: |
pyinstaller \
--onefile AV_Data_Capture.py \
--hidden-import ADC_function.py \
--hidden-import core.py \
--add-data "$CLOUDSCRAPER_PATH:cloudscraper"
- name: Copy config.ini
run: |
cp config.ini dist/
echo "VERSION=$(python AV_Data_Capture.py --version)" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
- name: Upload build artifact
uses: actions/upload-artifact@v1
with:
name: AV_Data_Capture-CLI-${{ env.VERSION }}-macos-amd64
name: AV_Data_Capture-CLI-${{ env.VERSION }}-${{ matrix.os }}-amd64
path: dist

5
AV_Data_Capture.py
View File

@@ -18,11 +18,12 @@ def check_update(local_version):
print("[*]======================================================")
def argparse_function() -> [str, str, bool]:
def argparse_function(ver: str) -> [str, str, bool]:
parser = argparse.ArgumentParser()
parser.add_argument("file", default='', nargs='?', help="Single Movie file path.")
parser.add_argument("-c", "--config", default='config.ini', nargs='?', help="The config file Path.")
parser.add_argument("-n", "--number", default='', nargs='?',help="Custom file number")
parser.add_argument("--version", action="version", version=ver)
args = parser.parse_args()
return args.file, args.config, args.number
@@ -119,7 +120,7 @@ if __name__ == '__main__':
version = '3.9.2'
# Parse command line args
single_file_path, config_file, custom_number = argparse_function()
single_file_path, config_file, custom_number = argparse_function(version)
# Read config.ini
conf = config.Config(path=config_file)