Hello GPL!

README.md

@@ -1,4 +1,4 @@
-## [Install](https://gitea.dmcraft.online/justuser/getnetradio#0-install) | [Usage](https://gitea.dmcraft.online/justuser/getnetradio#1-usage) | [Telegram](https://t.me/getnetradio) | [Updates](https://gitea.dmcraft.online/justuser/getnetradio#contact-updates) | [Realeses](https://gitea.dmcraft.online/justuser/getnetradio/releases)
+## [Install](https://gitlab.com/justuser31/getnetradio/-/blob/master/README.md#0install) | [Usage](https://gitlab.com/justuser31/getnetradio/-/blob/master/README.md#1usage) | [Telegram](https://t.me/getnetradio) | [Updates](https://gitlab.com/justuser31/getnetradio/-/blob/master/README.md#contact-updates)
 
 
 -----
@@ -11,25 +11,20 @@ sudo pip3 install -U telegram-upload
 #Check if all works(If not,READ MESSAGE)
 telegram-upload README.md
 
-#Audio bitrate check and convert
-pip3 install pydub
-
-#INSTALL wget
-# https://www.gnu.org/software/wget/
-
 git clone https://notabug.org/Justuser/getnetradio.git
 cd getnetradio
 ```
 ### 1.Usage
 ```
-#ALL CONFIGS IN config.py
+#Config your stations and audio time in run.sh
+#Config upload audio file to teelegram in up.py
+--to https://t.me/getnetradio_nashe0punk
+#Here your link telegram channel
 
-
-#Start(nohup and "&" for work in background)
-nohup python3 main.py &
+#Start(nohup for work in background)
+nohup ./run.sh
 #Stop
 ./stop.sh
-#Or just kill main.py and wget
 ```
 
 
@@ -48,11 +43,7 @@ nohup python3 main.py &
 
 > 05.10.2022 - Migrate to gitlab.com
 
-> 06.10.2022 - Merge st.sh and up.py, new release.
 
-> 06.10.2022 - Add check bitrate and convert with "lame".
-
-> 06.10.2022 - New config,more easier.
 -----
 
 
@@ -68,6 +59,4 @@ git config --global credential.helper cache
 python3 -m http.server
 #Change repo
 git push --repo=https://gitlab.com/justuser31/getnetradio
-
-git clone --branch <branchname> <remote-repo-url>
 ```

config.py

@@ -1,17 +0,0 @@
-#DEV-MODE
-dev=True
-#Time in minutes
-time = "10"
-#Prefix for file save location( $prefix/your.mp3 )
-prefix= "~/ARCHIVE/"
-#Your radio
-radio = {
-
-#name_of_file.mp3 : ["https://link_to_radio.mp3","https://link_to_telegram"]
-#"-O name.mp3" after link to change name(look for example \/ )
-
-"nashepunks.mp3" : ["https://nashe1.hostingradio.ru:18000/nashepunks.mp3","https://t.me/getnetradio_nashe0punk"],
-"nrj.mp3" : ["https://ic7.101.ru:8000/v1_1 -O nrj.mp3","https://t.me/getnetradio_nrj"],
-"retrofm.mp3" : ["https://emgregion.hostingradio.ru:8064/moscow.retrofm.mp3 -O retrofm.mp3","https://t.me/getnetradio_retrofm"]
-
-}

main.py

@@ -1,77 +0,0 @@
-from os import listdir,system as ss
-from time import sleep
-#Theards
-import threading
-#Time&Date
-from datetime import date
-import time
-#Config
-import config
-#Check bitrate and convert audio
-from pydub import AudioSegment
-from pydub.utils import mediainfo
-
-
-#Import config
-tw = int(config.time)
-prefix = config.prefix
-rad = config.radio
-dev = bool(config.dev)
-###
-
-if dev == False:
-	wait = tw*60
-else:
-	wait = tw
-
-#Check bitrate and upload
-def tg(i,tim,group):
-	bit = int(mediainfo(i)['bit_rate'])/1000
-
-	if bit > 128:
-		sound = AudioSegment.from_file(i)
-		sound.export("tt.mp3", format="mp3", bitrate="128k")
-		ss("mv tt.mp3 "+i)
-
-
-	ss("telegram-upload "+i+" --to "+group+" --caption "+tim)
-	ss("mkdir "+prefix+tim)
-	ss("mv "+i+" "+prefix+tim+"/")
-
-
-#Upload in telegram
-def upload():
-	today = date.today()
-	files = listdir()
-	#Set date&time
-	tim = today.strftime("%d.%m.%Y_"+time.strftime("%H:%M", time.localtime()))
-
-	for i in files:
-		if rad.get(i) == None:
-			pass
-		else:
-			print("SUCCESS")
-			tg(i,tim,rad[i][1])
-#Download function
-def rad_down(ch):
-	ss("wget "+ch)
-
-
-while True:
-
-	#Run download
-	for i in rad:
-		th = threading.Thread(target=rad_down, args=(rad[i][0],))
-		th.start()
-
-	#Wait
-	sleep(wait)
-
-	#Stop download
-	ss("killall wget")
-
-	#Upload
-	upload()
-
-	if dev == True:
-		break

run.sh

@@ -0,0 +1,13 @@
+while :
+do
+	wget https://nashe1.hostingradio.ru:18000/nashepunks.mp3 &
+	th1=$!
+	wget https://ic7.101.ru:8000/v1_1 -O nrj.mp3 &
+	th2=$!
+
+	sleep 30m
+	kill -9 $th1
+	kill -9 $th2
+
+	python3 up.py
+done

stop.sh

@@ -1,4 +1,4 @@
-kl=$(ps aux | grep main.py | grep python3 | awk -F " " '{print $2}')
+kl=$(ps aux | grep run.sh | grep bin | awk -F " " '{print $2}')
 kill $kl
 killall wget
 rm *.mp3

up.py

@@ -0,0 +1,24 @@
+from os import listdir,system as ss
+from datetime import date
+import time
+
+today = date.today()
+files = listdir()
+prefix = "~/ARCHIVE/"
+
+for i in files:
+	tim = today.strftime("%d.%m.%Y_"+time.strftime("%H:%M", time.localtime()))
+
+	#Check type,no need for this
+	#tp = i[i.find('.') + 1:]
+
+	if i == "nashepunks.mp3":
+		ss("telegram-upload "+i+" --to https://t.me/getnetradio_nashe0punk --caption "+tim)
+		ss("mkdir "+prefix+tim)
+		ss("mv "+i+" "+prefix+tim+"/")
+	elif i == "nrj.mp3":
+		ss("telegram-upload "+i+" --to https://t.me/getnetradio_nrj --caption "+tim)
+		ss("mkdir "+prefix+tim)
+		ss("mv "+i+" "+prefix+tim+"/")
+	else:
+		pass