diff --git a/.dockerignore b/.dockerignore index 98a36ae..926c0f4 100644 --- a/.dockerignore +++ b/.dockerignore @@ -3,3 +3,6 @@ ui/.angular ui/node_modules /.idea/* +*.bak +*.dat +*.dir diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index b47e49b..cab8517 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -1,9 +1,10 @@ name: build on: - push: - branches: - - 'master' + workflow_dispatch: +# push: +# branches: +# - 'master' jobs: push_to_registries: diff --git a/.github/workflows/update-yt-dlp.yml b/.github/workflows/update-yt-dlp.yml index 17e55c6..b801015 100644 --- a/.github/workflows/update-yt-dlp.yml +++ b/.github/workflows/update-yt-dlp.yml @@ -2,8 +2,8 @@ name: update-yt-dlp on: workflow_dispatch: - schedule: - - cron: '0 0 * * *' +# schedule: +# - cron: '0 0 * * *' jobs: update-yt-dlp : diff --git a/.gitignore b/.gitignore index 5c9f69d..21ca361 100644 --- a/.gitignore +++ b/.gitignore @@ -48,3 +48,6 @@ Thumbs.db __pycache__ .venv /.idea/* +*.bak +*.dat +*.dir diff --git a/app/main.py b/app/main.py index 3daed83..96a98e1 100644 --- a/app/main.py +++ b/app/main.py @@ -1,13 +1,12 @@ -#!/usr/bin/env python3 -# pylint: disable=no-member,method-hidden - -import os -import sys -from aiohttp import web -import socketio -import logging import json +import logging +import os import pathlib +import sys +import platform + +import socketio +from aiohttp import web from ytdl import DownloadQueueNotifier, DownloadQueue @@ -238,4 +237,7 @@ app.on_response_prepare.append(on_prepare) if __name__ == '__main__': logging.basicConfig(level=logging.DEBUG) log.info(f"Listening on {config.HOST}:{config.PORT}") - web.run_app(app, host=config.HOST, port=int(config.PORT), reuse_port=True) + if platform.system() == 'Windows': + web.run_app(app, host=config.HOST, port=int(config.PORT)) + else: + web.run_app(app, host=config.HOST, port=int(config.PORT), reuse_port=True) diff --git a/ui/e2e/src/app.e2e-spec.ts b/ui/e2e/src/app.e2e-spec.ts index d2c5a2d..1cffecf 100644 --- a/ui/e2e/src/app.e2e-spec.ts +++ b/ui/e2e/src/app.e2e-spec.ts @@ -1,5 +1,7 @@ -import { AppPage } from './app.po'; -import { browser, logging } from 'protractor'; +import {describe, it} from 'node:test'; +import {AppPage} from './app.po'; +// @ts-ignore +import {browser, logging} from 'protractor'; describe('workspace-project App', () => { let page: AppPage;