From 211c45891e77d1133016cccb50ccc0d7b937edf3 Mon Sep 17 00:00:00 2001
From: Migatu <mtuszowski@gmail.com>
Date: Fri, 29 Mar 2024 14:58:46 +0100
Subject: [PATCH] Work on deployment

fix

fax

fx

Fin part

fx

121

Temp fix

as

aa

fx

f5

fx4

fix

fx1

Work on deployment
---
 bot.py                           |  2 ++
 deploy.sh                        |  4 ++--
 file_webservice/requirements.txt |  4 ----
 install.sh                       |  9 +++++++++
 requirements.txt                 | 12 ++++++++++++
 start.sh                         |  3 ---
 6 files changed, 25 insertions(+), 9 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 f5ec0a5..832cc4f 100644
--- a/bot.py
+++ b/bot.py
@@ -706,6 +706,8 @@ async def get_file(ctx, source, link):
                     "force_keyframes": True,
                 },
             ]
+            #TODO: Make sponsorblock work
+            sponsorblock_postprocessor = []
             if platform == "win32":
                 dir_path = "G:\\Muzyka\\Youtube"
             else:
diff --git a/deploy.sh b/deploy.sh
index 63aec39..1f58f7b 100755
--- a/deploy.sh
+++ b/deploy.sh
@@ -1,9 +1,9 @@
 #!/bin/bash
-cd ./conjurer/
 git pull
 cd ..
 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 2f4e972..0000000
--- a/file_webservice/requirements.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-discord
-yt_dl
-spotify_dl
-spotipy
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 2f1891c..0000000
--- a/start.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/bash
-python3 -m venv /home/pi/Conjurer/env
-python3 /home/pi/Conjurer/bot.py