Merge branch 'main' of github.com:alexmickelson/infrastructure
This commit is contained in:
15
.github/workflows/deploy-bot.yml
vendored
15
.github/workflows/deploy-bot.yml
vendored
@@ -1,15 +0,0 @@
|
||||
name: Deploy Discord Bot
|
||||
on:
|
||||
workflow_dispatch:
|
||||
jobs:
|
||||
run-python:
|
||||
runs-on: [self-hosted, home-server]
|
||||
steps:
|
||||
- name: Checkout code
|
||||
uses: actions/checkout@v4
|
||||
- name: deploy bot
|
||||
env:
|
||||
DISCORD_SECRET: ${{ secrets.DISCORD_SECRET }}
|
||||
run: |
|
||||
cd discord-bot
|
||||
./run.sh
|
||||
@@ -1,7 +0,0 @@
|
||||
.vscode/
|
||||
virtualenv/
|
||||
songs/
|
||||
.mypy_cache/
|
||||
Dockerfile
|
||||
node_modules/
|
||||
venv/
|
||||
2
discord-bot/.gitignore
vendored
2
discord-bot/.gitignore
vendored
@@ -1,2 +0,0 @@
|
||||
songs/
|
||||
venv/
|
||||
7
discord-bot/.vscode/settings.json
vendored
7
discord-bot/.vscode/settings.json
vendored
@@ -1,7 +0,0 @@
|
||||
{
|
||||
"python.linting.mypyEnabled": false,
|
||||
"python.linting.enabled": true,
|
||||
"python.linting.flake8Enabled": false,
|
||||
"python.linting.pylintEnabled": false,
|
||||
"python.linting.banditEnabled": true
|
||||
}
|
||||
@@ -1,24 +0,0 @@
|
||||
FROM node:20 AS build-stage
|
||||
|
||||
WORKDIR /app
|
||||
|
||||
COPY client/package.json client/package-lock.json ./
|
||||
RUN npm install
|
||||
|
||||
COPY client/ ./
|
||||
RUN npm run build
|
||||
|
||||
FROM python:3.12
|
||||
RUN apt-get update && apt-get install -y ffmpeg
|
||||
COPY requirements.txt requirements.txt
|
||||
RUN pip install -r requirements.txt
|
||||
|
||||
COPY src src
|
||||
COPY main.py main.py
|
||||
RUN mkdir songs
|
||||
|
||||
RUN mkdir client
|
||||
COPY --from=build-stage /app/dist /client
|
||||
|
||||
ENTRYPOINT [ "fastapi", "run", "main.py", "--port", "5677" ]
|
||||
|
||||
@@ -1,18 +0,0 @@
|
||||
module.exports = {
|
||||
root: true,
|
||||
env: { browser: true, es2020: true },
|
||||
extends: [
|
||||
'eslint:recommended',
|
||||
'plugin:@typescript-eslint/recommended',
|
||||
'plugin:react-hooks/recommended',
|
||||
],
|
||||
ignorePatterns: ['dist', '.eslintrc.cjs'],
|
||||
parser: '@typescript-eslint/parser',
|
||||
plugins: ['react-refresh'],
|
||||
rules: {
|
||||
'react-refresh/only-export-components': [
|
||||
'warn',
|
||||
{ allowConstantExport: true },
|
||||
],
|
||||
},
|
||||
}
|
||||
24
discord-bot/client/.gitignore
vendored
24
discord-bot/client/.gitignore
vendored
@@ -1,24 +0,0 @@
|
||||
# Logs
|
||||
logs
|
||||
*.log
|
||||
npm-debug.log*
|
||||
yarn-debug.log*
|
||||
yarn-error.log*
|
||||
pnpm-debug.log*
|
||||
lerna-debug.log*
|
||||
|
||||
node_modules
|
||||
dist
|
||||
dist-ssr
|
||||
*.local
|
||||
|
||||
# Editor directories and files
|
||||
.vscode/*
|
||||
!.vscode/extensions.json
|
||||
.idea
|
||||
.DS_Store
|
||||
*.suo
|
||||
*.ntvs*
|
||||
*.njsproj
|
||||
*.sln
|
||||
*.sw?
|
||||
@@ -1,30 +0,0 @@
|
||||
# React + TypeScript + Vite
|
||||
|
||||
This template provides a minimal setup to get React working in Vite with HMR and some ESLint rules.
|
||||
|
||||
Currently, two official plugins are available:
|
||||
|
||||
- [@vitejs/plugin-react](https://github.com/vitejs/vite-plugin-react/blob/main/packages/plugin-react/README.md) uses [Babel](https://babeljs.io/) for Fast Refresh
|
||||
- [@vitejs/plugin-react-swc](https://github.com/vitejs/vite-plugin-react-swc) uses [SWC](https://swc.rs/) for Fast Refresh
|
||||
|
||||
## Expanding the ESLint configuration
|
||||
|
||||
If you are developing a production application, we recommend updating the configuration to enable type aware lint rules:
|
||||
|
||||
- Configure the top-level `parserOptions` property like this:
|
||||
|
||||
```js
|
||||
export default {
|
||||
// other rules...
|
||||
parserOptions: {
|
||||
ecmaVersion: 'latest',
|
||||
sourceType: 'module',
|
||||
project: ['./tsconfig.json', './tsconfig.node.json'],
|
||||
tsconfigRootDir: __dirname,
|
||||
},
|
||||
}
|
||||
```
|
||||
|
||||
- Replace `plugin:@typescript-eslint/recommended` to `plugin:@typescript-eslint/recommended-type-checked` or `plugin:@typescript-eslint/strict-type-checked`
|
||||
- Optionally add `plugin:@typescript-eslint/stylistic-type-checked`
|
||||
- Install [eslint-plugin-react](https://github.com/jsx-eslint/eslint-plugin-react) and add `plugin:react/recommended` & `plugin:react/jsx-runtime` to the `extends` list
|
||||
@@ -1,13 +0,0 @@
|
||||
<!doctype html>
|
||||
<html lang="en">
|
||||
<head>
|
||||
<meta charset="UTF-8" />
|
||||
<link rel="icon" type="image/svg+xml" href="/vite.svg" />
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
|
||||
<title>Discord Bot</title>
|
||||
</head>
|
||||
<body data-bs-theme="dark">
|
||||
<div id="root"></div>
|
||||
<script type="module" src="/src/main.tsx"></script>
|
||||
</body>
|
||||
</html>
|
||||
3673
discord-bot/client/package-lock.json
generated
3673
discord-bot/client/package-lock.json
generated
File diff suppressed because it is too large
Load Diff
@@ -1,32 +0,0 @@
|
||||
{
|
||||
"name": "client",
|
||||
"private": true,
|
||||
"version": "0.0.0",
|
||||
"type": "module",
|
||||
"scripts": {
|
||||
"dev": "vite",
|
||||
"build": "tsc -b && vite build",
|
||||
"lint": "eslint . --ext ts,tsx --report-unused-disable-directives --max-warnings 0",
|
||||
"preview": "vite preview"
|
||||
},
|
||||
"dependencies": {
|
||||
"bootstrap": "^5.3.3",
|
||||
"bootstrap-icons": "^1.11.3",
|
||||
"react": "^18.3.1",
|
||||
"react-dom": "^18.3.1",
|
||||
"sass": "^1.77.6"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@types/bootstrap": "^5.2.10",
|
||||
"@types/react": "^18.3.3",
|
||||
"@types/react-dom": "^18.3.0",
|
||||
"@typescript-eslint/eslint-plugin": "^7.13.1",
|
||||
"@typescript-eslint/parser": "^7.13.1",
|
||||
"@vitejs/plugin-react": "^4.3.1",
|
||||
"eslint": "^8.57.0",
|
||||
"eslint-plugin-react-hooks": "^4.6.2",
|
||||
"eslint-plugin-react-refresh": "^0.4.7",
|
||||
"typescript": "^5.2.2",
|
||||
"vite": "^5.3.1"
|
||||
}
|
||||
}
|
||||
@@ -1 +0,0 @@
|
||||
<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" aria-hidden="true" role="img" class="iconify iconify--logos" width="31.88" height="32" preserveAspectRatio="xMidYMid meet" viewBox="0 0 256 257"><defs><linearGradient id="IconifyId1813088fe1fbc01fb466" x1="-.828%" x2="57.636%" y1="7.652%" y2="78.411%"><stop offset="0%" stop-color="#41D1FF"></stop><stop offset="100%" stop-color="#BD34FE"></stop></linearGradient><linearGradient id="IconifyId1813088fe1fbc01fb467" x1="43.376%" x2="50.316%" y1="2.242%" y2="89.03%"><stop offset="0%" stop-color="#FFEA83"></stop><stop offset="8.333%" stop-color="#FFDD35"></stop><stop offset="100%" stop-color="#FFA800"></stop></linearGradient></defs><path fill="url(#IconifyId1813088fe1fbc01fb466)" d="M255.153 37.938L134.897 252.976c-2.483 4.44-8.862 4.466-11.382.048L.875 37.958c-2.746-4.814 1.371-10.646 6.827-9.67l120.385 21.517a6.537 6.537 0 0 0 2.322-.004l117.867-21.483c5.438-.991 9.574 4.796 6.877 9.62Z"></path><path fill="url(#IconifyId1813088fe1fbc01fb467)" d="M185.432.063L96.44 17.501a3.268 3.268 0 0 0-2.634 3.014l-5.474 92.456a3.268 3.268 0 0 0 3.997 3.378l24.777-5.718c2.318-.535 4.413 1.507 3.936 3.838l-7.361 36.047c-.495 2.426 1.782 4.5 4.151 3.78l15.304-4.649c2.372-.72 4.652 1.36 4.15 3.788l-11.698 56.621c-.732 3.542 3.979 5.473 5.943 2.437l1.313-2.028l72.516-144.72c1.215-2.423-.88-5.186-3.54-4.672l-25.505 4.922c-2.396.462-4.435-1.77-3.759-4.114l16.646-57.705c.677-2.35-1.37-4.583-3.769-4.113Z"></path></svg>
|
||||
|
Before Width: | Height: | Size: 1.5 KiB |
@@ -1,14 +0,0 @@
|
||||
import { CurrentSong } from "./components/CurrentSong";
|
||||
import { PlaybackInfo } from "./components/PlaybackInfo";
|
||||
import { SongQueue } from "./components/SongQueue";
|
||||
|
||||
export const App = () => {
|
||||
return (
|
||||
<div className="container mt-5">
|
||||
<h1 className="text-center">Discord Music</h1>
|
||||
<CurrentSong />
|
||||
<SongQueue />
|
||||
<PlaybackInfo />
|
||||
</div>
|
||||
);
|
||||
};
|
||||
@@ -1 +0,0 @@
|
||||
<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" aria-hidden="true" role="img" class="iconify iconify--logos" width="35.93" height="32" preserveAspectRatio="xMidYMid meet" viewBox="0 0 256 228"><path fill="#00D8FF" d="M210.483 73.824a171.49 171.49 0 0 0-8.24-2.597c.465-1.9.893-3.777 1.273-5.621c6.238-30.281 2.16-54.676-11.769-62.708c-13.355-7.7-35.196.329-57.254 19.526a171.23 171.23 0 0 0-6.375 5.848a155.866 155.866 0 0 0-4.241-3.917C100.759 3.829 77.587-4.822 63.673 3.233C50.33 10.957 46.379 33.89 51.995 62.588a170.974 170.974 0 0 0 1.892 8.48c-3.28.932-6.445 1.924-9.474 2.98C17.309 83.498 0 98.307 0 113.668c0 15.865 18.582 31.778 46.812 41.427a145.52 145.52 0 0 0 6.921 2.165a167.467 167.467 0 0 0-2.01 9.138c-5.354 28.2-1.173 50.591 12.134 58.266c13.744 7.926 36.812-.22 59.273-19.855a145.567 145.567 0 0 0 5.342-4.923a168.064 168.064 0 0 0 6.92 6.314c21.758 18.722 43.246 26.282 56.54 18.586c13.731-7.949 18.194-32.003 12.4-61.268a145.016 145.016 0 0 0-1.535-6.842c1.62-.48 3.21-.974 4.76-1.488c29.348-9.723 48.443-25.443 48.443-41.52c0-15.417-17.868-30.326-45.517-39.844Zm-6.365 70.984c-1.4.463-2.836.91-4.3 1.345c-3.24-10.257-7.612-21.163-12.963-32.432c5.106-11 9.31-21.767 12.459-31.957c2.619.758 5.16 1.557 7.61 2.4c23.69 8.156 38.14 20.213 38.14 29.504c0 9.896-15.606 22.743-40.946 31.14Zm-10.514 20.834c2.562 12.94 2.927 24.64 1.23 33.787c-1.524 8.219-4.59 13.698-8.382 15.893c-8.067 4.67-25.32-1.4-43.927-17.412a156.726 156.726 0 0 1-6.437-5.87c7.214-7.889 14.423-17.06 21.459-27.246c12.376-1.098 24.068-2.894 34.671-5.345a134.17 134.17 0 0 1 1.386 6.193ZM87.276 214.515c-7.882 2.783-14.16 2.863-17.955.675c-8.075-4.657-11.432-22.636-6.853-46.752a156.923 156.923 0 0 1 1.869-8.499c10.486 2.32 22.093 3.988 34.498 4.994c7.084 9.967 14.501 19.128 21.976 27.15a134.668 134.668 0 0 1-4.877 4.492c-9.933 8.682-19.886 14.842-28.658 17.94ZM50.35 144.747c-12.483-4.267-22.792-9.812-29.858-15.863c-6.35-5.437-9.555-10.836-9.555-15.216c0-9.322 13.897-21.212 37.076-29.293c2.813-.98 5.757-1.905 8.812-2.773c3.204 10.42 7.406 21.315 12.477 32.332c-5.137 11.18-9.399 22.249-12.634 32.792a134.718 134.718 0 0 1-6.318-1.979Zm12.378-84.26c-4.811-24.587-1.616-43.134 6.425-47.789c8.564-4.958 27.502 2.111 47.463 19.835a144.318 144.318 0 0 1 3.841 3.545c-7.438 7.987-14.787 17.08-21.808 26.988c-12.04 1.116-23.565 2.908-34.161 5.309a160.342 160.342 0 0 1-1.76-7.887Zm110.427 27.268a347.8 347.8 0 0 0-7.785-12.803c8.168 1.033 15.994 2.404 23.343 4.08c-2.206 7.072-4.956 14.465-8.193 22.045a381.151 381.151 0 0 0-7.365-13.322Zm-45.032-43.861c5.044 5.465 10.096 11.566 15.065 18.186a322.04 322.04 0 0 0-30.257-.006c4.974-6.559 10.069-12.652 15.192-18.18ZM82.802 87.83a323.167 323.167 0 0 0-7.227 13.238c-3.184-7.553-5.909-14.98-8.134-22.152c7.304-1.634 15.093-2.97 23.209-3.984a321.524 321.524 0 0 0-7.848 12.897Zm8.081 65.352c-8.385-.936-16.291-2.203-23.593-3.793c2.26-7.3 5.045-14.885 8.298-22.6a321.187 321.187 0 0 0 7.257 13.246c2.594 4.48 5.28 8.868 8.038 13.147Zm37.542 31.03c-5.184-5.592-10.354-11.779-15.403-18.433c4.902.192 9.899.29 14.978.29c5.218 0 10.376-.117 15.453-.343c-4.985 6.774-10.018 12.97-15.028 18.486Zm52.198-57.817c3.422 7.8 6.306 15.345 8.596 22.52c-7.422 1.694-15.436 3.058-23.88 4.071a382.417 382.417 0 0 0 7.859-13.026a347.403 347.403 0 0 0 7.425-13.565Zm-16.898 8.101a358.557 358.557 0 0 1-12.281 19.815a329.4 329.4 0 0 1-23.444.823c-7.967 0-15.716-.248-23.178-.732a310.202 310.202 0 0 1-12.513-19.846h.001a307.41 307.41 0 0 1-10.923-20.627a310.278 310.278 0 0 1 10.89-20.637l-.001.001a307.318 307.318 0 0 1 12.413-19.761c7.613-.576 15.42-.876 23.31-.876H128c7.926 0 15.743.303 23.354.883a329.357 329.357 0 0 1 12.335 19.695a358.489 358.489 0 0 1 11.036 20.54a329.472 329.472 0 0 1-11 20.722Zm22.56-122.124c8.572 4.944 11.906 24.881 6.52 51.026c-.344 1.668-.73 3.367-1.15 5.09c-10.622-2.452-22.155-4.275-34.23-5.408c-7.034-10.017-14.323-19.124-21.64-27.008a160.789 160.789 0 0 1 5.888-5.4c18.9-16.447 36.564-22.941 44.612-18.3ZM128 90.808c12.625 0 22.86 10.235 22.86 22.86s-10.235 22.86-22.86 22.86s-22.86-10.235-22.86-22.86s10.235-22.86 22.86-22.86Z"></path></svg>
|
||||
|
Before Width: | Height: | Size: 4.0 KiB |
@@ -1,26 +0,0 @@
|
||||
import { useWebSocket } from "../contexts/useWebSocket";
|
||||
import { Slider } from "./Slider";
|
||||
|
||||
export const CurrentSong = () => {
|
||||
const { ws, playbackInfo, sendMessage } = useWebSocket();
|
||||
return (
|
||||
<>
|
||||
{playbackInfo && (
|
||||
<div className="rounded border p-3 my-5 bg-body-tertiary bg-opacity-50">
|
||||
<h2>Playing Song</h2>
|
||||
<h5>{playbackInfo.file_name}</h5>
|
||||
{ws && (
|
||||
<Slider
|
||||
min={0}
|
||||
max={playbackInfo.duration}
|
||||
current={playbackInfo.current_position}
|
||||
onChange={(v) => {
|
||||
sendMessage({ action: "set_playback", position: v });
|
||||
}}
|
||||
/>
|
||||
)}
|
||||
</div>
|
||||
)}
|
||||
</>
|
||||
);
|
||||
};
|
||||
@@ -1,22 +0,0 @@
|
||||
import React from "react";
|
||||
import { useInfoTask } from "./useInfoTask";
|
||||
import { useWebSocket } from "../contexts/useWebSocket";
|
||||
|
||||
export const PlaybackInfo: React.FC = () => {
|
||||
const { ws, error, message, botStatus } = useWebSocket();
|
||||
|
||||
useInfoTask(ws);
|
||||
|
||||
return (
|
||||
<div className="row justify-content-end my-3">
|
||||
<div className="col-auto">
|
||||
<div className="border rounded-3 p-3 bg-secondary-subtle">
|
||||
<h5 className="text-center">Status Messages</h5>
|
||||
{botStatus && <div>status: {botStatus}</div>}
|
||||
{error && <div>error: {error}</div>}
|
||||
{message && <div>message: {message}</div>}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
);
|
||||
};
|
||||
@@ -1,38 +0,0 @@
|
||||
@import "../../node_modules/bootstrap/scss/bootstrap.scss";
|
||||
|
||||
:root {
|
||||
--slider-color: var(--bs-primary);
|
||||
--slider-background-color: var(--bs-primary-bg-subtle);
|
||||
}
|
||||
|
||||
|
||||
.slider {
|
||||
height: 15px;
|
||||
border-radius: 5px;
|
||||
background: var(--slider-background-color);
|
||||
outline: none;
|
||||
transition: opacity 0.2s;
|
||||
opacity: .5;
|
||||
|
||||
&:hover {
|
||||
opacity: 1;
|
||||
}
|
||||
|
||||
&::-webkit-slider-thumb {
|
||||
-webkit-appearance: none;
|
||||
appearance: none;
|
||||
width: 25px;
|
||||
height: 25px;
|
||||
border-radius: 50%;
|
||||
background: var(--slider-color);
|
||||
cursor: pointer;
|
||||
}
|
||||
|
||||
&::-moz-range-thumb {
|
||||
width: 25px;
|
||||
height: 25px;
|
||||
border-radius: 50%;
|
||||
background: var(--slider-color);
|
||||
cursor: pointer;
|
||||
}
|
||||
}
|
||||
@@ -1,44 +0,0 @@
|
||||
import { ChangeEvent, FC, useEffect, useState } from "react";
|
||||
import "./Slider.scss";
|
||||
|
||||
interface SliderProps {
|
||||
min: number;
|
||||
max: number;
|
||||
current: number;
|
||||
onChange: (value: number) => void;
|
||||
}
|
||||
export const Slider: FC<SliderProps> = ({ min, max, current, onChange }) => {
|
||||
const [localValue, setLocalValue] = useState<number>(current);
|
||||
const [isDragging, setIsDragging] = useState<boolean>(false);
|
||||
|
||||
const handleChange = (e: ChangeEvent<HTMLInputElement>) => {
|
||||
setLocalValue(Number(e.target.value));
|
||||
};
|
||||
|
||||
const handleMouseDown = () => {
|
||||
setIsDragging(true);
|
||||
};
|
||||
|
||||
const handleMouseUp = () => {
|
||||
setIsDragging(false);
|
||||
onChange(localValue);
|
||||
};
|
||||
useEffect(() => {
|
||||
if (!isDragging) setLocalValue(current);
|
||||
}, [current, isDragging]);
|
||||
|
||||
return (
|
||||
<div className="w-100">
|
||||
<input
|
||||
type="range"
|
||||
min={min}
|
||||
max={max}
|
||||
value={localValue}
|
||||
onChange={handleChange}
|
||||
onMouseDown={handleMouseDown}
|
||||
onMouseUp={handleMouseUp}
|
||||
className="slider w-100"
|
||||
/>
|
||||
</div>
|
||||
);
|
||||
};
|
||||
@@ -1,8 +0,0 @@
|
||||
@import "../../node_modules/bootstrap/scss/bootstrap.scss";
|
||||
|
||||
.songListItem {
|
||||
height: 3em;
|
||||
&:hover {
|
||||
@extend .bg-dark-subtle;
|
||||
}
|
||||
}
|
||||
@@ -1,63 +0,0 @@
|
||||
import { useWebSocket } from "../contexts/useWebSocket";
|
||||
import classes from "./SongQueue.module.scss";
|
||||
|
||||
export const SongQueue = () => {
|
||||
const { songQueue, sendMessage } = useWebSocket();
|
||||
|
||||
return (
|
||||
<div>
|
||||
{songQueue && (
|
||||
<div>
|
||||
<ul className="list-group">
|
||||
{songQueue.song_file_list.map((s, i) => {
|
||||
const isCurrent = i === songQueue.position;
|
||||
return (
|
||||
<li
|
||||
key={i}
|
||||
className={` list-group-item m-0 p-0 ${
|
||||
isCurrent && "bg-primary-subtle"
|
||||
} ${classes.songListItem}`}
|
||||
>
|
||||
<div className="row h-100">
|
||||
<div className="col-1 text-end my-auto">
|
||||
{!isCurrent && (
|
||||
<i
|
||||
className="bi bi-play-circle text-primary fs-3 "
|
||||
role="button"
|
||||
onClick={() => {
|
||||
sendMessage({
|
||||
action: "set_position",
|
||||
position: i,
|
||||
});
|
||||
}}
|
||||
></i>
|
||||
)}
|
||||
{isCurrent && (
|
||||
<i
|
||||
className="bi bi-pause-circle text-primary fs-3 "
|
||||
role="button"
|
||||
onClick={() => {
|
||||
// send pause message
|
||||
// sendMessage({
|
||||
// action: "set_position",
|
||||
// position: i,
|
||||
// });
|
||||
}}
|
||||
></i>
|
||||
)}
|
||||
</div>
|
||||
<div className="col my-auto">
|
||||
{s.filename
|
||||
.substring(s.filename.lastIndexOf("/") + 1)
|
||||
.replace(".mp3", "")}
|
||||
</div>
|
||||
</div>
|
||||
</li>
|
||||
);
|
||||
})}
|
||||
</ul>
|
||||
</div>
|
||||
)}
|
||||
</div>
|
||||
);
|
||||
};
|
||||
@@ -1,17 +0,0 @@
|
||||
import { useEffect } from "react";
|
||||
|
||||
const updateInterval = 100;
|
||||
|
||||
const getPlaybackInfo = (ws: WebSocket) => {
|
||||
ws.send(JSON.stringify({ action: "get_playback_info" }));
|
||||
};
|
||||
export const useInfoTask = (websocket?: WebSocket) => {
|
||||
useEffect(() => {
|
||||
const interval = setInterval(() => {
|
||||
if(websocket)
|
||||
getPlaybackInfo(websocket);
|
||||
}, updateInterval);
|
||||
|
||||
return () => clearInterval(interval);
|
||||
}, [websocket]);
|
||||
};
|
||||
@@ -1,82 +0,0 @@
|
||||
import {
|
||||
FC,
|
||||
ReactNode,
|
||||
useEffect,
|
||||
useState,
|
||||
} from "react";
|
||||
import { BotResponse, PlaybackInfoData, SongQueue } from "../models";
|
||||
import { WebSocketContext } from "./useWebSocket";
|
||||
|
||||
export const WebSocketProvider: FC<{ children: ReactNode }> = ({
|
||||
children,
|
||||
}) => {
|
||||
const [ws, setWs] = useState<WebSocket | undefined>();
|
||||
const [playbackInfo, setPlaybackInfo] = useState<
|
||||
PlaybackInfoData | undefined
|
||||
>();
|
||||
const [songQueue, setSongQueue] = useState<SongQueue | undefined>();
|
||||
const [error, setError] = useState<string>("");
|
||||
const [message, setMessage] = useState("");
|
||||
const [botStatus, setBotStatus] = useState<string | undefined>();
|
||||
|
||||
useEffect(() => {
|
||||
const websocket = new WebSocket(`ws://server.alexmickelson.guru:5678/`);
|
||||
// const websocket = new WebSocket(`ws://${window.location.hostname}:5678/`);
|
||||
|
||||
setWs(websocket);
|
||||
|
||||
websocket.onopen = () => {
|
||||
console.log("websocket connected");
|
||||
websocket.send(JSON.stringify({ action: "get_playback_info" }));
|
||||
};
|
||||
|
||||
websocket.onmessage = (event) => {
|
||||
const response: BotResponse = JSON.parse(event.data);
|
||||
setBotStatus(response.status);
|
||||
if (response.message_type === "ERROR") {
|
||||
setError(response.error ?? "");
|
||||
} else if (response.message_type === "MESSAGE") {
|
||||
setMessage(response.message ?? "");
|
||||
} else if (response.message_type === "PLAYBACK_INFORMATION") {
|
||||
setPlaybackInfo(response.playback_information);
|
||||
setSongQueue(response.song_queue);
|
||||
}
|
||||
};
|
||||
|
||||
websocket.onerror = (event: Event) => {
|
||||
console.log(event);
|
||||
setError("WebSocket error occurred.");
|
||||
};
|
||||
|
||||
websocket.onclose = () => {
|
||||
console.log("WebSocket connection closed");
|
||||
};
|
||||
|
||||
return () => {
|
||||
setWs(undefined);
|
||||
websocket.close();
|
||||
};
|
||||
}, []);
|
||||
|
||||
const sendMessage = (message: unknown) => {
|
||||
if (ws) {
|
||||
ws.send(JSON.stringify(message));
|
||||
}
|
||||
};
|
||||
|
||||
return (
|
||||
<WebSocketContext.Provider
|
||||
value={{
|
||||
ws,
|
||||
error,
|
||||
message,
|
||||
botStatus,
|
||||
playbackInfo,
|
||||
songQueue,
|
||||
sendMessage,
|
||||
}}
|
||||
>
|
||||
{children}
|
||||
</WebSocketContext.Provider>
|
||||
);
|
||||
};
|
||||
@@ -1,24 +0,0 @@
|
||||
import { createContext, useContext } from "react";
|
||||
import { PlaybackInfoData, SongQueue } from "../models";
|
||||
|
||||
interface WebSocketContextType {
|
||||
ws: WebSocket | undefined;
|
||||
error: string;
|
||||
message: string;
|
||||
botStatus: string | undefined;
|
||||
playbackInfo: PlaybackInfoData | undefined;
|
||||
songQueue: SongQueue | undefined;
|
||||
sendMessage: (message: unknown) => void;
|
||||
}
|
||||
|
||||
export const WebSocketContext = createContext<WebSocketContextType | undefined>(
|
||||
undefined
|
||||
);
|
||||
|
||||
export const useWebSocket = () => {
|
||||
const context = useContext(WebSocketContext);
|
||||
if (!context) {
|
||||
throw new Error("useWebSocket must be used within a WebSocketProvider");
|
||||
}
|
||||
return context;
|
||||
};
|
||||
@@ -1,15 +0,0 @@
|
||||
import React from "react";
|
||||
import ReactDOM from "react-dom/client";
|
||||
import "bootstrap";
|
||||
import "bootstrap/scss/bootstrap.scss";
|
||||
import "bootstrap-icons/font/bootstrap-icons.css";
|
||||
import { App } from "./App";
|
||||
import { WebSocketProvider } from "./contexts/WebSocketContext";
|
||||
|
||||
ReactDOM.createRoot(document.getElementById("root")!).render(
|
||||
<React.StrictMode>
|
||||
<WebSocketProvider>
|
||||
<App />
|
||||
</WebSocketProvider>
|
||||
</React.StrictMode>
|
||||
);
|
||||
@@ -1,27 +0,0 @@
|
||||
export enum BotStatus {
|
||||
PLAYING = "Playing",
|
||||
Idle = "Idle",
|
||||
}
|
||||
|
||||
export interface PlaybackInfoData {
|
||||
file_name: string;
|
||||
current_position: number;
|
||||
duration: number;
|
||||
}
|
||||
|
||||
export interface SongQueue {
|
||||
song_file_list: {
|
||||
filename: string;
|
||||
duration: number;
|
||||
}[];
|
||||
position: number;
|
||||
}
|
||||
|
||||
export interface BotResponse {
|
||||
message_type: "PLAYBACK_INFORMATION" | "ERROR" | "MESSAGE";
|
||||
status: BotStatus;
|
||||
error?: string;
|
||||
message?: string;
|
||||
playback_information?: PlaybackInfoData;
|
||||
song_queue?: SongQueue;
|
||||
}
|
||||
1
discord-bot/client/src/vite-env.d.ts
vendored
1
discord-bot/client/src/vite-env.d.ts
vendored
@@ -1 +0,0 @@
|
||||
/// <reference types="vite/client" />
|
||||
@@ -1,27 +0,0 @@
|
||||
{
|
||||
"compilerOptions": {
|
||||
"composite": true,
|
||||
"tsBuildInfoFile": "./node_modules/.tmp/tsconfig.app.tsbuildinfo",
|
||||
"target": "ES2020",
|
||||
"useDefineForClassFields": true,
|
||||
"lib": ["ES2020", "DOM", "DOM.Iterable"],
|
||||
"module": "ESNext",
|
||||
"skipLibCheck": true,
|
||||
|
||||
/* Bundler mode */
|
||||
"moduleResolution": "bundler",
|
||||
"allowImportingTsExtensions": true,
|
||||
"resolveJsonModule": true,
|
||||
"isolatedModules": true,
|
||||
"moduleDetection": "force",
|
||||
"noEmit": true,
|
||||
"jsx": "react-jsx",
|
||||
|
||||
/* Linting */
|
||||
"strict": true,
|
||||
"noUnusedLocals": true,
|
||||
"noUnusedParameters": true,
|
||||
"noFallthroughCasesInSwitch": true
|
||||
},
|
||||
"include": ["src"]
|
||||
}
|
||||
@@ -1,11 +0,0 @@
|
||||
{
|
||||
"files": [],
|
||||
"references": [
|
||||
{
|
||||
"path": "./tsconfig.app.json"
|
||||
},
|
||||
{
|
||||
"path": "./tsconfig.node.json"
|
||||
}
|
||||
]
|
||||
}
|
||||
@@ -1,13 +0,0 @@
|
||||
{
|
||||
"compilerOptions": {
|
||||
"composite": true,
|
||||
"tsBuildInfoFile": "./node_modules/.tmp/tsconfig.node.tsbuildinfo",
|
||||
"skipLibCheck": true,
|
||||
"module": "ESNext",
|
||||
"moduleResolution": "bundler",
|
||||
"allowSyntheticDefaultImports": true,
|
||||
"strict": true,
|
||||
"noEmit": true
|
||||
},
|
||||
"include": ["vite.config.ts"]
|
||||
}
|
||||
@@ -1,7 +0,0 @@
|
||||
import { defineConfig } from 'vite'
|
||||
import react from '@vitejs/plugin-react'
|
||||
|
||||
// https://vitejs.dev/config/
|
||||
export default defineConfig({
|
||||
plugins: [react()],
|
||||
})
|
||||
@@ -1,115 +0,0 @@
|
||||
import os
|
||||
from pprint import pprint
|
||||
from typing import Set
|
||||
import discord
|
||||
from discord.ext import commands
|
||||
from dotenv import load_dotenv
|
||||
from fastapi.concurrency import asynccontextmanager
|
||||
from pydantic import BaseModel
|
||||
import asyncio
|
||||
import websockets
|
||||
import json
|
||||
from src.models import BotResponse
|
||||
from src.my_voice_client import get_voice_client, set_voice_client
|
||||
from src.playback_service import (
|
||||
handle_message,
|
||||
handle_new_song_on_queue,
|
||||
pause_song,
|
||||
)
|
||||
from src.song_queue import add_to_queue
|
||||
|
||||
load_dotenv()
|
||||
|
||||
from fastapi import FastAPI
|
||||
from fastapi.staticfiles import StaticFiles
|
||||
|
||||
|
||||
bot = commands.Bot(command_prefix="!", intents=discord.Intents.all())
|
||||
connected_clients: Set[websockets.WebSocketServerProtocol] = set()
|
||||
|
||||
async def broadcast_bot_response(response: BotResponse):
|
||||
if connected_clients:
|
||||
await asyncio.wait(
|
||||
[
|
||||
asyncio.create_task(client.send(response.model_dump_json()))
|
||||
for client in connected_clients
|
||||
]
|
||||
)
|
||||
else:
|
||||
raise TypeError("Passing coroutines is forbidden, use tasks explicitly.")
|
||||
|
||||
async def send_response_message(
|
||||
websocket: websockets.WebSocketServerProtocol, response: BotResponse
|
||||
):
|
||||
await websocket.send(response.model_dump_json())
|
||||
|
||||
async def websocket_handler(websocket: websockets.WebSocketServerProtocol):
|
||||
connected_clients.add(websocket)
|
||||
try:
|
||||
async for message in websocket:
|
||||
data = json.loads(message)
|
||||
response = handle_message(data)
|
||||
await send_response_message(websocket, response)
|
||||
|
||||
except websockets.ConnectionClosedError as e:
|
||||
print(f"Connection closed with error: {e}")
|
||||
except Exception as e:
|
||||
print(f"Unexpected error: {e}")
|
||||
raise e
|
||||
finally:
|
||||
connected_clients.remove(websocket)
|
||||
print("WebSocket connection closed")
|
||||
|
||||
@bot.event
|
||||
async def on_ready():
|
||||
print("Bot is ready")
|
||||
|
||||
@bot.command(name="play", pass_context=True)
|
||||
async def play(ctx: commands.Context, url: str):
|
||||
print("playing", url)
|
||||
channel = ctx.message.author.voice.channel
|
||||
|
||||
if ctx.voice_client is None:
|
||||
set_voice_client(await channel.connect())
|
||||
add_to_queue(url)
|
||||
handle_new_song_on_queue()
|
||||
|
||||
@bot.command(name="url")
|
||||
async def url(ctx: commands.Context):
|
||||
await ctx.send("http://server.alexmickelson.guru:5677/")
|
||||
|
||||
@bot.command(pass_context=True)
|
||||
async def stop(ctx: commands.Context):
|
||||
voice_client = get_voice_client()
|
||||
if voice_client and voice_client.is_playing():
|
||||
voice_client.stop()
|
||||
await voice_client.disconnect()
|
||||
await ctx.send("Stopped playing")
|
||||
|
||||
@bot.command(pass_context=True)
|
||||
async def pause(ctx: commands.Context):
|
||||
pause_song()
|
||||
|
||||
async def start_websocket_server():
|
||||
print("Starting WebSocket server...")
|
||||
async with websockets.serve(websocket_handler, "0.0.0.0", 5678, ):
|
||||
await asyncio.Future()
|
||||
|
||||
@asynccontextmanager
|
||||
async def lifespan(app: FastAPI):
|
||||
# Start WebSocket and Discord bot in managed background tasks
|
||||
websocket_task = asyncio.create_task(start_websocket_server())
|
||||
bot_task = asyncio.create_task(bot.start(os.getenv("DISCORD_SECRET")))
|
||||
|
||||
app.state.websocket_task = websocket_task
|
||||
app.state.bot_task = bot_task
|
||||
|
||||
yield
|
||||
|
||||
app.state.websocket_task.cancel()
|
||||
app.state.bot_task.cancel()
|
||||
await asyncio.gather(app.state.websocket_task, app.state.bot_task, return_exceptions=True)
|
||||
|
||||
app = FastAPI(lifespan=lifespan)
|
||||
|
||||
app.mount("/", StaticFiles(directory="./client", html=True), name="static")
|
||||
@@ -1,10 +0,0 @@
|
||||
discord
|
||||
yt_dlp
|
||||
PyNaCl
|
||||
python-dotenv
|
||||
websockets
|
||||
ffmpeg
|
||||
pydantic
|
||||
mutagen
|
||||
fastapi
|
||||
fastapi[standard]
|
||||
@@ -1,17 +0,0 @@
|
||||
#!/bin/bash
|
||||
|
||||
docker pull node:20
|
||||
docker pull python:3.12
|
||||
docker build -t discord-bot .
|
||||
# docker run -it --rm discord-bot
|
||||
|
||||
|
||||
echo $DISCORD_SECRET
|
||||
docker rm -f discord-bot || true
|
||||
docker run -d \
|
||||
--name discord-bot \
|
||||
-e DISCORD_SECRET=$DISCORD_SECRET \
|
||||
--restart always \
|
||||
-p 0.0.0.0:5677:5677 \
|
||||
-p 0.0.0.0:5678:5678 \
|
||||
discord-bot
|
||||
@@ -1,39 +0,0 @@
|
||||
from enum import Enum
|
||||
from typing import List, Optional
|
||||
from pydantic import BaseModel
|
||||
|
||||
|
||||
class BotStatus(str, Enum):
|
||||
PLAYING = "Playing"
|
||||
IDLE = "Idle"
|
||||
|
||||
|
||||
class MessageType(str, Enum):
|
||||
PLAYBACK_INFORMATION = "PLAYBACK_INFORMATION"
|
||||
ERROR = "ERROR"
|
||||
MESSAGE = "MESSAGE"
|
||||
|
||||
|
||||
class SongItem(BaseModel):
|
||||
filename: str
|
||||
duration: int
|
||||
|
||||
|
||||
class SongQueueStatus(BaseModel):
|
||||
song_file_list: list[SongItem]
|
||||
position: int
|
||||
|
||||
|
||||
class PlaybackInformation(BaseModel):
|
||||
file_name: str
|
||||
current_position: float
|
||||
duration: float
|
||||
|
||||
|
||||
class BotResponse(BaseModel):
|
||||
message_type: MessageType
|
||||
status: BotStatus
|
||||
error: Optional[str] = None
|
||||
message: Optional[str] = None
|
||||
playback_information: Optional[PlaybackInformation] = None
|
||||
song_queue: Optional[SongQueueStatus] = None
|
||||
@@ -1,14 +0,0 @@
|
||||
from discord import VoiceClient
|
||||
|
||||
|
||||
__voice_client: VoiceClient | None = None
|
||||
|
||||
|
||||
def get_voice_client():
|
||||
global __voice_client
|
||||
return __voice_client
|
||||
|
||||
|
||||
def set_voice_client(client: VoiceClient | None):
|
||||
global __voice_client
|
||||
__voice_client = client
|
||||
@@ -1,192 +0,0 @@
|
||||
import time
|
||||
import discord
|
||||
from src.models import BotResponse, BotStatus, MessageType, PlaybackInformation
|
||||
from src.my_voice_client import get_voice_client
|
||||
from src.song_queue import (
|
||||
get_current_metadata,
|
||||
get_queue_status,
|
||||
handle_song_end,
|
||||
has_current_song,
|
||||
move_to_last_song_in_queue,
|
||||
set_current_song_start_time,
|
||||
set_queue_position,
|
||||
)
|
||||
|
||||
pause_offset = -1
|
||||
|
||||
|
||||
def after_playing(error):
|
||||
if error:
|
||||
print(f"Error during playback: {error}")
|
||||
fileName, duration, start_time = get_current_metadata()
|
||||
print(f"Finished playing {fileName}")
|
||||
|
||||
fileName, duration, start_time = get_current_metadata()
|
||||
current_playing_time = time.time() - start_time
|
||||
|
||||
if current_playing_time > (duration - 1):
|
||||
# song ended
|
||||
handle_song_end()
|
||||
if has_current_song():
|
||||
print("start next song")
|
||||
play_current_song()
|
||||
else:
|
||||
print("end of queue")
|
||||
else:
|
||||
print("not changing song because it is still playing")
|
||||
|
||||
|
||||
def change_playback_position(position: int):
|
||||
fileName, duration, start_time = get_current_metadata()
|
||||
voice_client = get_voice_client()
|
||||
if voice_client and voice_client.is_playing():
|
||||
voice_client.pause()
|
||||
audio = discord.FFmpegPCMAudio(
|
||||
source=fileName, before_options=f"-ss {position}"
|
||||
)
|
||||
voice_client.play(audio, after=after_playing)
|
||||
set_current_song_start_time(time.time() - position)
|
||||
return {"status": "Playback position changed"}
|
||||
else:
|
||||
print("cannot change position, no song playing")
|
||||
return None
|
||||
|
||||
|
||||
def play_current_song():
|
||||
if has_current_song():
|
||||
fileName, duration, start_time = get_current_metadata()
|
||||
start_time_now()
|
||||
get_voice_client().play(
|
||||
discord.FFmpegPCMAudio(source=fileName), after=after_playing
|
||||
)
|
||||
|
||||
|
||||
def get_status():
|
||||
voice_client = get_voice_client()
|
||||
if voice_client and voice_client.is_playing():
|
||||
return BotStatus.PLAYING
|
||||
return BotStatus.IDLE
|
||||
|
||||
|
||||
def get_playback_info():
|
||||
fileName, duration, start_time = get_current_metadata()
|
||||
voice_client = get_voice_client()
|
||||
if voice_client and voice_client.is_playing():
|
||||
elapsed_time = time.time() - start_time
|
||||
|
||||
return PlaybackInformation(
|
||||
file_name=fileName,
|
||||
current_position=elapsed_time,
|
||||
duration=duration,
|
||||
)
|
||||
else:
|
||||
return None
|
||||
|
||||
|
||||
def handle_message(data) -> BotResponse:
|
||||
if "action" not in data:
|
||||
response = BotResponse(
|
||||
message_type=MessageType.ERROR,
|
||||
status=get_status(),
|
||||
error="Invalid request, action is required",
|
||||
)
|
||||
return response
|
||||
|
||||
if data["action"] == "set_playback":
|
||||
if "position" not in data:
|
||||
response = BotResponse(
|
||||
message_type=MessageType.ERROR,
|
||||
status=get_status(),
|
||||
error="Invalid request, position is required",
|
||||
)
|
||||
return response
|
||||
|
||||
result = change_playback_position(data["position"])
|
||||
if result:
|
||||
response = BotResponse(
|
||||
message_type=MessageType.MESSAGE,
|
||||
status=get_status(),
|
||||
message="position changed",
|
||||
)
|
||||
return response
|
||||
else:
|
||||
response = BotResponse(
|
||||
message_type=MessageType.ERROR,
|
||||
status=get_status(),
|
||||
error="unable to change position",
|
||||
)
|
||||
return response
|
||||
elif data["action"] == "set_position":
|
||||
if "position" not in data:
|
||||
response = BotResponse(
|
||||
message_type=MessageType.ERROR,
|
||||
status=get_status(),
|
||||
error="Invalid request, position is required",
|
||||
)
|
||||
return response
|
||||
set_queue_position(data["position"])
|
||||
get_voice_client().stop()
|
||||
play_current_song()
|
||||
info = get_playback_info()
|
||||
response = BotResponse(
|
||||
message_type=MessageType.PLAYBACK_INFORMATION,
|
||||
status=BotStatus.PLAYING if info else BotStatus.IDLE,
|
||||
playback_information=info,
|
||||
song_queue=get_queue_status(),
|
||||
)
|
||||
return response
|
||||
|
||||
elif data["action"] == "get_playback_info":
|
||||
if not has_current_song():
|
||||
return BotResponse(
|
||||
message_type=MessageType.PLAYBACK_INFORMATION,
|
||||
status=BotStatus.IDLE,
|
||||
playback_information=None,
|
||||
song_queue=get_queue_status(),
|
||||
)
|
||||
info = get_playback_info()
|
||||
response = BotResponse(
|
||||
message_type=MessageType.PLAYBACK_INFORMATION,
|
||||
status=BotStatus.PLAYING if info else BotStatus.IDLE,
|
||||
playback_information=info,
|
||||
song_queue=get_queue_status(),
|
||||
)
|
||||
return response
|
||||
|
||||
|
||||
def get_filename_and_starttime():
|
||||
fileName, duration, start_time = get_current_metadata()
|
||||
return fileName, start_time
|
||||
|
||||
|
||||
def start_time_now():
|
||||
set_current_song_start_time(time.time())
|
||||
|
||||
|
||||
def handle_new_song_on_queue():
|
||||
if not has_current_song():
|
||||
move_to_last_song_in_queue()
|
||||
if has_current_song():
|
||||
play_current_song()
|
||||
else:
|
||||
print("moving to the last song did not put us on a current song")
|
||||
else:
|
||||
print("not moving to new song because there is current song")
|
||||
|
||||
|
||||
def pause_song():
|
||||
global pause_offset
|
||||
voice_client = get_voice_client()
|
||||
if voice_client and voice_client.is_playing():
|
||||
fileName, duration, start_time = get_current_metadata()
|
||||
pause_offset = time.time() - start_time
|
||||
voice_client.pause()
|
||||
|
||||
|
||||
def unpause_song():
|
||||
global pause_offset
|
||||
voice_client = get_voice_client()
|
||||
if voice_client and voice_client.is_playing():
|
||||
voice_client.resume()
|
||||
set_current_song_start_time(time.time() - pause_offset)
|
||||
pause_offset = -1
|
||||
@@ -1,95 +0,0 @@
|
||||
from typing import List
|
||||
|
||||
from pydantic import BaseModel
|
||||
import yt_dlp
|
||||
|
||||
from src.models import SongItem, SongQueueStatus
|
||||
|
||||
|
||||
song_file_list: List[SongItem] = []
|
||||
current_position = -1
|
||||
current_song_start_time = 0
|
||||
|
||||
|
||||
def __download_url(url: str):
|
||||
fileName = ""
|
||||
|
||||
def yt_dlp_monitor(d):
|
||||
nonlocal fileName
|
||||
final_filename = d.get("info_dict").get("_filename")
|
||||
fileName = final_filename
|
||||
|
||||
ydl_opts = {
|
||||
"extract_audio": True,
|
||||
"format": "bestaudio/best",
|
||||
"outtmpl": "./songs/%(title)s.mp3",
|
||||
"progress_hooks": [yt_dlp_monitor],
|
||||
}
|
||||
with yt_dlp.YoutubeDL(ydl_opts) as ydl:
|
||||
res = ydl.extract_info(url)
|
||||
song_duration = res["duration"]
|
||||
return fileName, song_duration
|
||||
|
||||
|
||||
def add_to_queue(url: str):
|
||||
global current_song_start_time, song_file_list, current_position
|
||||
filename, duration = __download_url(url)
|
||||
song = SongItem(filename=filename, duration=duration)
|
||||
song_file_list.append(song)
|
||||
|
||||
|
||||
def has_current_song():
|
||||
global current_song_start_time, song_file_list, current_position
|
||||
if not song_file_list:
|
||||
return False
|
||||
if len(song_file_list) == current_position:
|
||||
return False
|
||||
if current_position == -1:
|
||||
return False
|
||||
return True
|
||||
|
||||
|
||||
def get_current_metadata():
|
||||
global current_song_start_time, song_file_list, current_position
|
||||
if not has_current_song():
|
||||
print("cannot request metadata when no current song")
|
||||
return None
|
||||
|
||||
return (
|
||||
song_file_list[current_position].filename,
|
||||
song_file_list[current_position].duration,
|
||||
current_song_start_time,
|
||||
)
|
||||
|
||||
|
||||
def set_current_song_start_time(start_time: float):
|
||||
global current_song_start_time, song_file_list, current_position
|
||||
current_song_start_time = start_time
|
||||
|
||||
|
||||
def handle_song_end():
|
||||
global current_song_start_time, song_file_list, current_position
|
||||
print("handling song end ", current_position, len(song_file_list))
|
||||
if current_position == -1:
|
||||
return
|
||||
if current_position == (len(song_file_list) - 1):
|
||||
print("last song ended, reseting position")
|
||||
current_position = -1
|
||||
return
|
||||
print("song ended, moving to next song")
|
||||
current_position += 1
|
||||
|
||||
|
||||
def move_to_last_song_in_queue():
|
||||
global current_song_start_time, song_file_list, current_position
|
||||
current_position = len(song_file_list) - 1
|
||||
|
||||
|
||||
def get_queue_status():
|
||||
global current_song_start_time, song_file_list, current_position
|
||||
return SongQueueStatus(song_file_list=song_file_list, position=current_position)
|
||||
|
||||
|
||||
def set_queue_position(position: int):
|
||||
global current_song_start_time, song_file_list, current_position
|
||||
current_position = position
|
||||
@@ -37,6 +37,7 @@ in {
|
||||
ghostty
|
||||
nixgl.nixGLIntel
|
||||
(config.lib.nixGL.wrap ghostty)
|
||||
wl-clipboard
|
||||
];
|
||||
|
||||
programs.ghostty = {
|
||||
@@ -74,6 +75,83 @@ export DOTNET_ROOT=${pkgs.dotnetCorePackages.sdk_8_0}
|
||||
|
||||
set -x LIBVIRT_DEFAULT_URI qemu:///system
|
||||
set -x TERM xterm-256color # ghostty
|
||||
|
||||
# https://github.com/DevAtDawn/gh-fish/blob/main/gh-copilot-alias.fish
|
||||
function ghcs
|
||||
set -l FUNCNAME (status function)
|
||||
set -l TARGET "shell"
|
||||
set -l GH_DEBUG "$GH_DEBUG"
|
||||
set -l GH_HOST "$GH_HOST"
|
||||
set -l __USAGE "
|
||||
Wrapper around \`gh copilot suggest\` to suggest a command based on a natural language description of the desired output effort.
|
||||
Supports executing suggested commands if applicable.
|
||||
USAGE
|
||||
$FUNCNAME [flags] <prompt>
|
||||
FLAGS
|
||||
-d, --debug Enable debugging
|
||||
-h, --help Display help usage
|
||||
--hostname The GitHub host to use for authentication
|
||||
-t, --target target Target for suggestion; must be shell, gh, git
|
||||
default: \"$TARGET\"
|
||||
EXAMPLES
|
||||
- Guided experience
|
||||
$FUNCNAME
|
||||
- Git use cases
|
||||
$FUNCNAME -t git \"Undo the most recent local commits\"
|
||||
$FUNCNAME -t git \"Clean up local branches\"
|
||||
$FUNCNAME -t git \"Setup LFS for images\"
|
||||
- Working with the GitHub CLI in the terminal
|
||||
$FUNCNAME -t gh \"Create pull request\"
|
||||
$FUNCNAME -t gh \"List pull requests waiting for my review\"
|
||||
$FUNCNAME -t gh \"Summarize work I have done in issues and pull requests for promotion\"
|
||||
- General use cases
|
||||
$FUNCNAME \"Kill processes holding onto deleted files\"
|
||||
$FUNCNAME \"Test whether there are SSL/TLS issues with github.com\"
|
||||
$FUNCNAME \"Convert SVG to PNG and resize\"
|
||||
$FUNCNAME \"Convert MOV to animated PNG\"
|
||||
"
|
||||
|
||||
set -l argv_copy $argv
|
||||
for i in (seq (count $argv_copy))
|
||||
switch $argv_copy[$i]
|
||||
case '-d' '--debug'
|
||||
set -l GH_DEBUG "api"
|
||||
case '-h' '--help'
|
||||
echo "$__USAGE"
|
||||
return 0
|
||||
case '--hostname'
|
||||
set -l GH_HOST $argv_copy[(math $i + 1)]
|
||||
set -e argv_copy[(math $i + 1)]
|
||||
case '-t' '--target'
|
||||
set -l TARGET $argv_copy[(math $i + 1)]
|
||||
set -e argv_copy[(math $i + 1)]
|
||||
end
|
||||
end
|
||||
|
||||
set -e argv_copy[1..(math $i - 1)]
|
||||
|
||||
set -l TMPFILE (mktemp -t gh-copilotXXXXXX)
|
||||
function cleanup
|
||||
rm -f "$TMPFILE"
|
||||
end
|
||||
trap cleanup EXIT
|
||||
|
||||
if env GH_DEBUG="$GH_DEBUG" GH_HOST="$GH_HOST" gh copilot suggest -t "$TARGET" $argv_copy --shell-out "$TMPFILE"
|
||||
if test -s "$TMPFILE"
|
||||
set -l FIXED_CMD (cat $TMPFILE)
|
||||
history --merge --save -- $FIXED_CMD
|
||||
echo
|
||||
eval $FIXED_CMD
|
||||
end
|
||||
else
|
||||
return 1
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
function plz
|
||||
ghcs suggest "$argv"
|
||||
end
|
||||
'';
|
||||
};
|
||||
home.file = {
|
||||
|
||||
Reference in New Issue
Block a user