From 20caa5600a290e957c1e495b1c913ec5c2916a43 Mon Sep 17 00:00:00 2001
From: Migatu <mtuszowski@gmail.com>
Date: Fri, 29 Mar 2024 15:00:30 +0100
Subject: [PATCH] name change and othre bugfixes

fix

fax

fx

121

as

aa

fx

f5

fx4

fix

fx1
---
 bot.py                           |  1 -
 deploy.sh                        | 10 +++++-----
 file_webservice/requirements.txt |  5 -----
 install.sh                       |  9 +++++++++
 requirements.txt                 | 12 ++++++++++++
 start.sh                         |  5 -----
 6 files changed, 26 insertions(+), 16 deletions(-)
 delete mode 100644 file_webservice/requirements.txt
 create mode 100755 install.sh
 create mode 100644 requirements.txt
 delete mode 100755 start.sh

diff --git a/bot.py b/bot.py
index 832cc4f..565308e 100644
--- a/bot.py
+++ b/bot.py
@@ -716,7 +716,6 @@ async def get_file(ctx, source, link):
                 "proxy": "",
                 "default_search": "ytsearch",
                 "format": "bestaudio/best",
-                "postprocessors": sponsorblock_postprocessor,
                 "noplaylist": True,
                 "no_color": False,
                 "paths": {"home": dir_path},
diff --git a/deploy.sh b/deploy.sh
index 36579bb..1f58f7b 100755
--- a/deploy.sh
+++ b/deploy.sh
@@ -1,9 +1,9 @@
 #!/bin/bash
 git pull
 cd ..
-cp ./bot.py ../Conjurer/
-cp ./settings.json ../Conjurer/
-cp ./system_gpt_settings.json ../Conjurer/
-cp ./start.sh ../Conjurer
-cp ./requirements.txt ../Conjurer/
+cp ./conjurer/bot.py ./Conjurer/
+cp ./conjurer/settings.json ./Conjurer/
+cp ./conjurer/system_gpt_settings.json ./Conjurer/
+cp ./conjurer/start.sh ./Conjurer/
+cp ./conjurer/requirements.txt ./Conjurer/requirements.txt
 sudo systemctl restart conjurer.service
diff --git a/file_webservice/requirements.txt b/file_webservice/requirements.txt
deleted file mode 100644
index b673960..0000000
--- a/file_webservice/requirements.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-discord
-yt_dl
-spotify_dl
-spotipy
-openai
\ No newline at end of file
diff --git a/install.sh b/install.sh
new file mode 100755
index 0000000..897b743
--- /dev/null
+++ b/install.sh
@@ -0,0 +1,9 @@
+#!/bin/bash
+python3 -m venv /home/pi/Conjurer/env
+source ./env/bin/activate
+./env/bin/python3 -m pip install --upgrade pip
+./env/bin/python3 -m pip install -r requirements.txt
+sed -i -e 's/os.rename/shutil.copy/g' ./env/lib/python3.11/site-packages/spotify_dl/youtube.py
+sed -i '1i\import shutil' ./env/lib/python3.11/site-packages/spotify_dl/youtube.py
+deactivate
+sudo systemctl restart conjurer.service
diff --git a/requirements.txt b/requirements.txt
new file mode 100644
index 0000000..9b0e1c0
--- /dev/null
+++ b/requirements.txt
@@ -0,0 +1,12 @@
+discord
+yt_dlp
+spotify_dl
+spotipy
+openai
+eyed3
+numpy
+pdf2image
+PyPDF2
+requests
+spotipy
+tiktoken
\ No newline at end of file
diff --git a/start.sh b/start.sh
deleted file mode 100755
index 484b965..0000000
--- a/start.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/bash
-python3 -m venv /home/pi/Conjurer/env
-source .venv/bin/activate
-./env/python3 -m pip install -r requirements.txt
-./env/python3 /home/pi/Conjurer/bot.py