diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 3d631e65..c210200c 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -92,6 +92,7 @@ jobs: dockerhub-sync-readme: needs: push-build + if: github.event_name != 'pull_request' runs-on: ubuntu-latest steps: - name: Sync README diff --git a/app/src/DownloadQueue.py b/app/src/DownloadQueue.py index e2678cc7..1099c330 100644 --- a/app/src/DownloadQueue.py +++ b/app/src/DownloadQueue.py @@ -235,10 +235,15 @@ class DownloadQueue: if not self.queue.exists(id): log.warn(f'requested cancel for non-existent download {id}') continue + + item = self.queue.get(key=id) + if self.queue.get(id).started(): + log.info(f'Canceling {id=} {item.info.title=}') self.queue.get(id).cancel() else: self.queue.delete(id) + log.info(f'deleting {id=} {item.info.title=}') await self.notifier.canceled(id) return {'status': 'ok'} @@ -248,6 +253,8 @@ class DownloadQueue: if not self.done.exists(key=id): log.warn(f'requested delete for non-existent download {id}') continue + item = self.done.get(key=id) + log.info(f'deleting {id=} {item.info.title=}') self.done.delete(id) await self.notifier.cleared(id)