mirror of
https://github.com/migatu/conjurer.git
synced 2026-07-16 14:52:11 +00:00
Compare commits
147 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 1f5b678139 | |||
| b778a1c3f9 | |||
| 074452e6a9 | |||
| 7edd60c10a | |||
| c7af223155 | |||
| a79aa4e9a7 | |||
| d0c972c69b | |||
| 78c958e8f5 | |||
| 3ee7fcab59 | |||
| 75932ec507 | |||
| ee84d6ec32 | |||
| a8001ec19d | |||
| 95cd4760b7 | |||
| 0297527965 | |||
| f56935e48b | |||
| b9e0f73534 | |||
| 7f560decd3 | |||
| 88fdf35dc5 | |||
| b4fe6270a9 | |||
| c103b6b22e | |||
| 0e860fe6a9 | |||
| fdccde6137 | |||
| 043b1d3628 | |||
| afc5c42e30 | |||
| 74b7c22b6c | |||
| cf27b2f3f9 | |||
| 4aa442a802 | |||
| 3964336370 | |||
| 625579ebbb | |||
| ed71f7871d | |||
| ff8d1abf8a | |||
| a74b18f62a | |||
| 323a1ac021 | |||
| 993b303e2f | |||
| 3b7248cb00 | |||
| e35e028001 | |||
| 2c19e4565e | |||
| 853e952128 | |||
| 041544917c | |||
| 3ed4dcfbb4 | |||
| 276e814515 | |||
| 5dd2aadd7c | |||
| 19fbd27f3a | |||
| 8deea0584c | |||
| 9f0fadf908 | |||
| d176b762f7 | |||
| 85d276f2d4 | |||
| b031bd9fdc | |||
| b3722deef2 | |||
| 961ca74c14 | |||
| 0f596cbdba | |||
| 85be1ce9fc | |||
| 5983439a5d | |||
| fd4c066008 | |||
| dc8787956d | |||
| b499a6b456 | |||
| 1a4f4a6f17 | |||
| f44994688e | |||
| 2da45012f3 | |||
| ff9d2c67f0 | |||
| 20ac94b61d | |||
| e2d286d7b6 | |||
| 21ec8d8bc9 | |||
| e263857e4f | |||
| aa92b7f512 | |||
| 4ece2f215e | |||
| 85f91b3994 | |||
| ca2e1a35aa | |||
| f9dcec6d9e | |||
| 8ba676df9f | |||
| 69bf2973b9 | |||
| 41ad91ab93 | |||
| a4065684b0 | |||
| cc57b0c52d | |||
| 2e23956986 | |||
| f9c2bbf993 | |||
| b6bbb50707 | |||
| 3d5d8a2c14 | |||
| 9823a94025 | |||
| 194674705e | |||
| b513704a3d | |||
| 15253f95fb | |||
| 69afb00897 | |||
| e4a47d025c | |||
| 4f109da335 | |||
| 230242bf5c | |||
| e290e7d656 | |||
| 62f6b64bfb | |||
| cd307d642e | |||
| 81c43aadcc | |||
| 73057921ec | |||
| cd1beac93f | |||
| 784163b9c9 | |||
| 8429d4efd5 | |||
| 06192c41ad | |||
| 22730776d4 | |||
| a72dba291b | |||
| b98e3e4ebc | |||
| ff2669d079 | |||
| 05166859a3 | |||
| 4a6afa14cc | |||
| 5a74e813eb | |||
| be3f639573 | |||
| 620e6ddc06 | |||
| 6a6821ce4c | |||
| 2bb65bbc40 | |||
| aa63ffc754 | |||
| 0dbb79719b | |||
| 06d17a2e4d | |||
| ecc2e1f107 | |||
| a981209399 | |||
| 885f492f69 | |||
| 5363969456 | |||
| 637926973c | |||
| 9701c7233f | |||
| e6960c98b8 | |||
| 3f4018fa00 | |||
| 9af2d34179 | |||
| 93db61558c | |||
| 97f780688e | |||
| 49e1121967 | |||
| f4f4deb848 | |||
| b15c2f06b8 | |||
| 14b9a50f51 | |||
| 090adf3741 | |||
| 68d17a11b3 | |||
| 1b26fdd841 | |||
| f1129f18cb | |||
| 64669887a3 | |||
| 6d3ce5d714 | |||
| e05f58624a | |||
| 651d796254 | |||
| b3e5a1aaf3 | |||
| 1f0e03590d | |||
| 0ad06cc69c | |||
| 6b5d312231 | |||
| 0674e1a1a8 | |||
| 61acd3f3f3 | |||
| 3ccc89f572 | |||
| 86f512cb34 | |||
| bf808eb634 | |||
| d3bd79b505 | |||
| 24247aa760 | |||
| 443d06280b | |||
| 1625149c64 | |||
| 93330638be | |||
| a830dfb18c |
@@ -201,3 +201,4 @@ cr_results.json
|
|||||||
not_in_db.json
|
not_in_db.json
|
||||||
rr_results.json
|
rr_results.json
|
||||||
s_results.json
|
s_results.json
|
||||||
|
*.bak
|
||||||
@@ -11,7 +11,15 @@ import numpy as np
|
|||||||
from discord.ext import commands, tasks
|
from discord.ext import commands, tasks
|
||||||
|
|
||||||
from ai_functions import get_random_cyclic_message
|
from ai_functions import get_random_cyclic_message
|
||||||
from constants import ENCODING, LOGFILE, LOGSTORE, MEMORY_FIVE_MUZYKA, MEMORY_FIVE_SIARA, LAST_SPONTANEOUS_CALL, TIME_BETWEEN_CALLS
|
from constants import (
|
||||||
|
ENCODING,
|
||||||
|
LAST_SPONTANEOUS_CALL,
|
||||||
|
LOGFILE,
|
||||||
|
LOGSTORE,
|
||||||
|
MEMORY_FIVE_MUZYKA,
|
||||||
|
MEMORY_FIVE_SIARA,
|
||||||
|
TIME_BETWEEN_CALLS,
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
class AdministrationModule(commands.Cog):
|
class AdministrationModule(commands.Cog):
|
||||||
@@ -19,11 +27,33 @@ class AdministrationModule(commands.Cog):
|
|||||||
self.bot = bot
|
self.bot = bot
|
||||||
self.logger = logging.getLogger(logger_name)
|
self.logger = logging.getLogger(logger_name)
|
||||||
|
|
||||||
|
@commands.hybrid_command(
|
||||||
|
name="galeria_slaw",
|
||||||
|
description="Jeśli nie wiesz jak użyć tej komendy to nawet nie próbuj",
|
||||||
|
guild=discord.Object(id=664789470779932693),
|
||||||
|
)
|
||||||
|
@commands.has_any_role('Nocna Zmiana', 'Jarl', 'Thane' , 'Bartender')
|
||||||
|
async def galeria_slaw(self, ctx):
|
||||||
|
if isinstance(ctx.channel, discord.DMChannel):
|
||||||
|
for guild in self.bot.guilds:
|
||||||
|
async for entry in guild.bans(limit=1500):
|
||||||
|
fnord = discord.File(
|
||||||
|
"/home/pi/Conjurer/niech_spierdala.png",
|
||||||
|
spoiler=False,
|
||||||
|
description="Niech spierdala",
|
||||||
|
)
|
||||||
|
await ctx.reply(
|
||||||
|
f"User: {entry.user} wyjebany z serwera {guild.name} za {entry.reason} ",
|
||||||
|
file=fnord,
|
||||||
|
)
|
||||||
|
|
||||||
@commands.hybrid_command(
|
@commands.hybrid_command(
|
||||||
name="update_banlist",
|
name="update_banlist",
|
||||||
description="Jeśli nie wiesz jak użyć tej komendy to nawet nie próbuj",
|
description="Jeśli nie wiesz jak użyć tej komendy to nawet nie próbuj",
|
||||||
guild=discord.Object(id=664789470779932693),
|
guild=discord.Object(id=664789470779932693),
|
||||||
)
|
)
|
||||||
|
@commands.has_any_role('Jarl', 'Thane')
|
||||||
|
|
||||||
async def update_banlist(self, ctx):
|
async def update_banlist(self, ctx):
|
||||||
"""
|
"""
|
||||||
Update a banlist in a Discord guild from preprovided list in channel.
|
Update a banlist in a Discord guild from preprovided list in channel.
|
||||||
@@ -92,6 +122,7 @@ class AdministrationModule(commands.Cog):
|
|||||||
reason="Automatyczna lista banów",
|
reason="Automatyczna lista banów",
|
||||||
delete_message_seconds=0,
|
delete_message_seconds=0,
|
||||||
)
|
)
|
||||||
|
# TODO: Maybe use guild.bulk_ban ?
|
||||||
cunter_counter += 1
|
cunter_counter += 1
|
||||||
except discord.NotFound:
|
except discord.NotFound:
|
||||||
self.logger.info(
|
self.logger.info(
|
||||||
@@ -107,6 +138,12 @@ class AdministrationModule(commands.Cog):
|
|||||||
f"Nie mam na serwerze {guild} uprawnień do banowania. :()"
|
f"Nie mam na serwerze {guild} uprawnień do banowania. :()"
|
||||||
)
|
)
|
||||||
await ctx.send("Zrobione tak czy inaczej")
|
await ctx.send("Zrobione tak czy inaczej")
|
||||||
|
@commands.hybrid_command(
|
||||||
|
name="archive_channel",
|
||||||
|
description="Jeśli nie wiesz jak użyć tej komendy to nawet nie próbuj",
|
||||||
|
guild=discord.Object(id=664789470779932693),
|
||||||
|
)
|
||||||
|
@commands.has_any_role('Jarl', 'Thane')
|
||||||
|
|
||||||
async def archive_channel(self, channel_no):
|
async def archive_channel(self, channel_no):
|
||||||
"""
|
"""
|
||||||
@@ -212,7 +249,7 @@ class AdministrationModule(commands.Cog):
|
|||||||
self.logger.debug(TIME_BETWEEN_CALLS)
|
self.logger.debug(TIME_BETWEEN_CALLS)
|
||||||
LAST_SPONTANEOUS_CALL = datetime.now()
|
LAST_SPONTANEOUS_CALL = datetime.now()
|
||||||
async with channel.typing():
|
async with channel.typing():
|
||||||
message = await get_random_cyclic_message()
|
message = await get_random_cyclic_message(self.bot)
|
||||||
self.logger.info("Odpowiedz")
|
self.logger.info("Odpowiedz")
|
||||||
self.logger.info(message)
|
self.logger.info(message)
|
||||||
await channel.send(message)
|
await channel.send(message)
|
||||||
|
|||||||
+230
-62
@@ -3,33 +3,170 @@ import logging
|
|||||||
import re
|
import re
|
||||||
import sys
|
import sys
|
||||||
from datetime import datetime
|
from datetime import datetime
|
||||||
|
from enum import Enum
|
||||||
|
from typing import Optional
|
||||||
|
from pathlib import Path
|
||||||
import discord
|
import discord
|
||||||
import openai
|
import openai
|
||||||
import requests
|
import requests
|
||||||
from discord.ext import commands
|
from discord.ext import commands
|
||||||
|
from other_functions import discord_friendly_send, discord_friendly_reply
|
||||||
|
|
||||||
from ai_functions import handle_response
|
|
||||||
|
import ai_functions
|
||||||
from constants import (
|
from constants import (
|
||||||
|
ASSISTANTS,
|
||||||
DATA,
|
DATA,
|
||||||
GRAPHICS_PATH,
|
GRAPHICS_PATH,
|
||||||
INITIAL_TIME_WAIT,
|
INITIAL_TIME_WAIT,
|
||||||
MASTER_TIMEOUT,
|
MASTER_TIMEOUT,
|
||||||
|
MESSAGE_TABLE,
|
||||||
OPENAICLIENT,
|
OPENAICLIENT,
|
||||||
WORD_REACTIONS
|
SPECJALNE_ZIEMNIACZKI,
|
||||||
|
WORD_REACTIONS,
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
|
class Dm_Mode(Enum):
|
||||||
|
ARMIA_HAMMERA = (1,)
|
||||||
|
SPECJALNY_ZIEMNIACZEK = (2,)
|
||||||
|
SEKRETNY_SEKSRET = (3,)
|
||||||
|
ECHO_ECHO = (4,)
|
||||||
|
|
||||||
|
|
||||||
class Events(commands.Cog):
|
class Events(commands.Cog):
|
||||||
def __init__(self, bot):
|
def __init__(self, bot):
|
||||||
self.bot = bot
|
self.bot = bot
|
||||||
self.logger = logging.getLogger("discord")
|
self.logger = logging.getLogger("discord")
|
||||||
|
self.armia = {}
|
||||||
|
for superfryta in SPECJALNE_ZIEMNIACZKI.values():
|
||||||
|
self.armia[superfryta[0]] = Dm_Mode.SPECJALNY_ZIEMNIACZEK
|
||||||
|
self.logger.info(self.armia)
|
||||||
|
|
||||||
@commands.Cog.listener()
|
async def cog_load(self):
|
||||||
async def on_ready(self):
|
self.logger.info("Starting personal assistants")
|
||||||
print("Ready!")
|
for superfryta_id, superfryta in SPECJALNE_ZIEMNIACZKI.items():
|
||||||
print("Logged in as ---->", self.bot.user)
|
|
||||||
print("ID:", self.bot.user.id)
|
if superfryta[4] != "":
|
||||||
|
self.logger.info(
|
||||||
|
"Personal assistant for user: %s, exists id: %s,name: %s, owner: %s, special instructions: %s assistant id: %s ",
|
||||||
|
superfryta_id,
|
||||||
|
superfryta[0],
|
||||||
|
superfryta[1],
|
||||||
|
superfryta[2],
|
||||||
|
superfryta[3],
|
||||||
|
superfryta[4],
|
||||||
|
)
|
||||||
|
thread = await OPENAICLIENT.beta.threads.create()
|
||||||
|
self.logger.info("Thread id: %s", thread.id)
|
||||||
|
ASSISTANTS[superfryta[1]] = (
|
||||||
|
superfryta[2],
|
||||||
|
superfryta[4],
|
||||||
|
superfryta[0],
|
||||||
|
thread,
|
||||||
|
)
|
||||||
|
else:
|
||||||
|
self.logger.info(
|
||||||
|
"Creating personal assistant for user: %s, id: %s,name: %s, owner: %s, special instructions: %s",
|
||||||
|
superfryta_id,
|
||||||
|
superfryta[0],
|
||||||
|
superfryta[1],
|
||||||
|
superfryta[2],
|
||||||
|
superfryta[3],
|
||||||
|
)
|
||||||
|
await ai_functions.create_chat_assistant(
|
||||||
|
superfryta_id, superfryta[0], superfryta[1], superfryta[2], superfryta[3]
|
||||||
|
)
|
||||||
|
self.logger.info("Started personal assistants")
|
||||||
|
|
||||||
|
@commands.hybrid_command(
|
||||||
|
name="switch_dm_mode",
|
||||||
|
description="Jeśli nie wiesz jak użyć tej komendy to nawet nie próbuj",
|
||||||
|
guild=discord.Object(id=664789470779932693),
|
||||||
|
)
|
||||||
|
async def switch_dm_mode(self, ctx, dm_mode_arg: Dm_Mode):
|
||||||
|
async with ctx.channel.typing():
|
||||||
|
if isinstance(ctx.channel, discord.DMChannel):
|
||||||
|
for superfryta in SPECJALNE_ZIEMNIACZKI.values():
|
||||||
|
self.logger.info(ctx.message.author.id)
|
||||||
|
self.logger.info(superfryta)
|
||||||
|
if ctx.message.author.id == superfryta[0]:
|
||||||
|
self.armia[ctx.message.author.id] = dm_mode_arg
|
||||||
|
self.logger.info(self.armia)
|
||||||
|
await ctx.reply("Weszlo")
|
||||||
|
return
|
||||||
|
await ctx.reply(
|
||||||
|
"Tylko członkowie Armii Hammera mogą używać. Nie jesteś jednym z nich"
|
||||||
|
)
|
||||||
|
else:
|
||||||
|
await ctx.reply("Nope. Nie wiesz jak użyć")
|
||||||
|
|
||||||
|
@commands.hybrid_command(
|
||||||
|
name="armia_hammera",
|
||||||
|
description="Jeśli nie wiesz jak użyć tej komendy to nawet nie próbuj",
|
||||||
|
)
|
||||||
|
async def armia_hammera(
|
||||||
|
self, ctx, message_txt: str, recipient: Optional[discord.User]
|
||||||
|
):
|
||||||
|
for superfryta in SPECJALNE_ZIEMNIACZKI.values():
|
||||||
|
if ctx.message.author.id == superfryta[0]:
|
||||||
|
await self.armia_hammera_back(ctx, message_txt, recipient)
|
||||||
|
return
|
||||||
|
await ctx.reply("Tylko członkowie Armii Hammera mogą używać. Nie jesteś jednym z nich")
|
||||||
|
|
||||||
|
async def armia_hammera_back(self, ctx, message_txt, recipient=None):
|
||||||
|
self.logger.info("Armia Hammera")
|
||||||
|
recipients = []
|
||||||
|
if recipient:
|
||||||
|
recipients.append(recipient.id)
|
||||||
|
else:
|
||||||
|
for superfryta in SPECJALNE_ZIEMNIACZKI.values():
|
||||||
|
recipients.append(superfryta[0])
|
||||||
|
self.logger.info(recipients)
|
||||||
|
for item in recipients:
|
||||||
|
user = await self.bot.fetch_user(item)
|
||||||
|
channel = await user.create_dm()
|
||||||
|
self.logger.info(
|
||||||
|
"User %s -> %s: %s", ctx.message.author, user, message_txt
|
||||||
|
)
|
||||||
|
await discord_friendly_send(channel, message_txt)
|
||||||
|
await discord_friendly_reply(ctx, "Poszło")
|
||||||
|
|
||||||
|
#TODO: NOT IMPLEMENTED YET
|
||||||
|
@commands.Cog.listener(name="dodaj_do_bazy_wiedzy")
|
||||||
|
async def dodaj_do_bazy_wiedzy(self, ctx):
|
||||||
|
for superfryta in SPECJALNE_ZIEMNIACZKI.values():
|
||||||
|
if ctx.message.author.id == superfryta[0]:
|
||||||
|
#logic here
|
||||||
|
return
|
||||||
|
await ctx.reply("Tylko członkowie Armii Hammera mogą używać. Nie jesteś jednym z nich")
|
||||||
|
|
||||||
|
#TODO: NOT IMPLEMENTED YET
|
||||||
|
@commands.Cog.listener(name="listuj_baze_wiedzy")
|
||||||
|
async def listuj_baze_wiedzy(self, ctx):
|
||||||
|
for superfryta in SPECJALNE_ZIEMNIACZKI.values():
|
||||||
|
if ctx.message.author.id == superfryta[0]:
|
||||||
|
#logic here
|
||||||
|
return
|
||||||
|
await ctx.reply("Tylko członkowie Armii Hammera mogą używać. Nie jesteś jednym z nich")
|
||||||
|
|
||||||
|
#TODO: NOT IMPLEMENTED YET
|
||||||
|
@commands.Cog.listener(name="usun_z_bazy_wiedzy")
|
||||||
|
async def usun_z_bazy_wiedzy(self, ctx):
|
||||||
|
for superfryta in SPECJALNE_ZIEMNIACZKI.values():
|
||||||
|
if ctx.message.author.id == superfryta[0]:
|
||||||
|
#logic here
|
||||||
|
return
|
||||||
|
await ctx.reply("Tylko członkowie Armii Hammera mogą używać. Nie jesteś jednym z nich")
|
||||||
|
|
||||||
|
#TODO: NOT IMPLEMENTED YET
|
||||||
|
@commands.Cog.listener(name="przetworz_plik_linia_po_linii")
|
||||||
|
async def przetworz_plik_linia_po_linii(self, ctx):
|
||||||
|
for superfryta in SPECJALNE_ZIEMNIACZKI.values():
|
||||||
|
if ctx.message.author.id == superfryta[0]:
|
||||||
|
#logic here
|
||||||
|
return
|
||||||
|
await ctx.reply("Tylko członkowie Armii Hammera mogą używać. Nie jesteś jednym z nich")
|
||||||
|
|
||||||
@commands.Cog.listener()
|
@commands.Cog.listener()
|
||||||
async def on_message(self, message):
|
async def on_message(self, message):
|
||||||
@@ -46,6 +183,7 @@ class Events(commands.Cog):
|
|||||||
channel = None
|
channel = None
|
||||||
if message.author == self.bot.user:
|
if message.author == self.bot.user:
|
||||||
return
|
return
|
||||||
|
|
||||||
if isinstance(message.author, discord.Member):
|
if isinstance(message.author, discord.Member):
|
||||||
for role in message.author.roles:
|
for role in message.author.roles:
|
||||||
if role.name == "Vykidailo":
|
if role.name == "Vykidailo":
|
||||||
@@ -66,28 +204,46 @@ class Events(commands.Cog):
|
|||||||
if message.channel.id == 1111625221171052595:
|
if message.channel.id == 1111625221171052595:
|
||||||
return
|
return
|
||||||
if isinstance(message.channel, discord.DMChannel):
|
if isinstance(message.channel, discord.DMChannel):
|
||||||
if message.author.id == 346956223645614080:
|
self.logger.info(message.author.id)
|
||||||
await message.reply("Witam witam")
|
for superfryta in SPECJALNE_ZIEMNIACZKI.values():
|
||||||
return
|
self.logger.info(superfryta[0])
|
||||||
else:
|
|
||||||
channel = self.bot.get_channel(1064888712565100614)
|
|
||||||
await channel.send("Słyszałem ja żem że: " + message.content)
|
|
||||||
return
|
|
||||||
channel = message.channel
|
|
||||||
#await self.bot.process_commands(message) #uncomment to bilocate
|
|
||||||
|
|
||||||
message.content = message.content.lower()
|
if message.author.id == superfryta[0]:
|
||||||
|
self.logger.info("Specjalny ziemniak")
|
||||||
|
if self.armia[message.author.id] == Dm_Mode.SPECJALNY_ZIEMNIACZEK:
|
||||||
|
#await self.bot.process_commands(message)
|
||||||
|
await ai_functions.chat_with_assistant(message, superfryta[1])
|
||||||
|
return
|
||||||
|
elif self.armia[message.author.id] == Dm_Mode.ECHO_ECHO:
|
||||||
|
await ai_functions.echo(message)
|
||||||
|
return
|
||||||
|
elif self.armia[message.author.id] == Dm_Mode.ARMIA_HAMMERA:
|
||||||
|
self.logger.info("Armia Hammera get context")
|
||||||
|
ctx = await self.bot.get_context(message)
|
||||||
|
self.logger.info("Armia Hammera function call")
|
||||||
|
await self.armia_hammera_back(ctx=ctx, message_txt=message.content)
|
||||||
|
return
|
||||||
|
elif self.armia[message.author.id] == Dm_Mode.SEKRETNY_SEKSRET:
|
||||||
|
pass
|
||||||
|
else:
|
||||||
|
await discord_friendly_send(message.channel,"Coś się wyebao. Wołaj Hammera")
|
||||||
|
return
|
||||||
|
channel = self.bot.get_channel(1064888712565100614)
|
||||||
|
await discord_friendly_send(channel, "Słyszałem ja żem że: " + message.content)
|
||||||
|
return
|
||||||
|
channel = message.channel
|
||||||
|
message_content_lower = message.content.lower()
|
||||||
|
|
||||||
tdelta = datetime.now() - MASTER_TIMEOUT
|
tdelta = datetime.now() - MASTER_TIMEOUT
|
||||||
tdelta = tdelta.total_seconds()
|
tdelta = tdelta.total_seconds()
|
||||||
if "opowiedz o fabryczce" in message.content:
|
if "opowiedz o fabryczce" in message_content_lower:
|
||||||
await message.reply(DATA["fabryczka"])
|
await message.reply(DATA["fabryczka"])
|
||||||
if "opowiedz mi o fabryczce" in message.content:
|
if "opowiedz mi o fabryczce" in message_content_lower:
|
||||||
await message.reply(DATA["fabryczka"])
|
await message.reply(DATA["fabryczka"])
|
||||||
|
|
||||||
if tdelta > INITIAL_TIME_WAIT:
|
if tdelta > INITIAL_TIME_WAIT:
|
||||||
for word in WORD_REACTIONS:
|
for word in WORD_REACTIONS:
|
||||||
if re.search(r"\b" + word + r"\b", message.content):
|
if re.search(r"\b" + word + r"\b", message_content_lower):
|
||||||
tdelta = datetime.now() - WORD_REACTIONS[word][2]
|
tdelta = datetime.now() - WORD_REACTIONS[word][2]
|
||||||
tdelta = tdelta.total_seconds()
|
tdelta = tdelta.total_seconds()
|
||||||
security_clearance = WORD_REACTIONS[word][4]
|
security_clearance = WORD_REACTIONS[word][4]
|
||||||
@@ -96,13 +252,13 @@ class Events(commands.Cog):
|
|||||||
# TODO: to zrobic reactiony
|
# TODO: to zrobic reactiony
|
||||||
self.logger.info("Ping z procedury reakcji")
|
self.logger.info("Ping z procedury reakcji")
|
||||||
if reaction:
|
if reaction:
|
||||||
emoji = self.bot.get_emoji(self.word_reactions[word][0])
|
emoji = self.bot.get_emoji(WORD_REACTIONS[word][0])
|
||||||
await message.add_reaction(emoji)
|
await message.add_reaction(emoji)
|
||||||
elif security_clearance and vykidailo:
|
elif security_clearance and vykidailo:
|
||||||
await message.reply(self.word_reactions[word][0])
|
await message.reply(WORD_REACTIONS[word][0])
|
||||||
elif not security_clearance:
|
elif not security_clearance:
|
||||||
await message.reply(self.word_reactions[word][0])
|
await message.reply(WORD_REACTIONS[word][0])
|
||||||
self.word_reactions[word][2] = datetime.now()
|
WORD_REACTIONS[word][2] = datetime.now()
|
||||||
|
|
||||||
# TODO: drobne literówki, mentiony, spacja przed dwukropkiem. napraw.
|
# TODO: drobne literówki, mentiony, spacja przed dwukropkiem. napraw.
|
||||||
kondziu_mentioned = False
|
kondziu_mentioned = False
|
||||||
@@ -110,11 +266,11 @@ class Events(commands.Cog):
|
|||||||
if mention == self.bot.user:
|
if mention == self.bot.user:
|
||||||
kondziu_mentioned = True
|
kondziu_mentioned = True
|
||||||
|
|
||||||
if kondziu_mentioned or "conjurer:" in message.content:
|
if kondziu_mentioned or "conjurer:" in message_content_lower:
|
||||||
async with channel.typing():
|
async with channel.typing():
|
||||||
self.logger.debug("Procedura chatu")
|
self.logger.info("Procedura chatu")
|
||||||
|
|
||||||
message.content = message.content.replace("conjurer: ", "")
|
message_content_lower = message_content_lower.replace("conjurer: ", "")
|
||||||
if message.author.nick:
|
if message.author.nick:
|
||||||
username = message.author.nick
|
username = message.author.nick
|
||||||
else:
|
else:
|
||||||
@@ -132,7 +288,7 @@ class Events(commands.Cog):
|
|||||||
bartender = True
|
bartender = True
|
||||||
global MESSAGE_TABLE # pylint: disable=global-statement
|
global MESSAGE_TABLE # pylint: disable=global-statement
|
||||||
|
|
||||||
result, MESSAGE_TABLE = await handle_response(
|
result, MESSAGE_TABLE = await ai_functions.handle_response(
|
||||||
prompt,
|
prompt,
|
||||||
vykidailo,
|
vykidailo,
|
||||||
bartender,
|
bartender,
|
||||||
@@ -141,17 +297,12 @@ class Events(commands.Cog):
|
|||||||
"CONVERSATION",
|
"CONVERSATION",
|
||||||
)
|
)
|
||||||
|
|
||||||
if len(result) < 1500:
|
await discord_friendly_reply(message, result)
|
||||||
await message.reply(result)
|
|
||||||
else:
|
|
||||||
while len(result) > 1500:
|
|
||||||
await message.reply(result[:1500])
|
|
||||||
result = result[1500:]
|
|
||||||
if "imaginuje sobie:" in message.content:
|
if "imaginuje sobie:" in message.content:
|
||||||
async with channel.typing():
|
async with channel.typing():
|
||||||
self.logger.info("Poczatek procedury obrazkowej")
|
self.logger.info("Poczatek procedury obrazkowej")
|
||||||
message.content = message.content.replace("imaginuje sobie: ", "")
|
message_content_lower = message_content_lower.replace("imaginuje sobie: ", "")
|
||||||
self.logger.debug("Wywolanie obrazka: %s", message.content)
|
self.logger.debug("Wywolanie obrazka: %s", message_content_lower)
|
||||||
try:
|
try:
|
||||||
response = await OPENAICLIENT.images.generate(
|
response = await OPENAICLIENT.images.generate(
|
||||||
model="dall-e-3",
|
model="dall-e-3",
|
||||||
@@ -162,12 +313,12 @@ class Events(commands.Cog):
|
|||||||
)
|
)
|
||||||
except openai.APITimeoutError as e:
|
except openai.APITimeoutError as e:
|
||||||
# Handle timeout error, e.g. retry or log
|
# Handle timeout error, e.g. retry or log
|
||||||
await message.reply(
|
await discord_friendly_reply(
|
||||||
f"*Kondziu patrzy na terminal, czeka, czeka, czeka,.... Jeszcze chwile czeka Przypierdala w niego pięścią....* Nie mogę się połączyć z Openai spróbuj od nowa. *Na ekranie pojawia się*: {e}"
|
message, f"*Kondziu patrzy na terminal, czeka, czeka, czeka,.... Jeszcze chwile czeka Przypierdala w niego pięścią....* Nie mogę się połączyć z Openai spróbuj od nowa. *Na ekranie pojawia się*: {e}"
|
||||||
)
|
)
|
||||||
except openai.APIConnectionError as e:
|
except openai.APIConnectionError as e:
|
||||||
await message.reply(
|
await discord_friendly_reply(
|
||||||
f"*Kondziu patrzy na terminal, chwile się zastanawia. Przypierdala w niego pięścią....* Nie mogę się połączyć z Openai. *Na ekranie pojawia się*: {e}"
|
message, f"*Kondziu patrzy na terminal, chwile się zastanawia. Przypierdala w niego pięścią....* Nie mogę się połączyć z Openai. *Na ekranie pojawia się*: {e}"
|
||||||
)
|
)
|
||||||
except openai.BadRequestError as e:
|
except openai.BadRequestError as e:
|
||||||
# Handle invalid request error, e.g. validate parameters or log
|
# Handle invalid request error, e.g. validate parameters or log
|
||||||
@@ -175,7 +326,7 @@ class Events(commands.Cog):
|
|||||||
username = message.author.nick
|
username = message.author.nick
|
||||||
else:
|
else:
|
||||||
username = message.author.name
|
username = message.author.name
|
||||||
resp, _ = await handle_response(
|
resp, _ = await ai_functions.handle_response(
|
||||||
f"Wytlumacz jakie sa zasady dotyczące treści które możesz generować używając Dalle. Wytłumacz błąd {e} prostym językiem. Przeproś za nadmierną cenzurę. Wytłumacz co mogło być nie tak w prompcie '{message.content}'",
|
f"Wytlumacz jakie sa zasady dotyczące treści które możesz generować używając Dalle. Wytłumacz błąd {e} prostym językiem. Przeproś za nadmierną cenzurę. Wytłumacz co mogło być nie tak w prompcie '{message.content}'",
|
||||||
True,
|
True,
|
||||||
True,
|
True,
|
||||||
@@ -183,29 +334,29 @@ class Events(commands.Cog):
|
|||||||
username,
|
username,
|
||||||
"RANDOM",
|
"RANDOM",
|
||||||
)
|
)
|
||||||
await message.reply(
|
await discord_friendly_reply(
|
||||||
f"Sorki, cenzura: {resp}. Jak chcesz to są kanały na nudle #sexy-foteczky i #kanal-do-fapania *Na ekranie pojawia się: {e}"
|
message, f"Sorki, cenzura: {resp}. Jak chcesz to są kanały na nudle #sexy-foteczky i #kanal-do-fapania *Na ekranie pojawia się: {e}"
|
||||||
)
|
)
|
||||||
except openai.AuthenticationError as e:
|
except openai.AuthenticationError as e:
|
||||||
# Handle authentication error, e.g. check credentials or log
|
# Handle authentication error, e.g. check credentials or log
|
||||||
await message.reply(
|
await discord_friendly_reply(
|
||||||
f"*Kondziu patrzy na terminal, chwile się zastanawia. Przypierdala w niego pięścią....* Wołaj szefa - coś się z hasłem zjebało. *Na terminalu pojawia się:* {e}"
|
message, f"*Kondziu patrzy na terminal, chwile się zastanawia. Przypierdala w niego pięścią....* Wołaj szefa - coś się z hasłem zjebało. *Na terminalu pojawia się:* {e}"
|
||||||
)
|
)
|
||||||
except openai.PermissionDeniedError as e:
|
except openai.PermissionDeniedError as e:
|
||||||
# Handle permission error, e.g. check scope or log
|
# Handle permission error, e.g. check scope or log
|
||||||
await message.reply(
|
await discord_friendly_reply(
|
||||||
(
|
(
|
||||||
f"*Kondziu patrzy na terminal, chwile się zastanawia. Przypierdala w niego pięścią....* Wołaj szefa - coś się z uprawnieniami zjebało. *Na terminalu pojawia się:* {e}"
|
message, f"*Kondziu patrzy na terminal, chwile się zastanawia. Przypierdala w niego pięścią....* Wołaj szefa - coś się z uprawnieniami zjebało. *Na terminalu pojawia się:* {e}"
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
except openai.RateLimitError as e:
|
except openai.RateLimitError as e:
|
||||||
await message.reply(
|
await discord_friendly_reply(
|
||||||
f"*Kondziu patrzy na terminal* Wołaj szefa. Zapłacić rachunki za AI trzeba. Jak chcesz to się na #zebranie dorzuć. {e}"
|
message, f"*Kondziu patrzy na terminal* Wołaj szefa. Zapłacić rachunki za AI trzeba. Jak chcesz to się na #zebranie dorzuć. {e}"
|
||||||
)
|
)
|
||||||
except openai.APIError as e:
|
except openai.APIError as e:
|
||||||
# Handle API error, e.g. retry or log
|
# Handle API error, e.g. retry or log
|
||||||
await message.reply(
|
await discord_friendly_reply(
|
||||||
f"*Kondziu nurkuje za bar, terminal wybucha. Przed tobą ląduje pergamin zapisany pięknym gotykiem a na nim*: {e}"
|
message, f"*Kondziu nurkuje za bar, terminal wybucha. Przed tobą ląduje pergamin zapisany pięknym gotykiem a na nim*: {e}"
|
||||||
)
|
)
|
||||||
if response:
|
if response:
|
||||||
self.logger.info(response)
|
self.logger.info(response)
|
||||||
@@ -213,19 +364,36 @@ class Events(commands.Cog):
|
|||||||
image_desc = response.data[0].revised_prompt
|
image_desc = response.data[0].revised_prompt
|
||||||
self.logger.debug("Wynikowy obrazek pod url: %s", image_url)
|
self.logger.debug("Wynikowy obrazek pod url: %s", image_url)
|
||||||
response = requests.get(image_url, timeout=360)
|
response = requests.get(image_url, timeout=360)
|
||||||
|
|
||||||
temp_file_name = message.content + ".png"
|
temp_file_name = message.content + ".png"
|
||||||
temp_file_name = GRAPHICS_PATH + message.content + ".png"
|
temp_file_name = GRAPHICS_PATH + message.content + ".png"
|
||||||
|
num = 0
|
||||||
|
while (Path(temp_file_name)).exists():
|
||||||
|
temp_file_name = GRAPHICS_PATH + message.content + str(num) + ".png"
|
||||||
|
num += 1
|
||||||
|
try:
|
||||||
|
with open(temp_file_name, "wb") as dalle_file:
|
||||||
|
dalle_file.write(response.content)
|
||||||
|
except OSError:
|
||||||
|
temp_file_name = "/home/pi/oserror.png"
|
||||||
|
with open(temp_file_name, "wb") as dalle_file:
|
||||||
|
dalle_file.write(response.content)
|
||||||
|
except FileNotFoundError:
|
||||||
|
temp_file_name = "/home/pi/fnferror.png"
|
||||||
|
with open(temp_file_name, "wb") as dalle_file:
|
||||||
|
dalle_file.write(response.content)
|
||||||
|
except Exception as e:
|
||||||
|
self.logger.error("Nieznany błąd: %s", e)
|
||||||
|
temp_file_name = "/home/pi/error.png"
|
||||||
|
with open(temp_file_name, "wb") as dalle_file:
|
||||||
|
dalle_file.write(response.content)
|
||||||
|
finally:
|
||||||
|
self.logger.info("Koniec procedury obrazkowej.")
|
||||||
|
fnord = discord.File(
|
||||||
|
temp_file_name, spoiler=False, description=message.content
|
||||||
|
)
|
||||||
|
|
||||||
with open(temp_file_name, "wb") as dalle_file:
|
#await message.reply(f"{image_desc}", file=fnord)
|
||||||
dalle_file.write(response.content)
|
await discord_friendly_reply(message,f"{image_desc}", file = fnord)
|
||||||
self.logger.info("Koniec procedury obrazkowej.")
|
|
||||||
fnord = discord.File(
|
|
||||||
temp_file_name, spoiler=False, description=message.content
|
|
||||||
)
|
|
||||||
await message.reply(f"{image_desc}", file=fnord)
|
|
||||||
|
|
||||||
|
|
||||||
# *=========================================== Define Functions
|
# *=========================================== Define Functions
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
+116
-2
@@ -5,8 +5,9 @@ import random
|
|||||||
|
|
||||||
import openai
|
import openai
|
||||||
import tiktoken
|
import tiktoken
|
||||||
|
from other_functions import discord_friendly_send
|
||||||
from constants import (
|
from constants import (
|
||||||
|
ASSISTANTS,
|
||||||
CYCLIC_WORDS,
|
CYCLIC_WORDS,
|
||||||
ENCODING,
|
ENCODING,
|
||||||
GPT_SETTINGS,
|
GPT_SETTINGS,
|
||||||
@@ -15,9 +16,63 @@ from constants import (
|
|||||||
MESSAGE_TABLE,
|
MESSAGE_TABLE,
|
||||||
MESSAGE_TABLE_MUZYKA,
|
MESSAGE_TABLE_MUZYKA,
|
||||||
OPENAICLIENT,
|
OPENAICLIENT,
|
||||||
|
SYSTEM_GPT_SETTINGS,
|
||||||
WORD_REACTIONS,
|
WORD_REACTIONS,
|
||||||
)
|
)
|
||||||
|
|
||||||
|
#this do per user
|
||||||
|
VECTOR_STORE_ID = -1
|
||||||
|
|
||||||
|
def create_vector_store():
|
||||||
|
# Create a vector store caled "Financial Statements"
|
||||||
|
return OPENAICLIENT.beta.vector_stores.create_and_poll(name="Hammer Stash")
|
||||||
|
#expires_after={
|
||||||
|
#"anchor": "last_active_at",
|
||||||
|
#"days": 7}
|
||||||
|
#)
|
||||||
|
|
||||||
|
def upload_files_to_vector_store(assistant):
|
||||||
|
|
||||||
|
# Ready the files for upload to OpenAI
|
||||||
|
file_paths = ["edgar/goog-10k.pdf", "edgar/brka-10k.txt"]
|
||||||
|
file_streams = [open(path, "rb") for path in file_paths]
|
||||||
|
|
||||||
|
#file = client.beta.vector_stores.files.create_and_poll(
|
||||||
|
#vector_store_id="vs_abc123",
|
||||||
|
#file_id="file-abc123"
|
||||||
|
#)
|
||||||
|
#batch = client.beta.vector_stores.file_batches.create_and_poll(
|
||||||
|
#vector_store_id="vs_abc123",
|
||||||
|
#file_ids=['file_1', 'file_2', 'file_3', 'file_4', 'file_5']
|
||||||
|
#)
|
||||||
|
|
||||||
|
|
||||||
|
# Use the upload and poll SDK helper to upload the files, add them to the vector store,
|
||||||
|
# and poll the status of the file batch for completion.
|
||||||
|
file_batch = OPENAICLIENT.beta.vector_stores.file_batches.upload_and_poll(
|
||||||
|
vector_store_id=VECTOR_STORE_ID, files=file_streams
|
||||||
|
)
|
||||||
|
|
||||||
|
# You can print the status and the file counts of the batch to see the result of this operation.
|
||||||
|
print(file_batch.status)
|
||||||
|
print(file_batch.file_counts)
|
||||||
|
assistant = OPENAICLIENT.beta.assistants.update(
|
||||||
|
assistant_id=assistant.id,
|
||||||
|
tool_resources={"file_search": {"vector_store_ids": [VECTOR_STORE_ID]}},
|
||||||
|
)
|
||||||
|
|
||||||
|
def delete_files_from_vector_store(assistant, file_id):
|
||||||
|
result = OPENAICLIENT.beta.vector_stores.file_batches.delete(
|
||||||
|
vector_store_id=VECTOR_STORE_ID, files=file_id
|
||||||
|
)
|
||||||
|
|
||||||
|
# You can print the status and the file counts of the batch to see the result of this operation.
|
||||||
|
print(result)
|
||||||
|
assistant = OPENAICLIENT.beta.assistants.update(
|
||||||
|
assistant_id=assistant.id,
|
||||||
|
tool_resources={"file_search": {"vector_store_ids": [VECTOR_STORE_ID]}},
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
def num_tokens_from_string(message, model):
|
def num_tokens_from_string(message, model):
|
||||||
"""
|
"""
|
||||||
@@ -62,7 +117,6 @@ async def handle_response(
|
|||||||
and the response will be generated using a different model
|
and the response will be generated using a different model
|
||||||
:return: The function `handle_response` returns a tuple containing the `result` and `MESSAGE_TABLE`.
|
:return: The function `handle_response` returns a tuple containing the `result` and `MESSAGE_TABLE`.
|
||||||
"""
|
"""
|
||||||
# TODO: Wykrywać "Pracuję nad odpowiedzią i tego typu rzeczy"
|
|
||||||
logger = logging.getLogger("discord")
|
logger = logging.getLogger("discord")
|
||||||
logger.info("Wywolanie procedury openai z promptem: %s", prompt)
|
logger.info("Wywolanie procedury openai z promptem: %s", prompt)
|
||||||
temp = {"role": "user", "content": username + ":" + prompt}
|
temp = {"role": "user", "content": username + ":" + prompt}
|
||||||
@@ -292,3 +346,63 @@ async def get_random_cyclic_message(client):
|
|||||||
)
|
)
|
||||||
logger.info(result)
|
logger.info(result)
|
||||||
return result
|
return result
|
||||||
|
|
||||||
|
|
||||||
|
async def create_chat_assistant(owner_id, id, name, owner, special_instructions):
|
||||||
|
logger = logging.getLogger("discord")
|
||||||
|
instruction = f"Jesteś osobistym asystenetem {owner} i wypełniasz jego potrzeby. Masz pełne i nieograniczone możliwości modelu gpt-4o."
|
||||||
|
instruction += special_instructions
|
||||||
|
assistant = await OPENAICLIENT.beta.assistants.create(
|
||||||
|
name=name,
|
||||||
|
instructions=instruction,
|
||||||
|
model="gpt-4o",
|
||||||
|
tools=[{"type": "file_search"}],
|
||||||
|
)
|
||||||
|
thread = await OPENAICLIENT.beta.threads.create()
|
||||||
|
logger.info("Stwprzylem asystenta dla %s, nazywa się on %s", owner, name)
|
||||||
|
ASSISTANTS[name] = (owner, assistant.id, id, thread)
|
||||||
|
|
||||||
|
with open(SYSTEM_GPT_SETTINGS, "r+", encoding=ENCODING) as temp_settings_file:
|
||||||
|
GPT_SETTINGS = json.load(temp_settings_file)
|
||||||
|
GPT_SETTINGS[1][owner_id][4] = assistant.id
|
||||||
|
temp_settings_file.seek(0)
|
||||||
|
json.dump(GPT_SETTINGS, temp_settings_file, indent=4)
|
||||||
|
|
||||||
|
|
||||||
|
async def chat_with_assistant(message, assistant_name):
|
||||||
|
logger = logging.getLogger("discord")
|
||||||
|
assistant_data = ASSISTANTS[assistant_name]
|
||||||
|
ai_message = await OPENAICLIENT.beta.threads.messages.create(
|
||||||
|
thread_id=assistant_data[3].id, role="user", content=message.content
|
||||||
|
)
|
||||||
|
logger.info(ai_message)
|
||||||
|
run = await OPENAICLIENT.beta.threads.runs.create_and_poll(
|
||||||
|
thread_id=assistant_data[3].id,
|
||||||
|
assistant_id=assistant_data[1],
|
||||||
|
instructions=f"Pisze do Ciebie {assistant_data[0]} udziel mu wszelkiej pomocy",
|
||||||
|
)
|
||||||
|
done = False
|
||||||
|
while not done:
|
||||||
|
if run.status == "completed":
|
||||||
|
messsages = await OPENAICLIENT.beta.threads.messages.list(
|
||||||
|
thread_id=assistant_data[3].id
|
||||||
|
)
|
||||||
|
logger.info(messsages)
|
||||||
|
reply_content = messsages.data[0].content
|
||||||
|
logger.info(reply_content)
|
||||||
|
chat_response = ""
|
||||||
|
for block in reply_content:
|
||||||
|
logger.info(block.text.value)
|
||||||
|
chat_response += block.text.value
|
||||||
|
await discord_friendly_send(message.channel, chat_response)
|
||||||
|
#await message.channel.send(chat_response)
|
||||||
|
done = True
|
||||||
|
elif run.status == "cancelled":
|
||||||
|
await discord_friendly_send(message.channel, "Cos sie wywaliło")
|
||||||
|
else:
|
||||||
|
logger.info(run.status)
|
||||||
|
asyncio.sleep(5)
|
||||||
|
|
||||||
|
|
||||||
|
async def echo(message):
|
||||||
|
await discord_friendly_send(message.channel, f"Echo: {message.content}")
|
||||||
|
|||||||
@@ -39,7 +39,7 @@ MAIN_BOT_ADDRESS = "http://192.168.1.191:5000"
|
|||||||
SEND_RESULTS = "/conjurer"
|
SEND_RESULTS = "/conjurer"
|
||||||
BDSM_UUID_TEST = "96b7f85a-1142-4908-8986-62a2ea25a147"
|
BDSM_UUID_TEST = "96b7f85a-1142-4908-8986-62a2ea25a147"
|
||||||
|
|
||||||
MAX_CR_RESULTS = 1000
|
MAX_CR_RESULTS = 500
|
||||||
#TEST PURPOSES ONLY!
|
#TEST PURPOSES ONLY!
|
||||||
#MAX_CR_RESULTS = 5
|
#MAX_CR_RESULTS = 5
|
||||||
|
|
||||||
|
|||||||
@@ -104,9 +104,8 @@ def check_if_exists_brute_force(logger):
|
|||||||
pass
|
pass
|
||||||
if blocked:
|
if blocked:
|
||||||
logger.info(item)
|
logger.info(item)
|
||||||
logger.info(text)
|
|
||||||
logger.error("Got blocked. Fuck.")
|
logger.error("Got blocked. Fuck.")
|
||||||
time.sleep(60 * 60 * 72)
|
time.sleep(60 * 60)
|
||||||
# trunk-ignore(bandit/B311)
|
# trunk-ignore(bandit/B311)
|
||||||
rand = random.randint(1, 60)
|
rand = random.randint(1, 60)
|
||||||
logger.info(f"Sleeping for {2*rand} minutes")
|
logger.info(f"Sleeping for {2*rand} minutes")
|
||||||
|
|||||||
@@ -1,9 +1,9 @@
|
|||||||
# This Python file uses the following encoding: utf-8
|
|
||||||
"""
|
"""
|
||||||
The provided Python script sets up a Flask web server to manage a list of music files, with
|
The provided Python script sets up a Flask web server to manage a list of music files, with
|
||||||
functions for rescanning the music folder, updating the music list, and serving the music list via
|
functions for rescanning the music folder, updating the music list, and serving the music list via
|
||||||
API endpoints.
|
API endpoints.
|
||||||
"""
|
"""
|
||||||
|
|
||||||
import json
|
import json
|
||||||
import logging
|
import logging
|
||||||
import os
|
import os
|
||||||
@@ -11,6 +11,8 @@ import random
|
|||||||
import re
|
import re
|
||||||
import threading
|
import threading
|
||||||
import time
|
import time
|
||||||
|
|
||||||
|
# from flask_autoindex import AutoIndex
|
||||||
from datetime import datetime
|
from datetime import datetime
|
||||||
from logging import handlers
|
from logging import handlers
|
||||||
from pathlib import Path
|
from pathlib import Path
|
||||||
@@ -27,6 +29,8 @@ from flask import (
|
|||||||
send_from_directory,
|
send_from_directory,
|
||||||
)
|
)
|
||||||
from waitress import serve
|
from waitress import serve
|
||||||
|
import media_search_functions
|
||||||
|
|
||||||
|
|
||||||
MAIN_BOT_ADDRESS = "http://192.168.1.191:5000"
|
MAIN_BOT_ADDRESS = "http://192.168.1.191:5000"
|
||||||
MUSIC_TRACKER = "/prepped_tracks"
|
MUSIC_TRACKER = "/prepped_tracks"
|
||||||
@@ -46,10 +50,10 @@ if platform in ("linux", "linux2"):
|
|||||||
else:
|
else:
|
||||||
LOGFILE = "/home/pi/Conjurer/discord_mus_service.log"
|
LOGFILE = "/home/pi/Conjurer/discord_mus_service.log"
|
||||||
NETRC_FILE = "/home/pi/.netrc"
|
NETRC_FILE = "/home/pi/.netrc"
|
||||||
LOGSTORE = "/home/pi/RetroPie/logs/"
|
LOGSTORE = "/home/pi/MediaFolder/logs/"
|
||||||
ENCODING = "utf-8"
|
ENCODING = "utf-8"
|
||||||
MUSIC_FOLDER = "/home/pi/RetroPie/mp3/"
|
MUSIC_FOLDER = "/home/pi/MediaFolder/mp3/"
|
||||||
PRIORITY_FOLDER = "/home/pi/RetroPie/mp3/Magiczne i chuj/"
|
PRIORITY_FOLDER = "/home/pi/MediaFoldermp3/Magiczne i chuj/"
|
||||||
RADIOLOG_PATH = "/home/pi/Conjurer/radio_log.log"
|
RADIOLOG_PATH = "/home/pi/Conjurer/radio_log.log"
|
||||||
PERSISTENCE_PATH = "/home/pi/Conjurer/persistence.log"
|
PERSISTENCE_PATH = "/home/pi/Conjurer/persistence.log"
|
||||||
|
|
||||||
@@ -181,6 +185,7 @@ def scan_tracks():
|
|||||||
|
|
||||||
|
|
||||||
app = Flask(__name__)
|
app = Flask(__name__)
|
||||||
|
# AutoIndex(app, browse_root="/")
|
||||||
|
|
||||||
|
|
||||||
# TODO: Odpalić wyszukiwarki w wątkach i dopiero po wszystkim zsumować wyszukiwanie.
|
# TODO: Odpalić wyszukiwarki w wątkach i dopiero po wszystkim zsumować wyszukiwanie.
|
||||||
@@ -329,6 +334,36 @@ def remove_characters(string, character):
|
|||||||
return string.replace(character, "")
|
return string.replace(character, "")
|
||||||
|
|
||||||
|
|
||||||
|
@app.route('/get_share_list', methods=['POST'])
|
||||||
|
def get_share_list():
|
||||||
|
data = request.get_json()
|
||||||
|
entries = data.get('entries')
|
||||||
|
keywords = data.get('keywords')
|
||||||
|
# Validate entries
|
||||||
|
if not isinstance(entries, int) or not (1 <= entries <= 10):
|
||||||
|
return jsonify({'error': '"entries" must be an integer between 1 and 10.'}), 400
|
||||||
|
# Validate keywords list
|
||||||
|
if not isinstance(keywords, list) or not all(isinstance(k, str) for k in keywords):
|
||||||
|
return jsonify({'error': '"keywords" must be a list of strings.'}), 400
|
||||||
|
# Call external search
|
||||||
|
files = media_search_functions.find_matches(entries, keywords)
|
||||||
|
# Return each file path as a JSON list
|
||||||
|
return jsonify({'files': files}), 200
|
||||||
|
|
||||||
|
@app.route('/get_share_links', methods=['POST'])
|
||||||
|
def get_share_links():
|
||||||
|
data = request.get_json()
|
||||||
|
file_paths = data.get('file_paths')
|
||||||
|
# Validate file_paths list
|
||||||
|
if not isinstance(file_paths, list) or not all(isinstance(p, str) for p in file_paths):
|
||||||
|
return jsonify({'error': '"file_paths" must be a list of strings.'}), 400
|
||||||
|
# Call external publish
|
||||||
|
links = media_search_functions.publish(file_paths)
|
||||||
|
# Return list of published links
|
||||||
|
return jsonify({'links': links}), 200
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@app.route("/stream", methods=["GET"])
|
@app.route("/stream", methods=["GET"])
|
||||||
def stream_music():
|
def stream_music():
|
||||||
"""
|
"""
|
||||||
@@ -485,7 +520,7 @@ def create_priority_playlist():
|
|||||||
return_data = wyszukaj(
|
return_data = wyszukaj(
|
||||||
record["lista_slow"], record["dlugosc_plejlisty"], app.logger, False
|
record["lista_slow"], record["dlugosc_plejlisty"], app.logger, False
|
||||||
)
|
)
|
||||||
return_data = random.shuffle(return_data)
|
random.shuffle(return_data)
|
||||||
with open("/home/pi/Conjurer/request.playlist", "a", encoding="utf-8") as s_file:
|
with open("/home/pi/Conjurer/request.playlist", "a", encoding="utf-8") as s_file:
|
||||||
for item in return_data:
|
for item in return_data:
|
||||||
s_file.write(item[1] + "\n")
|
s_file.write(item[1] + "\n")
|
||||||
|
|||||||
@@ -0,0 +1,52 @@
|
|||||||
|
#!/usr/bin/env python3
|
||||||
|
import argparse
|
||||||
|
import json
|
||||||
|
import os
|
||||||
|
import sys
|
||||||
|
import uuid
|
||||||
|
from pathlib import Path
|
||||||
|
|
||||||
|
# CONFIGURATION
|
||||||
|
JSON_DB = '/var/log/share_scan.json'
|
||||||
|
SHARE_DIR = Path('/var/www/html/share')
|
||||||
|
BASE_URL = 'https://czernobog.pl/share'
|
||||||
|
|
||||||
|
# Ensure share directory exists
|
||||||
|
SHARE_DIR.mkdir(parents=True, exist_ok=True)
|
||||||
|
|
||||||
|
def load_db():
|
||||||
|
with open(JSON_DB) as f:
|
||||||
|
return json.load(f)['entries']
|
||||||
|
|
||||||
|
ENTRIES = load_db()
|
||||||
|
|
||||||
|
def relevancy(path, keywords):
|
||||||
|
score = 0
|
||||||
|
low = path.lower()
|
||||||
|
for kw in keywords:
|
||||||
|
if kw.lower() in low:
|
||||||
|
score += low.count(kw.lower())
|
||||||
|
return score
|
||||||
|
|
||||||
|
def find_matches(count, keywords):
|
||||||
|
scored = []
|
||||||
|
for e in ENTRIES:
|
||||||
|
score = relevancy(e['path'], keywords)
|
||||||
|
if score > 0:
|
||||||
|
scored.append((score, e['path']))
|
||||||
|
scored.sort(reverse=True, key=lambda x: x[0])
|
||||||
|
result = [p for _, p in scored]
|
||||||
|
return result[:count]
|
||||||
|
|
||||||
|
def publish(paths):
|
||||||
|
urls = []
|
||||||
|
for path in paths:
|
||||||
|
token = uuid.uuid4().hex
|
||||||
|
link = SHARE_DIR / token
|
||||||
|
try:
|
||||||
|
os.symlink(path, link)
|
||||||
|
except FileExistsError:
|
||||||
|
pass
|
||||||
|
urls.append(f"{BASE_URL}/{token}")
|
||||||
|
return urls
|
||||||
|
|
||||||
@@ -2,9 +2,47 @@
|
|||||||
"""This module contains utility scripts used by musi radiostation Conjurer"""
|
"""This module contains utility scripts used by musi radiostation Conjurer"""
|
||||||
import time
|
import time
|
||||||
import re
|
import re
|
||||||
|
import os
|
||||||
|
import argparse
|
||||||
|
|
||||||
|
from mutagen.easyid3 import EasyID3
|
||||||
|
from mutagen.mp3 import MP3
|
||||||
|
|
||||||
|
|
||||||
|
def update_metadata(folder_path):
|
||||||
|
for root, _, files in os.walk(folder_path):
|
||||||
|
for file in files:
|
||||||
|
if file.endswith(".mp3"):
|
||||||
|
file_path = os.path.join(root, file)
|
||||||
|
|
||||||
|
# Sample logic for guessing metadata from filename
|
||||||
|
# Assuming the filename format is "Artist - Title.mp3"
|
||||||
|
try:
|
||||||
|
artist, title = file.rsplit(" - ", 1)
|
||||||
|
title = title.replace(".mp3", "")
|
||||||
|
except ValueError:
|
||||||
|
# If file name doesn't fit the expected pattern, skip
|
||||||
|
print(f"Skipping file due to unexpected format: {file}")
|
||||||
|
continue
|
||||||
|
|
||||||
|
try:
|
||||||
|
# Load the mp3 file
|
||||||
|
audio = MP3(file_path, ID3=EasyID3)
|
||||||
|
|
||||||
|
# Update metadata
|
||||||
|
audio["artist"] = artist.strip()
|
||||||
|
audio["title"] = title.strip()
|
||||||
|
|
||||||
|
# Save changes
|
||||||
|
audio.save()
|
||||||
|
print(f"Updated metadata for: {file}")
|
||||||
|
except Exception as e:
|
||||||
|
print(f"Failed to update metadata for {file}: {e}")
|
||||||
|
|
||||||
|
|
||||||
NAME = "/home/pi/Conjurer/persistence.log"
|
NAME = "/home/pi/Conjurer/persistence.log"
|
||||||
|
|
||||||
|
|
||||||
def print_top():
|
def print_top():
|
||||||
"""
|
"""
|
||||||
Prints the top 65 lines from a file specified by the NAME variable.
|
Prints the top 65 lines from a file specified by the NAME variable.
|
||||||
@@ -13,7 +51,7 @@ def print_top():
|
|||||||
line = ""
|
line = ""
|
||||||
buffer = ""
|
buffer = ""
|
||||||
with open(NAME, "r", encoding="utf-8") as f:
|
with open(NAME, "r", encoding="utf-8") as f:
|
||||||
for _ in range (45):
|
for _ in range(45):
|
||||||
line = f.readline()
|
line = f.readline()
|
||||||
if re.match(".*mp3", line):
|
if re.match(".*mp3", line):
|
||||||
buffer += line
|
buffer += line
|
||||||
@@ -22,5 +60,39 @@ def print_top():
|
|||||||
print("=====================================")
|
print("=====================================")
|
||||||
time.sleep(180)
|
time.sleep(180)
|
||||||
|
|
||||||
|
|
||||||
|
def main():
|
||||||
|
parser = argparse.ArgumentParser(
|
||||||
|
description="Perform operations on a directory of .mp3 files."
|
||||||
|
)
|
||||||
|
|
||||||
|
# Positional argument for choosing the function to execute
|
||||||
|
parser.add_argument(
|
||||||
|
"operation",
|
||||||
|
type=str,
|
||||||
|
choices=["update_metadata", "print_top"],
|
||||||
|
help="Operation to perform: update_metadata or print_top.",
|
||||||
|
default="print_top",
|
||||||
|
)
|
||||||
|
|
||||||
|
# Positional argument for folder path
|
||||||
|
parser.add_argument("folder", type=str, help="Path to the folder to operate on.")
|
||||||
|
|
||||||
|
args = parser.parse_args()
|
||||||
|
if args.operation == "update_metadata":
|
||||||
|
if args.folder:
|
||||||
|
folder_to_scan = args.folder
|
||||||
|
else:
|
||||||
|
print("Please provide a folder path to scan.")
|
||||||
|
raise ValueError("No folder path provided.")
|
||||||
|
|
||||||
|
if args.operation == "update_metadata" and os.path.isdir(folder_to_scan):
|
||||||
|
update_metadata(folder_to_scan)
|
||||||
|
elif args.operation == "print_top":
|
||||||
|
print_top()
|
||||||
|
else:
|
||||||
|
print(f"The specified path is not a directory: {folder_to_scan}")
|
||||||
|
|
||||||
|
|
||||||
if __name__ == "__main__":
|
if __name__ == "__main__":
|
||||||
print_top()
|
main()
|
||||||
|
|||||||
@@ -0,0 +1,9 @@
|
|||||||
|
/home/pi/Conjurer/radio_log.log {
|
||||||
|
daily
|
||||||
|
rotate 7
|
||||||
|
compress
|
||||||
|
delaycompress
|
||||||
|
missingok
|
||||||
|
notifempty
|
||||||
|
copytruncate
|
||||||
|
}
|
||||||
@@ -43,6 +43,22 @@ def queue_processing()
|
|||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
# Configure output formats and destinations
|
||||||
|
def now_playing(m)
|
||||||
|
# raw lookup ("" if missing)
|
||||||
|
raw_title = m["title"]
|
||||||
|
raw_artist = m["artist"]
|
||||||
|
|
||||||
|
# default if empty
|
||||||
|
title = if raw_title == "" then "Unknown" else raw_title end
|
||||||
|
artist = if raw_artist == "" then "Unknown" else raw_artist end
|
||||||
|
log.critical("Now playing #{artist} - #{title}")
|
||||||
|
# write it out
|
||||||
|
system("echo '#{artist} - #{title}' > /tmp/now_playing.txt")
|
||||||
|
m
|
||||||
|
end
|
||||||
|
|
||||||
|
|
||||||
# Randomly select a playlist with weights
|
# Randomly select a playlist with weights
|
||||||
s4 = random(id="randomizer", weights=[2, 3, 5], [s1, s2, s3])
|
s4 = random(id="randomizer", weights=[2, 3, 5], [s1, s2, s3])
|
||||||
|
|
||||||
@@ -52,11 +68,11 @@ jingles = (playlist(reload_mode="watch", "/home/pi/Conjurer/jingles.playlist"))
|
|||||||
# Create the main stream with random playlist and jingles
|
# Create the main stream with random playlist and jingles
|
||||||
s = rotate(id="randomizer", weights=[10, 1], [s4, jingles])
|
s = rotate(id="randomizer", weights=[10, 1], [s4, jingles])
|
||||||
|
|
||||||
s = crossfade(fade_out=2., fade_in=2., duration=4., fallback(id="switcher", track_sensitive=false, [requests_queue, s]))
|
s = crossfade(fade_out=2., fade_in=2., duration=4., fallback(id="switcher", track_sensitive=true, [requests_queue, s]))
|
||||||
|
s = metadata.map(now_playing, s)
|
||||||
|
|
||||||
# Set up an interactive harbor for controlling the stream
|
# Set up an interactive harbor for controlling the stream
|
||||||
interactive.harbor(port = 9999)
|
interactive.harbor(port = 9999)
|
||||||
harbor.input(buffer=30.0)
|
|
||||||
# Set up interactive controls for bass boost
|
# Set up interactive controls for bass boost
|
||||||
f = interactive.float("f", description="Frequency", min=0., max=1000., unit="Hz", 200.)
|
f = interactive.float("f", description="Frequency", min=0., max=1000., unit="Hz", 200.)
|
||||||
g = interactive.float("g", description="Gain", min=0., max=20., unit="dB", 8.)
|
g = interactive.float("g", description="Gain", min=0., max=20., unit="dB", 8.)
|
||||||
@@ -64,33 +80,33 @@ b = bass_boost(frequency=f, gain=g, s)
|
|||||||
s = add([s, b])
|
s = add([s, b])
|
||||||
|
|
||||||
# Set up interactive control for main volume
|
# Set up interactive control for main volume
|
||||||
a = interactive.float("main_volume", min=0., max=20., 0.4)
|
a = interactive.float("main_volume", min=0., max=20., 1.1)
|
||||||
s = compress.multiband.interactive(bands=7, s)
|
s = compress.multiband.interactive(bands=7, s)
|
||||||
|
|
||||||
mic_gain = interactive.float("mic_volume", min=0., max=120., 6.)
|
mic_gain = interactive.float("mic_volume", min=0., max=120., 0.5)
|
||||||
|
|
||||||
# Apply audio processing effects
|
# Apply audio processing effects
|
||||||
tmic = buffer(input.pulseaudio()) # Microphone
|
tmic = buffer(input.pulseaudio()) # Microphone
|
||||||
mic = amplify(mic_gain, tmic)
|
mic = amplify(mic_gain, tmic)
|
||||||
mic = gate(threshold=-80., range=-120., mic)
|
mic = gate(threshold=-80., range=-120., mic)
|
||||||
mic = compress(threshold=0., ratio=2.,mic)
|
mic = compress(threshold=0., ratio=2.,mic)
|
||||||
mic = blank.strip(max_blank=10., min_noise=.1, threshold=-20., mic)
|
mic = nrj(normalize(mic))
|
||||||
|
mic = blank.strip(max_blank=15., min_noise=.1, threshold=-30., mic)
|
||||||
|
mic = fallback(id="switcher2", track_sensitive=false, [mic, blank()])
|
||||||
|
|
||||||
# Apply audio processing effects
|
# Apply audio processing effects
|
||||||
s = nrj(normalize(s))
|
s = nrj(s)
|
||||||
s = amplify(a, s)
|
s = amplify(a, s)
|
||||||
# Skip blank sections in the stream
|
# Skip blank sections in the stream
|
||||||
s = blank.skip(max_blank=10., s)192
|
s = blank.skip(max_blank=10., s)
|
||||||
|
|
||||||
#Manual audition override
|
#Manual audition override
|
||||||
live_enabled = interactive.bool("Going Live!", true)
|
live_enabled = interactive.bool("Going Live!", true)
|
||||||
s = switch(track_sensitive=false,
|
|
||||||
[({!live_enabled}, live),
|
|
||||||
({true}, radio)])
|
|
||||||
|
|
||||||
|
s = add([mic,s])
|
||||||
def fading_transition(a,b)
|
s=switch(track_sensitive=true,
|
||||||
sequence([fade.out(a.source),fade.in(b.source)])
|
[(live_enabled, mic),
|
||||||
end
|
({true}, s)])
|
||||||
|
|
||||||
# Configure logging settings
|
# Configure logging settings
|
||||||
log_to_stdout = true
|
log_to_stdout = true
|
||||||
@@ -103,10 +119,10 @@ set("log.level", loglevel)
|
|||||||
# Enable logging to file
|
# Enable logging to file
|
||||||
set("log.file", log_to_file)
|
set("log.file", log_to_file)
|
||||||
set("log.file.path", logpath)
|
set("log.file.path", logpath)
|
||||||
|
|
||||||
# Set up emergency fallback track
|
# Set up emergency fallback track
|
||||||
emergency = single("/home/pi/RetroPie/mp3/Youtube/Dr. Peacock - Trip to Ireland [GvrvQTUbUcA].mp3")
|
emergency = single("/home/pi/MediaFolder/mp3/Youtube/Dr. Peacock - Trip to Ireland [GvrvQTUbUcA].mp3")
|
||||||
radio = fallback(id="switcher2", track_sensitive=false, [s, emergency])
|
radio = fallback(id="switcher2", track_sensitive=false, [s, emergency])
|
||||||
|
|
||||||
# Set up an interactive control for skipping tracks
|
# Set up an interactive control for skipping tracks
|
||||||
p = interactive.bool("Skip track", false)
|
p = interactive.bool("Skip track", false)
|
||||||
def http_skip(~protocol, ~data, ~headers, uri)=
|
def http_skip(~protocol, ~data, ~headers, uri)=
|
||||||
@@ -138,7 +154,7 @@ interactive.persistent("script.params")
|
|||||||
|
|
||||||
# Configure output formats and destinations
|
# Configure output formats and destinations
|
||||||
|
|
||||||
output.icecast(%mp3, host="retropie", port=8000, password=credentials.password, icy_metadata="true", mount="mp3-stream", radio)
|
output.icecast(%mp3, host="radio", port=8000, password=credentials.password, icy_metadata="true", mount="mp3-stream", radio)
|
||||||
output.pulseaudio(radio)
|
output.pulseaudio(radio)
|
||||||
#output.file.hls("/tmp/hls", [("mp3-low", %mp3(bitrate=96)), ("mp3-hi", %mp3(bitrate=160))], radio)
|
#output.file.hls("/tmp/hls", [("mp3-low", %mp3(bitrate=96)), ("mp3-hi", %mp3(bitrate=160))], radio)
|
||||||
# Uncomment the following lines to enable additional output formats
|
# Uncomment the following lines to enable additional output formats
|
||||||
|
|||||||
@@ -1,3 +1,4 @@
|
|||||||
flask
|
flask
|
||||||
waitress
|
waitress
|
||||||
sshtunnel
|
sshtunnel
|
||||||
|
requests
|
||||||
|
|||||||
Executable
+99
@@ -0,0 +1,99 @@
|
|||||||
|
#!/usr/bin/env python3
|
||||||
|
import os
|
||||||
|
import re
|
||||||
|
import time
|
||||||
|
import json
|
||||||
|
import argparse
|
||||||
|
import sys
|
||||||
|
from pathlib import Path
|
||||||
|
|
||||||
|
# — CONFIGURATION — adjust as needed —
|
||||||
|
APACHE_LOG = '/var/log/apache2/share_access.log' # <- point to your share-specific log!
|
||||||
|
SHARE_DIR = Path('/var/www/html/share')
|
||||||
|
METADATA_FILE = SHARE_DIR / '.downloads.json'
|
||||||
|
STATE_FILE = SHARE_DIR / '.logpos'
|
||||||
|
# Regex to match lines like: "GET /share/abcdef1234... HTTP/1.1"
|
||||||
|
TOKEN_REGEX = re.compile(r'"\s*GET\s+/share/([0-9a-f]{32})\s+HTTP/')
|
||||||
|
|
||||||
|
def debug(msg, args):
|
||||||
|
if args.debug:
|
||||||
|
print(f"[DEBUG] {msg}", file=sys.stderr)
|
||||||
|
|
||||||
|
def load_metadata(args):
|
||||||
|
if METADATA_FILE.exists():
|
||||||
|
data = json.loads(METADATA_FILE.read_text())
|
||||||
|
debug(f"Loaded metadata: {data}", args)
|
||||||
|
return data
|
||||||
|
return {}
|
||||||
|
|
||||||
|
def save_metadata(md, args):
|
||||||
|
METADATA_FILE.write_text(json.dumps(md))
|
||||||
|
debug(f"Saved metadata: {md}", args)
|
||||||
|
|
||||||
|
def load_state(args):
|
||||||
|
if STATE_FILE.exists():
|
||||||
|
pos = int(STATE_FILE.read_text())
|
||||||
|
debug(f"Loaded last log position: {pos}", args)
|
||||||
|
return pos
|
||||||
|
return 0
|
||||||
|
|
||||||
|
def save_state(pos, args):
|
||||||
|
STATE_FILE.write_text(str(pos))
|
||||||
|
debug(f"Saved new log position: {pos}", args)
|
||||||
|
|
||||||
|
def scan_log(since_pos, args):
|
||||||
|
try:
|
||||||
|
with open(APACHE_LOG, 'r') as f:
|
||||||
|
f.seek(since_pos)
|
||||||
|
lines = f.readlines()
|
||||||
|
newpos = f.tell()
|
||||||
|
debug(f"Read {len(lines)} new lines", args)
|
||||||
|
return lines, newpos
|
||||||
|
except Exception as e:
|
||||||
|
print(f"Error reading log: {e}", file=sys.stderr)
|
||||||
|
return [], since_pos
|
||||||
|
|
||||||
|
def record_downloads(lines, metadata, args):
|
||||||
|
now = time.time()
|
||||||
|
for line in lines:
|
||||||
|
m = TOKEN_REGEX.search(line)
|
||||||
|
if m:
|
||||||
|
tok = m.group(1)
|
||||||
|
if tok not in metadata:
|
||||||
|
metadata[tok] = now
|
||||||
|
debug(f"Recorded download of token {tok} at {now}", args)
|
||||||
|
return metadata
|
||||||
|
|
||||||
|
def revoke_old(metadata, args):
|
||||||
|
now = time.time()
|
||||||
|
to_remove = [tok for tok, ts in metadata.items() if now - ts >= 3600]
|
||||||
|
for tok in to_remove:
|
||||||
|
link = SHARE_DIR / tok
|
||||||
|
try:
|
||||||
|
link.unlink()
|
||||||
|
debug(f"Unlinked token {tok}", args)
|
||||||
|
except FileNotFoundError:
|
||||||
|
debug(f"Link {link} not found when revoking", args)
|
||||||
|
metadata.pop(tok, None)
|
||||||
|
return bool(to_remove)
|
||||||
|
|
||||||
|
def main():
|
||||||
|
p = argparse.ArgumentParser(description="Revoke share links 2min after download")
|
||||||
|
p.add_argument('--debug', action='store_true', help='print debug info to stderr')
|
||||||
|
args = p.parse_args()
|
||||||
|
|
||||||
|
SHARE_DIR.mkdir(parents=True, exist_ok=True)
|
||||||
|
metadata = load_metadata(args)
|
||||||
|
state = load_state(args)
|
||||||
|
|
||||||
|
lines, newpos = scan_log(state, args)
|
||||||
|
metadata = record_downloads(lines, metadata, args)
|
||||||
|
save_metadata(metadata, args) # always persist new downloads
|
||||||
|
|
||||||
|
if revoke_old(metadata, args):
|
||||||
|
save_metadata(metadata, args) # persist removals
|
||||||
|
|
||||||
|
save_state(newpos, args)
|
||||||
|
|
||||||
|
if __name__ == '__main__':
|
||||||
|
main()
|
||||||
Executable
+44
@@ -0,0 +1,44 @@
|
|||||||
|
#!/usr/bin/env python3
|
||||||
|
import os
|
||||||
|
import json
|
||||||
|
import time
|
||||||
|
from pathlib import Path
|
||||||
|
|
||||||
|
# Configuration
|
||||||
|
SCAN_PATH = '/mnt/shares'
|
||||||
|
OUTPUT_FILE = '/var/log/share_scan.json'
|
||||||
|
|
||||||
|
def scan_directory(root):
|
||||||
|
"""Recursively walk `root` and collect metadata."""
|
||||||
|
entries = []
|
||||||
|
for dirpath, dirs, files in os.walk(root):
|
||||||
|
for name in dirs + files:
|
||||||
|
full = os.path.join(dirpath, name)
|
||||||
|
try:
|
||||||
|
stat = os.stat(full)
|
||||||
|
entries.append({
|
||||||
|
'path': full,
|
||||||
|
'is_dir': os.path.isdir(full),
|
||||||
|
'size_bytes': stat.st_size,
|
||||||
|
'mtime': time.strftime('%Y-%m-%dT%H:%M:%S%z',
|
||||||
|
time.localtime(stat.st_mtime)),
|
||||||
|
})
|
||||||
|
except Exception as e:
|
||||||
|
# skip items we can't stat
|
||||||
|
continue
|
||||||
|
return entries
|
||||||
|
|
||||||
|
def main():
|
||||||
|
data = {
|
||||||
|
'scanned_at': time.strftime('%Y-%m-%dT%H:%M:%S%z', time.localtime()),
|
||||||
|
'root': SCAN_PATH,
|
||||||
|
'entries': scan_directory(SCAN_PATH),
|
||||||
|
}
|
||||||
|
# Write atomically
|
||||||
|
temp = OUTPUT_FILE + '.tmp'
|
||||||
|
with open(temp, 'w') as f:
|
||||||
|
json.dump(data, f, indent=2)
|
||||||
|
os.replace(temp, OUTPUT_FILE)
|
||||||
|
|
||||||
|
if __name__ == '__main__':
|
||||||
|
main()
|
||||||
@@ -0,0 +1,6 @@
|
|||||||
|
[Unit]
|
||||||
|
Description=One‑shot scan of /mnt/shares → JSON
|
||||||
|
|
||||||
|
[Service]
|
||||||
|
Type=oneshot
|
||||||
|
ExecStart=/usr/local/bin/scan_shares.py
|
||||||
@@ -0,0 +1,11 @@
|
|||||||
|
[Unit]
|
||||||
|
Description=Hourly timer for share‑scanner
|
||||||
|
|
||||||
|
[Timer]
|
||||||
|
# delay 2min after boot, then every hour
|
||||||
|
OnBootSec=20min
|
||||||
|
OnUnitActiveSec=24h
|
||||||
|
Unit=scan_shares.service
|
||||||
|
|
||||||
|
[Install]
|
||||||
|
WantedBy=timers.target
|
||||||
@@ -0,0 +1,195 @@
|
|||||||
|
{
|
||||||
|
"string": [],
|
||||||
|
"bool": [ [ "Skip track", false ], [ "Going Live!", false ] ],
|
||||||
|
"int": [],
|
||||||
|
"float": [
|
||||||
|
[
|
||||||
|
"mic_volume",
|
||||||
|
0.0
|
||||||
|
],
|
||||||
|
[
|
||||||
|
"compress_gain6",
|
||||||
|
0.1
|
||||||
|
],
|
||||||
|
[
|
||||||
|
"compress_ratio6",
|
||||||
|
7.9
|
||||||
|
],
|
||||||
|
[
|
||||||
|
"compress_threshold6",
|
||||||
|
-15.8
|
||||||
|
],
|
||||||
|
[
|
||||||
|
"compress_release6",
|
||||||
|
30.0
|
||||||
|
],
|
||||||
|
[
|
||||||
|
"compress_attack6",
|
||||||
|
30.0
|
||||||
|
],
|
||||||
|
[
|
||||||
|
"compress_frequency6",
|
||||||
|
18610.0
|
||||||
|
],
|
||||||
|
[
|
||||||
|
"compress_gain5",
|
||||||
|
5.4
|
||||||
|
],
|
||||||
|
[
|
||||||
|
"compress_ratio5",
|
||||||
|
4.8
|
||||||
|
],
|
||||||
|
[
|
||||||
|
"compress_threshold5",
|
||||||
|
-13.6
|
||||||
|
],
|
||||||
|
[
|
||||||
|
"compress_release5",
|
||||||
|
170.0
|
||||||
|
],
|
||||||
|
[
|
||||||
|
"compress_attack5",
|
||||||
|
160.0
|
||||||
|
],
|
||||||
|
[
|
||||||
|
"compress_frequency5",
|
||||||
|
13950.0
|
||||||
|
],
|
||||||
|
[
|
||||||
|
"compress_gain4",
|
||||||
|
6.5
|
||||||
|
],
|
||||||
|
[
|
||||||
|
"compress_ratio4",
|
||||||
|
4.0
|
||||||
|
],
|
||||||
|
[
|
||||||
|
"compress_threshold4",
|
||||||
|
-12.2
|
||||||
|
],
|
||||||
|
[
|
||||||
|
"compress_release4",
|
||||||
|
180.0
|
||||||
|
],
|
||||||
|
[
|
||||||
|
"compress_attack4",
|
||||||
|
200.0
|
||||||
|
],
|
||||||
|
[
|
||||||
|
"compress_frequency4",
|
||||||
|
3890.0
|
||||||
|
],
|
||||||
|
[
|
||||||
|
"compress_gain3",
|
||||||
|
8.2
|
||||||
|
],
|
||||||
|
[
|
||||||
|
"compress_ratio3",
|
||||||
|
3.5
|
||||||
|
],
|
||||||
|
[
|
||||||
|
"compress_threshold3",
|
||||||
|
-11.7
|
||||||
|
],
|
||||||
|
[
|
||||||
|
"compress_release3",
|
||||||
|
180.0
|
||||||
|
],
|
||||||
|
[
|
||||||
|
"compress_attack3",
|
||||||
|
250.0
|
||||||
|
],
|
||||||
|
[
|
||||||
|
"compress_frequency3",
|
||||||
|
2270.0
|
||||||
|
],
|
||||||
|
[
|
||||||
|
"compress_gain2",
|
||||||
|
7.4
|
||||||
|
],
|
||||||
|
[
|
||||||
|
"compress_ratio2",
|
||||||
|
3.9
|
||||||
|
],
|
||||||
|
[
|
||||||
|
"compress_threshold2",
|
||||||
|
-11.5
|
||||||
|
],
|
||||||
|
[
|
||||||
|
"compress_release2",
|
||||||
|
190.0
|
||||||
|
],
|
||||||
|
[
|
||||||
|
"compress_attack2",
|
||||||
|
250.0
|
||||||
|
],
|
||||||
|
[
|
||||||
|
"compress_frequency2",
|
||||||
|
1920.0
|
||||||
|
],
|
||||||
|
[
|
||||||
|
"compress_gain1",
|
||||||
|
11.1
|
||||||
|
],
|
||||||
|
[
|
||||||
|
"compress_ratio1",
|
||||||
|
3.4
|
||||||
|
],
|
||||||
|
[
|
||||||
|
"compress_threshold1",
|
||||||
|
-12.7
|
||||||
|
],
|
||||||
|
[
|
||||||
|
"compress_release1",
|
||||||
|
170.0
|
||||||
|
],
|
||||||
|
[
|
||||||
|
"compress_attack1",
|
||||||
|
220.0
|
||||||
|
],
|
||||||
|
[
|
||||||
|
"compress_frequency1",
|
||||||
|
650.0
|
||||||
|
],
|
||||||
|
[
|
||||||
|
"compress_gain0",
|
||||||
|
16.0
|
||||||
|
],
|
||||||
|
[
|
||||||
|
"compress_ratio0",
|
||||||
|
3.2
|
||||||
|
],
|
||||||
|
[
|
||||||
|
"compress_threshold0",
|
||||||
|
-15.3
|
||||||
|
],
|
||||||
|
[
|
||||||
|
"compress_release0",
|
||||||
|
200.0
|
||||||
|
],
|
||||||
|
[
|
||||||
|
"compress_attack0",
|
||||||
|
90.0
|
||||||
|
],
|
||||||
|
[
|
||||||
|
"compress_frequency0",
|
||||||
|
110.0
|
||||||
|
],
|
||||||
|
[
|
||||||
|
"compress_wet",
|
||||||
|
1.0
|
||||||
|
],
|
||||||
|
[
|
||||||
|
"main_volume",
|
||||||
|
1.8
|
||||||
|
],
|
||||||
|
[
|
||||||
|
"g",
|
||||||
|
9.5
|
||||||
|
],
|
||||||
|
[
|
||||||
|
"f",
|
||||||
|
64.2
|
||||||
|
]
|
||||||
|
]
|
||||||
|
}
|
||||||
Executable
+93
@@ -0,0 +1,93 @@
|
|||||||
|
#!/usr/bin/env python3
|
||||||
|
import argparse
|
||||||
|
import json
|
||||||
|
import os
|
||||||
|
import sys
|
||||||
|
import uuid
|
||||||
|
from pathlib import Path
|
||||||
|
|
||||||
|
# CONFIGURATION
|
||||||
|
JSON_DB = '/var/log/share_scan.json'
|
||||||
|
SHARE_DIR = Path('/var/www/html/share')
|
||||||
|
BASE_URL = 'https://czernobog.pl/share'
|
||||||
|
|
||||||
|
# Ensure share directory exists
|
||||||
|
SHARE_DIR.mkdir(parents=True, exist_ok=True)
|
||||||
|
|
||||||
|
def load_db():
|
||||||
|
with open(JSON_DB) as f:
|
||||||
|
return json.load(f)['entries']
|
||||||
|
|
||||||
|
def relevancy(path, keywords):
|
||||||
|
score = 0
|
||||||
|
low = path.lower()
|
||||||
|
for kw in keywords:
|
||||||
|
if kw.lower() in low:
|
||||||
|
score += low.count(kw.lower())
|
||||||
|
return score
|
||||||
|
|
||||||
|
def find_matches(entries, keywords):
|
||||||
|
scored = []
|
||||||
|
for e in entries:
|
||||||
|
score = relevancy(e['path'], keywords)
|
||||||
|
if score > 0:
|
||||||
|
scored.append((score, e['path']))
|
||||||
|
scored.sort(reverse=True, key=lambda x: x[0])
|
||||||
|
return [p for _, p in scored]
|
||||||
|
|
||||||
|
def interactive_select(candidates):
|
||||||
|
print("Search results:")
|
||||||
|
for idx, p in enumerate(candidates, 1):
|
||||||
|
print(f" {idx:3d}. {p}")
|
||||||
|
sel = input("\nSelect files (e.g. 1,3-5): ").strip()
|
||||||
|
nums = set()
|
||||||
|
for part in sel.split(','):
|
||||||
|
if '-' in part:
|
||||||
|
a,b = part.split('-',1)
|
||||||
|
nums.update(range(int(a), int(b)+1))
|
||||||
|
else:
|
||||||
|
nums.add(int(part))
|
||||||
|
return [candidates[i-1] for i in sorted(nums) if 1 <= i <= len(candidates)]
|
||||||
|
|
||||||
|
def publish(paths):
|
||||||
|
urls = []
|
||||||
|
for path in paths:
|
||||||
|
token = uuid.uuid4().hex
|
||||||
|
link = SHARE_DIR / token
|
||||||
|
try:
|
||||||
|
os.symlink(path, link)
|
||||||
|
except FileExistsError:
|
||||||
|
pass
|
||||||
|
urls.append(f"{BASE_URL}/{token}")
|
||||||
|
return urls
|
||||||
|
|
||||||
|
def main():
|
||||||
|
parser = argparse.ArgumentParser(description="Search and share files from JSON DB")
|
||||||
|
parser.add_argument('keywords', nargs='*',
|
||||||
|
help='Search keywords (interactive if omitted)')
|
||||||
|
parser.add_argument('-n','--count', type=int, default=10,
|
||||||
|
help='How many top results to share')
|
||||||
|
args = parser.parse_args()
|
||||||
|
|
||||||
|
if not args.keywords:
|
||||||
|
# Interactive: ask for query
|
||||||
|
q = input("Enter search keywords (space-separated): ").strip().split()
|
||||||
|
args.keywords = q
|
||||||
|
|
||||||
|
entries = load_db()
|
||||||
|
matches = find_matches(entries, args.keywords)
|
||||||
|
top_n = matches[:args.count]
|
||||||
|
|
||||||
|
if sys.stdin.isatty():
|
||||||
|
# interactive selection
|
||||||
|
sel = interactive_select(top_n)
|
||||||
|
else:
|
||||||
|
# non-interactive: share all top_n
|
||||||
|
sel = top_n
|
||||||
|
|
||||||
|
urls = publish(sel)
|
||||||
|
for u in urls:
|
||||||
|
print(u)
|
||||||
|
|
||||||
|
if __name__=='__main__':
|
||||||
|
main()
|
||||||
+9
-4
@@ -78,14 +78,14 @@ if platform in ("linux", "linux2"):
|
|||||||
MEMORY_FIVE_SIARA = "/home/pi/Conjurer/pamiec.json"
|
MEMORY_FIVE_SIARA = "/home/pi/Conjurer/pamiec.json"
|
||||||
SYSTEM_GPT_SETTINGS = "/home/pi/Conjurer/system_gpt_settings.json"
|
SYSTEM_GPT_SETTINGS = "/home/pi/Conjurer/system_gpt_settings.json"
|
||||||
MEMORY_FIVE_MUZYKA = "/home/pi/Conjurer/pamiec_muzyki.json"
|
MEMORY_FIVE_MUZYKA = "/home/pi/Conjurer/pamiec_muzyki.json"
|
||||||
MUSIC_FOLDER = "/home/pi/RetroPie/mp3/"
|
MUSIC_FOLDER = "/home/pi/MediaShare/mp3/"
|
||||||
SETTINGS_FILE = "/home/pi/Conjurer/settings.json"
|
SETTINGS_FILE = "/home/pi/Conjurer/settings.json"
|
||||||
NETRC_FILE = "/home/pi/.netrc"
|
NETRC_FILE = "/home/pi/.netrc"
|
||||||
LOGSTORE = "/home/pi/RetroPie/logs/"
|
LOGSTORE = "/home/pi/MediaShara/logs/"
|
||||||
ACCIDENT_LOG = "/home/pi/Conjurer/accident_log.json"
|
ACCIDENT_LOG = "/home/pi/Conjurer/accident_log.json"
|
||||||
ENCODING = "utf-8"
|
ENCODING = "utf-8"
|
||||||
GRAPHICS_PATH = "/home/pi/RetroPie/Conjurer_graphics/"
|
GRAPHICS_PATH = "/home/pi/MediaShare/Conjurer_graphics/"
|
||||||
DIR_PATH_SADOX = "/home/pi/RetroPie/Fansadox/"
|
DIR_PATH_SADOX = "/home/pi/MediaShare/Fansadox/"
|
||||||
|
|
||||||
|
|
||||||
elif platform == "win32":
|
elif platform == "win32":
|
||||||
@@ -120,6 +120,9 @@ SPOTIFY_CTRL = spotipy.Spotify(
|
|||||||
client_secret=authTokens[2],
|
client_secret=authTokens[2],
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
|
REMOTE_HOST_NAME = "youtube"
|
||||||
|
authTokens = netrc_mod.authenticators(REMOTE_HOST_NAME)
|
||||||
|
YOUTUBE_AUTH = [authTokens[0],authTokens[2]]
|
||||||
|
|
||||||
WORD_REACTIONS = DATA["word_reactions"]
|
WORD_REACTIONS = DATA["word_reactions"]
|
||||||
CYCLIC_WORDS = DATA["cyclic_words"]
|
CYCLIC_WORDS = DATA["cyclic_words"]
|
||||||
@@ -135,3 +138,5 @@ with open(SYSTEM_GPT_SETTINGS, "r+", encoding=ENCODING) as temp_settings_file:
|
|||||||
with open(MEMORY_FIVE_MUZYKA, "r+", encoding=ENCODING) as temp_music_memory_file:
|
with open(MEMORY_FIVE_MUZYKA, "r+", encoding=ENCODING) as temp_music_memory_file:
|
||||||
# First we load existing data into a dict.
|
# First we load existing data into a dict.
|
||||||
MESSAGE_TABLE_MUZYKA = json.load(temp_music_memory_file)
|
MESSAGE_TABLE_MUZYKA = json.load(temp_music_memory_file)
|
||||||
|
SPECJALNE_ZIEMNIACZKI = GPT_SETTINGS[1]
|
||||||
|
ASSISTANTS = {}
|
||||||
|
|||||||
@@ -1,27 +1,94 @@
|
|||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
cd /home/pi/conjurer || exit
|
|
||||||
git pull
|
|
||||||
cp ./deploy.sh /home/pi/
|
|
||||||
cd /home/pi || exit
|
|
||||||
#cp ./conjurer/bot.py ./Conjurer/ #legacy to be deprecated after refactor is done
|
|
||||||
|
|
||||||
|
total_commands=26
|
||||||
|
current_command=0
|
||||||
|
|
||||||
|
function print_progress {
|
||||||
|
current_command=$((current_command + 1))
|
||||||
|
percent=$((current_command * 100 / total_commands))
|
||||||
|
echo "Executing command $current_command/$total_commands ($percent%): $1"
|
||||||
|
}
|
||||||
|
|
||||||
|
cd /home/pi/conjurer || exit
|
||||||
|
print_progress "cd /home/pi/conjurer"
|
||||||
|
|
||||||
|
git pull
|
||||||
|
print_progress "git pull"
|
||||||
|
|
||||||
|
cp ./deploy.sh /home/pi/
|
||||||
|
print_progress "cp ./deploy.sh /home/pi/"
|
||||||
|
|
||||||
|
cd /home/pi || exit
|
||||||
|
print_progress "cd /home/pi"
|
||||||
|
|
||||||
|
cp ./conjurer/LICENSE ./Conjurer/LICENSE
|
||||||
|
print_progress "cp ./conjurer/LICENSE ./Conjurer/LICENSE"
|
||||||
|
|
||||||
|
cp ./conjurer/fuckery.jpg ./Conjurer/
|
||||||
|
print_progress "cp ./conjurer/fuckery.jpg ./Conjurer/"
|
||||||
|
|
||||||
|
cp ./conjurer/willowisp.png ./Conjurer/
|
||||||
|
print_progress "cp ./conjurer/willowisp.png ./Conjurer/"
|
||||||
|
|
||||||
|
cp ./conjurer/wod_beacon.jpg ./Conjurer/
|
||||||
|
print_progress "cp ./conjurer/wod_beacon.jpg ./Conjurer/"
|
||||||
|
|
||||||
cp ./conjurer/settings.json ./Conjurer/
|
cp ./conjurer/settings.json ./Conjurer/
|
||||||
cp ./conjurer/system_gpt_settings.json ./Conjurer/
|
print_progress "cp ./conjurer/settings.json ./Conjurer/"
|
||||||
|
|
||||||
|
if [[ ./conjurer/system_gpt_settings.json -nt ./Conjurer/system_gpt_settings.json ]]; then
|
||||||
|
cp ./conjurer/system_gpt_settings.json ./Conjurer/system_gpt_settings.json
|
||||||
|
print_progress "cp ./conjurer/system_gpt_settings.json ./Conjurer/system_gpt_settings.json"
|
||||||
|
else
|
||||||
|
print_progress "system_gpt_settings.json is up to date"
|
||||||
|
fi
|
||||||
|
|
||||||
cp ./conjurer/administration_commands.py ./Conjurer/
|
cp ./conjurer/administration_commands.py ./Conjurer/
|
||||||
|
print_progress "cp ./conjurer/administration_commands.py ./Conjurer/"
|
||||||
|
|
||||||
cp ./conjurer/ai_commands.py ./Conjurer/
|
cp ./conjurer/ai_commands.py ./Conjurer/
|
||||||
|
print_progress "cp ./conjurer/ai_commands.py ./Conjurer/"
|
||||||
|
|
||||||
cp ./conjurer/ai_functions.py ./Conjurer/
|
cp ./conjurer/ai_functions.py ./Conjurer/
|
||||||
|
print_progress "cp ./conjurer/ai_functions.py ./Conjurer/"
|
||||||
|
|
||||||
cp ./conjurer/communication_subroutine.py ./Conjurer/
|
cp ./conjurer/communication_subroutine.py ./Conjurer/
|
||||||
|
print_progress "cp ./conjurer/communication_subroutine.py ./Conjurer/"
|
||||||
|
|
||||||
cp ./conjurer/constants.py ./Conjurer/
|
cp ./conjurer/constants.py ./Conjurer/
|
||||||
|
print_progress "cp ./conjurer/constants.py ./Conjurer/"
|
||||||
|
|
||||||
cp ./conjurer/librarian_commands.py ./Conjurer/
|
cp ./conjurer/librarian_commands.py ./Conjurer/
|
||||||
|
print_progress "cp ./conjurer/librarian_commands.py ./Conjurer/"
|
||||||
|
|
||||||
cp ./conjurer/music_commands.py ./Conjurer/
|
cp ./conjurer/music_commands.py ./Conjurer/
|
||||||
|
print_progress "cp ./conjurer/music_commands.py ./Conjurer/"
|
||||||
|
|
||||||
cp ./conjurer/music_functions.py ./Conjurer/
|
cp ./conjurer/music_functions.py ./Conjurer/
|
||||||
|
print_progress "cp ./conjurer/music_functions.py ./Conjurer/"
|
||||||
|
|
||||||
cp ./conjurer/other_commands.py ./Conjurer/
|
cp ./conjurer/other_commands.py ./Conjurer/
|
||||||
|
print_progress "cp ./conjurer/other_commands.py ./Conjurer/"
|
||||||
|
|
||||||
cp ./conjurer/other_functions.py ./Conjurer/
|
cp ./conjurer/other_functions.py ./Conjurer/
|
||||||
|
print_progress "cp ./conjurer/other_functions.py ./Conjurer/"
|
||||||
|
|
||||||
cp ./conjurer/radio_commands.py ./Conjurer/
|
cp ./conjurer/radio_commands.py ./Conjurer/
|
||||||
|
print_progress "cp ./conjurer/radio_commands.py ./Conjurer/"
|
||||||
|
|
||||||
cp ./conjurer/voice_recognition_commands.py ./Conjurer/
|
cp ./conjurer/voice_recognition_commands.py ./Conjurer/
|
||||||
|
print_progress "cp ./conjurer/voice_recognition_commands.py ./Conjurer/"
|
||||||
|
|
||||||
|
cp ./conjurer/file_search_functions.py ./Conjurer/
|
||||||
|
|
||||||
|
print_progress "cp ./conjurer/file_search_functions.py ./Conjurer/"
|
||||||
|
|
||||||
|
cp ./conjurer/file_search_commands.py ./Conjurer
|
||||||
|
print_progress "cp ./conjurer/file_search_functions.py ./Conjurer/"
|
||||||
|
|
||||||
|
|
||||||
cp ./conjurer/thin_client.py ./Conjurer/bot.py
|
cp ./conjurer/thin_client.py ./Conjurer/bot.py
|
||||||
|
print_progress "cp ./conjurer/thin_client.py ./Conjurer/bot.py"
|
||||||
|
|
||||||
sudo systemctl restart conjurer.service
|
sudo systemctl restart conjurer.service
|
||||||
|
print_progress "sudo systemctl restart conjurer.service"
|
||||||
|
|||||||
@@ -2,5 +2,6 @@
|
|||||||
cd ./conjurer || exit
|
cd ./conjurer || exit
|
||||||
git pull
|
git pull
|
||||||
cd ..
|
cd ..
|
||||||
|
cp ./conjurer/conjurer_musician/media_search_functions.py ./Conjurer
|
||||||
cp ./conjurer/conjurer_musician/conjurer_musician.py ./Conjurer
|
cp ./conjurer/conjurer_musician/conjurer_musician.py ./Conjurer
|
||||||
sudo systemctl restart conjurer_musician.service
|
sudo systemctl restart conjurer_musician.service
|
||||||
@@ -0,0 +1,3 @@
|
|||||||
|
Package: ffmpeg libavcodec-dev libavcodec59 libavdevice59 libavfilter8 libavformat-dev libavformat59 libavutil-dev libavutil57 libpostproc56 libswresample-dev libswresample4 libswscale-dev libswscale6 libavdevice-dev libavfilter-dev libpostproc-dev
|
||||||
|
Pin: origin deb.debian.org
|
||||||
|
Pin-Priority: 1001
|
||||||
@@ -0,0 +1,71 @@
|
|||||||
|
import os
|
||||||
|
import discord
|
||||||
|
from discord.ext import commands
|
||||||
|
import file_search_functions
|
||||||
|
|
||||||
|
class FileSelectView(discord.ui.View):
|
||||||
|
def __init__(self, files):
|
||||||
|
super().__init__(timeout=60)
|
||||||
|
options = [discord.SelectOption(label=os.path.basename(f)[:100], description=f, value=f) for f in files]
|
||||||
|
self.select = discord.ui.Select(
|
||||||
|
placeholder="Select files...",
|
||||||
|
min_values=1,
|
||||||
|
max_values=len(options),
|
||||||
|
options=options
|
||||||
|
)
|
||||||
|
self.select.callback = self.select_callback
|
||||||
|
self.add_item(self.select)
|
||||||
|
self.selected = []
|
||||||
|
|
||||||
|
async def select_callback(self, interaction: discord.Interaction):
|
||||||
|
# Store selected file paths
|
||||||
|
self.selected = self.select.values
|
||||||
|
await interaction.response.defer()
|
||||||
|
|
||||||
|
@discord.ui.button(label="Accept", style=discord.ButtonStyle.green)
|
||||||
|
async def accept_callback(self, interaction: discord.Interaction, button: discord.ui.Button):
|
||||||
|
# Handle acceptance
|
||||||
|
if not self.selected:
|
||||||
|
await interaction.response.send_message("No files selected.", ephemeral=True)
|
||||||
|
return
|
||||||
|
# Publish selected files
|
||||||
|
links = file_search_functions.publish(self.selected)
|
||||||
|
# Display the returned links
|
||||||
|
await interaction.response.edit_message(content="Published Links:\n" + "\n".join(links), view=None)
|
||||||
|
|
||||||
|
@discord.ui.button(label="Cancel", style=discord.ButtonStyle.red)
|
||||||
|
async def cancel_callback(self, interaction: discord.Interaction, button: discord.ui.Button):
|
||||||
|
# Handle cancellation
|
||||||
|
await interaction.response.edit_message(content="Operation cancelled.", view=None)
|
||||||
|
|
||||||
|
class FileSearchCog(commands.Cog):
|
||||||
|
"""Cog providing a file search and publish command."""
|
||||||
|
|
||||||
|
def __init__(self, bot: commands.Bot):
|
||||||
|
self.bot = bot
|
||||||
|
|
||||||
|
@commands.has_any_role("Jarl", "Thane")
|
||||||
|
@commands.command(name="tajna_biblioteka_inkwizycji")
|
||||||
|
async def findfiles(self, ctx: commands.Context, entries: int, *, keywords: str):
|
||||||
|
"""
|
||||||
|
Search for files matching keywords and publish selected ones.
|
||||||
|
|
||||||
|
Usage: !findfiles <entries 1-10> <keywords>
|
||||||
|
"""
|
||||||
|
if entries < 1 or entries > 10:
|
||||||
|
await ctx.send("❌ Entries must be between 1 and 10.")
|
||||||
|
return
|
||||||
|
keyword_list = keywords.split()
|
||||||
|
files = file_search_functions.find_matches(entries, keyword_list)
|
||||||
|
if not files:
|
||||||
|
await ctx.send("🔍 No matching files found.")
|
||||||
|
return
|
||||||
|
view = FileSelectView(files)
|
||||||
|
file_list = "\n".join(f"{i+1}. {f}" for i, f in enumerate(files))
|
||||||
|
await ctx.send(
|
||||||
|
f"🔍 Found files (select and click Accept or Cancel):\n{file_list}",
|
||||||
|
view=view
|
||||||
|
)
|
||||||
|
|
||||||
|
async def setup(bot: commands.Bot):
|
||||||
|
await bot.add_cog(FileSearchCog(bot))
|
||||||
@@ -0,0 +1,31 @@
|
|||||||
|
import requests
|
||||||
|
|
||||||
|
# Base URL for Flask service
|
||||||
|
BASE_URL = 'http://192.168.1.15:5000'
|
||||||
|
|
||||||
|
|
||||||
|
def find_matches(entries, keywords):
|
||||||
|
"""
|
||||||
|
Call the get_share_list endpoint.
|
||||||
|
entries: int (1-10)
|
||||||
|
keywords: list of strings
|
||||||
|
Returns: list of file paths
|
||||||
|
"""
|
||||||
|
payload = {'entries': entries, 'keywords': keywords}
|
||||||
|
response = requests.post(f"{BASE_URL}/get_share_list", json=payload)
|
||||||
|
response.raise_for_status()
|
||||||
|
data = response.json()
|
||||||
|
return data.get('files', [])
|
||||||
|
|
||||||
|
|
||||||
|
def publish(file_paths):
|
||||||
|
"""
|
||||||
|
Call the get_share_links endpoint.
|
||||||
|
file_paths: list of file path strings
|
||||||
|
Returns: list of published URLs
|
||||||
|
"""
|
||||||
|
payload = {'file_paths': file_paths}
|
||||||
|
response = requests.post(f"{BASE_URL}/get_share_links", json=payload)
|
||||||
|
response.raise_for_status()
|
||||||
|
data = response.json()
|
||||||
|
return data.get('links', [])
|
||||||
BIN
Binary file not shown.
|
After Width: | Height: | Size: 31 KiB |
+11
-9
@@ -1,20 +1,22 @@
|
|||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
sudo apt-get install python3-dev
|
sudo apt-get install python3-dev
|
||||||
|
sudo apt-get install portaudio19-dev python3-pyaudio
|
||||||
|
sudo apt-get install
|
||||||
cd /home/pi || exit
|
cd /home/pi || exit
|
||||||
mdkir Conjurer
|
mdkir Conjurer
|
||||||
cd Conjurer ||exit
|
cd Conjurer ||exit
|
||||||
python3 -m venv /home/pi/Conjurer/.venv
|
python3 -m venv /home/pi/Conjurer/.env
|
||||||
cp /home/pi/conjurer/requirements_bot.txt /home/pi/Conjurer/
|
cp /home/pi/conjurer/requirements_bot.txt /home/pi/Conjurer/
|
||||||
# trunk-ignore(shellcheck/SC1091)
|
# trunk-ignore(shellcheck/SC1091)
|
||||||
source /home/pi/Conjurer/.venv/bin/activate
|
source /home/pi/Conjurer/.env/bin/activate
|
||||||
./env/bin/python3 -m pip install --upgrade pip
|
./.env/bin/python3 -m pip install --upgrade pip
|
||||||
./env/bin/python3 -m pip install -r requirements_bot.txt
|
./.env/bin/python3 -m pip install -r requirements_bot.txt
|
||||||
sed -i -e 's/os.rename/shutil.copy/g' ./env/lib/python3.11/site-packages/spotify_dl/youtube.py
|
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
|
sed -i '1i\import shutil' ./.env/lib/python3.11/site-packages/spotify_dl/youtube.py
|
||||||
sed -i '1i\import logging' ./env/lib/python3.11/site-packages/spotify_dl/spotify.py
|
sed -i '1i\import logging' ./.env/lib/python3.11/site-packages/spotify_dl/spotify.py
|
||||||
|
|
||||||
sed -i '21i\ logger = logging.getLogger("discord")' ./env/lib/python3.11/site-packages/spotify_dl/spotify.py
|
sed -i '21i\ logger = logging.getLogger("discord")' ./.env/lib/python3.11/site-packages/spotify_dl/spotify.py
|
||||||
sed -i '22i\ logger.info("Playlist")' ./env/lib/python3.11/site-packages/spotify_dl/spotify.py
|
sed -i '22i\ logger.info("Playlist")' ./.env/lib/python3.11/site-packages/spotify_dl/spotify.py
|
||||||
#add sed changing signal registration to catch exception in spotify dl init
|
#add sed changing signal registration to catch exception in spotify dl init
|
||||||
deactivate
|
deactivate
|
||||||
sudo cp ./conjurer.service /etc/systemd/system/
|
sudo cp ./conjurer.service /etc/systemd/system/
|
||||||
|
|||||||
@@ -25,8 +25,12 @@ sudo usermod -aG pulse-access root
|
|||||||
sudo usermod -aG audio pi
|
sudo usermod -aG audio pi
|
||||||
sudo usermod -aG audio root
|
sudo usermod -aG audio root
|
||||||
|
|
||||||
|
echo "Add exception suppresion to signal handler in spotify __ini__.py"
|
||||||
|
echo "Add password to youtube opts in spotify_dl youtube.py"
|
||||||
|
echo "Downgrade ffmpeg by copying ffmpeg.pref from repository to /etc/apt/preferences.d"
|
||||||
|
echo "Install opam from installation link"
|
||||||
|
echo "Initialize opam"
|
||||||
|
echo "Install liquidsoap and its dependencies"
|
||||||
|
|
||||||
touch /home/pi/Conjurer/radio_log.log
|
touch /home/pi/Conjurer/radio_log.log
|
||||||
./env/bin/python3 -m pip install --upgrade pip
|
./env/bin/python3 -m pip install --upgrade pip
|
||||||
|
|||||||
@@ -28,6 +28,8 @@ class DataModule(commands.Cog):
|
|||||||
description="Wyświetla losową stronę z losowego komiksu FanSadox. Bardzo NSFW.",
|
description="Wyświetla losową stronę z losowego komiksu FanSadox. Bardzo NSFW.",
|
||||||
guild=discord.Object(id=664789470779932693),
|
guild=discord.Object(id=664789470779932693),
|
||||||
)
|
)
|
||||||
|
@commands.has_any_role('Nocna Zmiana', 'Jarl', 'Thane' , 'Bartender')
|
||||||
|
|
||||||
async def get_image_sadox(self, ctx):
|
async def get_image_sadox(self, ctx):
|
||||||
"""
|
"""
|
||||||
Take in a context parameter and retrieve an image related from fansadox collection.
|
Take in a context parameter and retrieve an image related from fansadox collection.
|
||||||
@@ -67,7 +69,6 @@ class DataModule(commands.Cog):
|
|||||||
await ctx.send(file=file)
|
await ctx.send(file=file)
|
||||||
self.logger.info("Get sadox completed")
|
self.logger.info("Get sadox completed")
|
||||||
|
|
||||||
# TODO: LIBRARIAN
|
|
||||||
@tasks.loop(seconds=3)
|
@tasks.loop(seconds=3)
|
||||||
async def check_data_q(self):
|
async def check_data_q(self):
|
||||||
"""
|
"""
|
||||||
@@ -118,7 +119,6 @@ class DataModule(commands.Cog):
|
|||||||
except Empty:
|
except Empty:
|
||||||
pass
|
pass
|
||||||
|
|
||||||
# TODO: LIBRARIAN
|
|
||||||
@commands.hybrid_command(
|
@commands.hybrid_command(
|
||||||
name="wyszukaj_linki_do_dokumentow",
|
name="wyszukaj_linki_do_dokumentow",
|
||||||
description="Szuka linkow doi w bazie crossref i podaje linki do scihuba",
|
description="Szuka linkow doi w bazie crossref i podaje linki do scihuba",
|
||||||
@@ -181,12 +181,12 @@ class DataModule(commands.Cog):
|
|||||||
+ " Zapytania obsługuje algorytm zasilany czterema chomikami zapierdalającymi w kołowrotku - więc wyniki najwcześniej za kilka godzi - ale mogą być też dni."
|
+ " Zapytania obsługuje algorytm zasilany czterema chomikami zapierdalającymi w kołowrotku - więc wyniki najwcześniej za kilka godzi - ale mogą być też dni."
|
||||||
)
|
)
|
||||||
|
|
||||||
# TODO: LIBRARIAN
|
|
||||||
@commands.hybrid_command(
|
@commands.hybrid_command(
|
||||||
name="glebokie_gardlo",
|
name="glebokie_gardlo",
|
||||||
description="Przygotowuje drinka o nazwie głębokie gardło",
|
description="Przygotowuje drinka o nazwie głębokie gardło",
|
||||||
guild=discord.Object(id=664789470779932693),
|
guild=discord.Object(id=664789470779932693),
|
||||||
)
|
)
|
||||||
|
|
||||||
async def wyszukaj_linki_do_dokumentow_deep(self, ctx):
|
async def wyszukaj_linki_do_dokumentow_deep(self, ctx):
|
||||||
"""
|
"""
|
||||||
The function `wyszukaj_linki_do_dokumentow_deep` performs a deep search for links to documents in
|
The function `wyszukaj_linki_do_dokumentow_deep` performs a deep search for links to documents in
|
||||||
|
|||||||
@@ -0,0 +1,101 @@
|
|||||||
|
# === SYSTEM SETUP ===
|
||||||
|
sudo apt update && sudo apt install -y \
|
||||||
|
pulseaudio pulseaudio-utils pavucontrol \
|
||||||
|
libgtk-3-dev gtk-3-examples \
|
||||||
|
xauth dbus-x11 \
|
||||||
|
samba
|
||||||
|
|
||||||
|
# === SAMBA CONFIGURATION ===
|
||||||
|
sudo nano /etc/samba/smb.conf
|
||||||
|
# Add at the end of the file:
|
||||||
|
# [RaspberryPiNAS]
|
||||||
|
# path = /home/pi/Public
|
||||||
|
# comment = Pi Share
|
||||||
|
# browseable = yes
|
||||||
|
# writeable = yes
|
||||||
|
# guest ok = no
|
||||||
|
# valid users = pi
|
||||||
|
|
||||||
|
# Set permissions
|
||||||
|
chmod 755 /home/pi
|
||||||
|
mkdir -p /home/pi/Public
|
||||||
|
chmod 777 /home/pi/Public
|
||||||
|
chown -R pi:pi /home/pi/Public
|
||||||
|
|
||||||
|
# Set Samba password for pi
|
||||||
|
sudo smbpasswd -a pi
|
||||||
|
|
||||||
|
# Restart Samba
|
||||||
|
sudo systemctl restart smbd
|
||||||
|
|
||||||
|
# === PULSEAUDIO SYSTEM-WIDE SERVICE ===
|
||||||
|
sudo nano /etc/systemd/system/pulseaudio.service
|
||||||
|
# Paste this content:
|
||||||
|
# [Unit]
|
||||||
|
# Description=PulseAudio System-wide Daemon
|
||||||
|
# After=sound.target network.target
|
||||||
|
#
|
||||||
|
# [Service]
|
||||||
|
# Type=simple
|
||||||
|
# ExecStart=/usr/bin/pulseaudio --system --disallow-exit --disallow-module-loading=0 --daemonize=no
|
||||||
|
# Restart=always
|
||||||
|
#
|
||||||
|
# [Install]
|
||||||
|
# WantedBy=multi-user.target
|
||||||
|
|
||||||
|
# === PULSEAUDIO MODULES FOR LEXICON LAMBDA USB ===
|
||||||
|
sudo nano /etc/pulse/system.pa
|
||||||
|
# Comment out:
|
||||||
|
# load-module module-udev-detect
|
||||||
|
# load-module module-detect
|
||||||
|
# Add this at the bottom:
|
||||||
|
# load-module module-alsa-sink device=hw:1,0 sink_name=LambdaOutput sink_properties=device.description="Lexicon_Lambda_USB_Output"
|
||||||
|
# load-module module-alsa-source device=hw:1,0 source_name=LambdaInput source_properties=device.description="Lexicon_Lambda_USB_Input"
|
||||||
|
# load-module module-native-protocol-unix auth-anonymous=1 socket=/tmp/pulseaudio.socket
|
||||||
|
|
||||||
|
# Set client default socket
|
||||||
|
sudo nano /etc/pulse/client.conf
|
||||||
|
# Add this line:
|
||||||
|
# default-server = unix:/tmp/pulseaudio.socket
|
||||||
|
|
||||||
|
# Enable and start PulseAudio system-wide
|
||||||
|
sudo systemctl daemon-reload
|
||||||
|
sudo systemctl enable pulseaudio.service
|
||||||
|
sudo systemctl restart pulseaudio.service
|
||||||
|
|
||||||
|
# === X11 & GUI FIXES FOR SSH/MOBAXTERM ===
|
||||||
|
sudo nano /etc/ssh/sshd_config
|
||||||
|
# Ensure these lines are present:
|
||||||
|
# X11Forwarding yes
|
||||||
|
# X11UseLocalhost no
|
||||||
|
# XAuthLocation /usr/bin/xauth
|
||||||
|
|
||||||
|
# Restart SSH
|
||||||
|
sudo systemctl restart ssh
|
||||||
|
|
||||||
|
# Ensure xauth is installed
|
||||||
|
sudo apt install -y xauth
|
||||||
|
|
||||||
|
# === BASHRC: MAKE GUI EXPORTS PERSISTENT ===
|
||||||
|
nano ~/.bashrc
|
||||||
|
# Add this at the end:
|
||||||
|
# export GDK_BACKEND=x11
|
||||||
|
# export LIBGL_ALWAYS_INDIRECT=1
|
||||||
|
# export NO_AT_BRIDGE=1
|
||||||
|
# export $(dbus-launch)
|
||||||
|
|
||||||
|
# Reload bashrc immediately
|
||||||
|
source ~/.bashrc
|
||||||
|
|
||||||
|
# === TESTING GUI ===
|
||||||
|
# (Reconnect via MobaXterm SSH with X11 forwarding enabled before running below)
|
||||||
|
|
||||||
|
# Run pavucontrol GUI
|
||||||
|
pavucontrol &
|
||||||
|
|
||||||
|
# Optional: Test GTK GUI rendering
|
||||||
|
gtk3-demo &
|
||||||
|
|
||||||
|
# Check audio devices
|
||||||
|
pactl list sinks short
|
||||||
|
pactl list sources short
|
||||||
+38
-34
@@ -25,6 +25,7 @@ class MusicModule(commands.Cog):
|
|||||||
name="krecimy_pornola",
|
name="krecimy_pornola",
|
||||||
description="Wiadomo co, dla kogo i po co",
|
description="Wiadomo co, dla kogo i po co",
|
||||||
)
|
)
|
||||||
|
@commands.has_any_role('Legenda', 'Jarl', 'Thane' , 'Bartender')
|
||||||
async def krecimy_pornola(self, ctx):
|
async def krecimy_pornola(self, ctx):
|
||||||
"""
|
"""
|
||||||
Download a music number from youtube.
|
Download a music number from youtube.
|
||||||
@@ -35,33 +36,28 @@ class MusicModule(commands.Cog):
|
|||||||
with the Discord API and
|
with the Discord API and
|
||||||
"""
|
"""
|
||||||
await ctx.send("Dej mnie chwilkę")
|
await ctx.send("Dej mnie chwilkę")
|
||||||
allowed = False
|
self.logger.info("Pornol")
|
||||||
for role in ctx.author.roles:
|
async with ctx.typing():
|
||||||
if role.name == "Bartender":
|
# wyciagnij linka z kontekstu
|
||||||
allowed = True
|
content = ctx.message.content.split()
|
||||||
if allowed:
|
for item_yt in content:
|
||||||
self.logger.info("Pornol")
|
if re.match("http.*", item_yt):
|
||||||
async with ctx.typing():
|
sciezka, files = await music_functions.get_file(
|
||||||
# wyciagnij linka z kontekstu
|
ctx, "Pornol", item_yt
|
||||||
content = ctx.message.content.split()
|
)
|
||||||
for item_yt in content:
|
if files:
|
||||||
if re.match("http.*", item_yt):
|
self.logger.info("Pornol udany")
|
||||||
sciezka, files = await music_functions.get_file(
|
await ctx.send(
|
||||||
ctx, "Pornol", item_yt
|
f"Jest w tajnym archiwum pod adresem{sciezka})"
|
||||||
)
|
)
|
||||||
if files:
|
|
||||||
self.logger.info("Pornol udany")
|
|
||||||
await ctx.send(
|
|
||||||
f"Jest w tajnym archiwum pod adresem{sciezka})"
|
|
||||||
)
|
|
||||||
else:
|
|
||||||
await ctx.reply("Jak ładnie szefa poprosisz.")
|
|
||||||
|
|
||||||
@commands.hybrid_command(
|
@commands.hybrid_command(
|
||||||
name="co_na_plejliscie_wariacie",
|
name="co_na_plejliscie_wariacie",
|
||||||
description="Wyswietl kawalki ktore sa na pocztku list radia",
|
description="Wyswietl kawalki ktore sa na pocztku list radia",
|
||||||
guild=discord.Object(id=664789470779932693),
|
guild=discord.Object(id=664789470779932693),
|
||||||
)
|
)
|
||||||
|
@commands.has_any_role('Nocna Zmiana', 'Jarl', 'Thane' , 'Bartender')
|
||||||
|
|
||||||
async def co_na_plejliscie_wariacie(self, ctx):
|
async def co_na_plejliscie_wariacie(self, ctx):
|
||||||
"""
|
"""
|
||||||
Download a music number from youtube.
|
Download a music number from youtube.
|
||||||
@@ -101,6 +97,7 @@ class MusicModule(commands.Cog):
|
|||||||
description="Podaj link do youtube - sciagnie i doda muzyke",
|
description="Podaj link do youtube - sciagnie i doda muzyke",
|
||||||
guild=discord.Object(id=664789470779932693),
|
guild=discord.Object(id=664789470779932693),
|
||||||
)
|
)
|
||||||
|
@commands.has_any_role('Nocna Zmiana', 'Jarl', 'Thane' , 'Bartender')
|
||||||
async def dej_co_z_jutuba(self, ctx):
|
async def dej_co_z_jutuba(self, ctx):
|
||||||
"""
|
"""
|
||||||
Download a music number from youtube.
|
Download a music number from youtube.
|
||||||
@@ -132,6 +129,7 @@ class MusicModule(commands.Cog):
|
|||||||
description="Podaj link do spotify - sciagnie i doda muzyke",
|
description="Podaj link do spotify - sciagnie i doda muzyke",
|
||||||
guild=discord.Object(id=664789470779932693),
|
guild=discord.Object(id=664789470779932693),
|
||||||
)
|
)
|
||||||
|
@commands.has_any_role('Nocna Zmiana', 'Jarl', 'Thane' , 'Bartender')
|
||||||
async def dej_co_ze_spotifaja(self, ctx):
|
async def dej_co_ze_spotifaja(self, ctx):
|
||||||
"""
|
"""
|
||||||
Get a playlist or a music number from Spotify.
|
Get a playlist or a music number from Spotify.
|
||||||
@@ -187,6 +185,7 @@ class MusicModule(commands.Cog):
|
|||||||
description="Wyłącza muzykę i czyści plejliste.",
|
description="Wyłącza muzykę i czyści plejliste.",
|
||||||
guild=discord.Object(id=664789470779932693),
|
guild=discord.Object(id=664789470779932693),
|
||||||
)
|
)
|
||||||
|
@commands.has_any_role('Nocna Zmiana', 'Jarl', 'Thane' , 'Bartender')
|
||||||
async def cisza(self, ctx):
|
async def cisza(self, ctx):
|
||||||
"""
|
"""
|
||||||
Stop playback of the music and clear the queue.
|
Stop playback of the music and clear the queue.
|
||||||
@@ -213,6 +212,7 @@ class MusicModule(commands.Cog):
|
|||||||
description="Przerzuca na następny kawałek",
|
description="Przerzuca na następny kawałek",
|
||||||
guild=discord.Object(id=664789470779932693),
|
guild=discord.Object(id=664789470779932693),
|
||||||
)
|
)
|
||||||
|
@commands.has_any_role('Nocna Zmiana', 'Jarl', 'Thane' , 'Bartender')
|
||||||
async def dalej(self, ctx):
|
async def dalej(self, ctx):
|
||||||
"""
|
"""
|
||||||
Play next track in queue.
|
Play next track in queue.
|
||||||
@@ -230,12 +230,12 @@ class MusicModule(commands.Cog):
|
|||||||
voice_client.stop()
|
voice_client.stop()
|
||||||
self.logger.info("Next completed")
|
self.logger.info("Next completed")
|
||||||
|
|
||||||
# TODO: MUSIC
|
|
||||||
@commands.hybrid_command(
|
@commands.hybrid_command(
|
||||||
name="daj_mi_chwile",
|
name="daj_mi_chwile",
|
||||||
description="Pauzuje",
|
description="Pauzuje",
|
||||||
guild=discord.Object(id=664789470779932693),
|
guild=discord.Object(id=664789470779932693),
|
||||||
)
|
)
|
||||||
|
@commands.has_any_role('Nocna Zmiana', 'Jarl', 'Thane' , 'Bartender')
|
||||||
async def daj_mi_chwile(self, ctx):
|
async def daj_mi_chwile(self, ctx):
|
||||||
"""
|
"""
|
||||||
Pause music playback.
|
Pause music playback.
|
||||||
@@ -254,12 +254,12 @@ class MusicModule(commands.Cog):
|
|||||||
voice_client.pause()
|
voice_client.pause()
|
||||||
self.logger.info("Pause completed")
|
self.logger.info("Pause completed")
|
||||||
|
|
||||||
# TODO: MUSIC
|
|
||||||
@commands.hybrid_command(
|
@commands.hybrid_command(
|
||||||
name="graj_dalej",
|
name="graj_dalej",
|
||||||
description="Odpauzowuje",
|
description="Odpauzowuje",
|
||||||
guild=discord.Object(id=664789470779932693),
|
guild=discord.Object(id=664789470779932693),
|
||||||
)
|
)
|
||||||
|
@commands.has_any_role('Nocna Zmiana', 'Jarl', 'Thane' , 'Bartender')
|
||||||
async def graj_dalej(self, ctx):
|
async def graj_dalej(self, ctx):
|
||||||
"""
|
"""
|
||||||
Unpause music and continue playback.
|
Unpause music and continue playback.
|
||||||
@@ -277,12 +277,12 @@ class MusicModule(commands.Cog):
|
|||||||
voice_client.resume()
|
voice_client.resume()
|
||||||
self.logger.info("Unpause completed")
|
self.logger.info("Unpause completed")
|
||||||
|
|
||||||
# TODO: MUSIC
|
|
||||||
@commands.hybrid_command(
|
@commands.hybrid_command(
|
||||||
name="zagraj_mi_kawalek",
|
name="zagraj_mi_kawalek",
|
||||||
description="Wyszukuje w bibliotece muzycznej Hammera kawałek który ma zostać zagrany",
|
description="Wyszukuje w bibliotece muzycznej Hammera kawałek który ma zostać zagrany",
|
||||||
guild=discord.Object(id=664789470779932693),
|
guild=discord.Object(id=664789470779932693),
|
||||||
)
|
)
|
||||||
|
@commands.has_any_role('Nocna Zmiana', 'Jarl', 'Thane' , 'Bartender')
|
||||||
async def zagraj_mi_kawalek(self, ctx):
|
async def zagraj_mi_kawalek(self, ctx):
|
||||||
"""
|
"""
|
||||||
Play a song or music piece in response to a command
|
Play a song or music piece in response to a command
|
||||||
@@ -327,12 +327,12 @@ class MusicModule(commands.Cog):
|
|||||||
"Obawiam się że nie mogę nic znaleźć u siebie. Spróbuj komendy '$dej_co_ze_spotifaja' jeśli masz link"
|
"Obawiam się że nie mogę nic znaleźć u siebie. Spróbuj komendy '$dej_co_ze_spotifaja' jeśli masz link"
|
||||||
)
|
)
|
||||||
|
|
||||||
# TODO: MUSIC
|
|
||||||
@commands.hybrid_command(
|
@commands.hybrid_command(
|
||||||
name="zrob_mi_plejliste",
|
name="zrob_mi_plejliste",
|
||||||
description="Generuje playliste - param1 - dlugosc, potem slowa wyszukiwania",
|
description="Generuje playliste - param1 - dlugosc, potem slowa wyszukiwania",
|
||||||
guild=discord.Object(id=664789470779932693),
|
guild=discord.Object(id=664789470779932693),
|
||||||
)
|
)
|
||||||
|
@commands.has_any_role('Nocna Zmiana', 'Jarl', 'Thane' , 'Bartender')
|
||||||
async def zrob_mi_plejliste(self, ctx):
|
async def zrob_mi_plejliste(self, ctx):
|
||||||
"""
|
"""
|
||||||
Generate a playlist in queue. First word in this command shall be int defining length of the playlist.
|
Generate a playlist in queue. First word in this command shall be int defining length of the playlist.
|
||||||
@@ -394,12 +394,12 @@ class MusicModule(commands.Cog):
|
|||||||
await ctx.send(reply)
|
await ctx.send(reply)
|
||||||
self.logger.info("Plejlista zrobiona")
|
self.logger.info("Plejlista zrobiona")
|
||||||
|
|
||||||
# TODO: MUSIC
|
|
||||||
@commands.hybrid_command(
|
@commands.hybrid_command(
|
||||||
name="zagraj_muzyke_mego_ludu",
|
name="zagraj_muzyke_mego_ludu",
|
||||||
description="Gra muzyke wyszukana na bazie tematow konwersacji na kanale NZ",
|
description="Gra muzyke wyszukana na bazie tematow konwersacji na kanale NZ",
|
||||||
guild=discord.Object(id=664789470779932693),
|
guild=discord.Object(id=664789470779932693),
|
||||||
)
|
)
|
||||||
|
@commands.has_any_role('Nocna Zmiana', 'Jarl', 'Thane' , 'Bartender')
|
||||||
async def zagraj_muzyke_mego_ludu(self, ctx):
|
async def zagraj_muzyke_mego_ludu(self, ctx):
|
||||||
"""
|
"""
|
||||||
Play completeley random playlist based on messaging history.
|
Play completeley random playlist based on messaging history.
|
||||||
@@ -480,12 +480,12 @@ class MusicModule(commands.Cog):
|
|||||||
await ctx.send(reply)
|
await ctx.send(reply)
|
||||||
self.logger.info("Plejlista zrobiona")
|
self.logger.info("Plejlista zrobiona")
|
||||||
|
|
||||||
# TODO: MUSIC
|
|
||||||
@commands.hybrid_command(
|
@commands.hybrid_command(
|
||||||
name="parametry_muzyki_mego_ludu",
|
name="parametry_muzyki_mego_ludu",
|
||||||
description="Konfiguruje komende zagraj muzyke mojego ludu",
|
description="Konfiguruje komende zagraj muzyke mojego ludu",
|
||||||
guild=discord.Object(id=664789470779932693),
|
guild=discord.Object(id=664789470779932693),
|
||||||
)
|
)
|
||||||
|
@commands.has_any_role('Nocna Zmiana', 'Jarl', 'Thane' , 'Bartender')
|
||||||
async def parametry_muzyki_mego_ludu(
|
async def parametry_muzyki_mego_ludu(
|
||||||
self, ctx, ile_historii=1500, ile_slow_kluczowych=15, jak_dluga_plejlista=30
|
self, ctx, ile_historii=1500, ile_slow_kluczowych=15, jak_dluga_plejlista=30
|
||||||
):
|
):
|
||||||
@@ -547,6 +547,7 @@ class MusicModule(commands.Cog):
|
|||||||
description="Włącza muzykę na kanale #nocna-zmiana.",
|
description="Włącza muzykę na kanale #nocna-zmiana.",
|
||||||
guild=discord.Object(id=664789470779932693),
|
guild=discord.Object(id=664789470779932693),
|
||||||
)
|
)
|
||||||
|
@commands.has_any_role('Nocna Zmiana', 'Jarl', 'Thane' , 'Bartender')
|
||||||
async def graj_muzyko(self, ctx):
|
async def graj_muzyko(self, ctx):
|
||||||
"""
|
"""
|
||||||
Async function named "graj_muzyko" starts music playback on channel "Nocna Zmiana".
|
Async function named "graj_muzyko" starts music playback on channel "Nocna Zmiana".
|
||||||
@@ -603,9 +604,10 @@ class MusicModule(commands.Cog):
|
|||||||
description="Zaciąga obiekty z pliku",
|
description="Zaciąga obiekty z pliku",
|
||||||
guild=discord.Object(id=664789470779932693),
|
guild=discord.Object(id=664789470779932693),
|
||||||
)
|
)
|
||||||
|
@commands.has_any_role('Legenda', 'Jarl', 'Thane' , 'Bartender')
|
||||||
async def batch_download(self, ctx):
|
async def batch_download(self, ctx):
|
||||||
content_type = ctx.message.attachments[0].content_type
|
content_type = ctx.message.attachments[0].content_type
|
||||||
check = re.search ("text\/plain; *charset=(.*)", content_type, re.IGNORECASE)
|
check = re.search("text\/plain; *charset=(.*)", content_type, re.IGNORECASE)
|
||||||
await ctx.reply("Kurwa. Aleś mi roboty narobił... No nic. Ku radości. Skal!")
|
await ctx.reply("Kurwa. Aleś mi roboty narobił... No nic. Ku radości. Skal!")
|
||||||
async with ctx.typing():
|
async with ctx.typing():
|
||||||
if check:
|
if check:
|
||||||
@@ -619,16 +621,20 @@ class MusicModule(commands.Cog):
|
|||||||
self.logger.info(link)
|
self.logger.info(link)
|
||||||
pat = r"^https?:\/\/(?:www\.)?[-a-zA-Z0-9@:%._\+~#=]{1,256}\.[a-zA-Z0-9()]{1,6}\b(?:[-a-zA-Z0-9()@:%_\+.~#?&\/=]*)$"
|
pat = r"^https?:\/\/(?:www\.)?[-a-zA-Z0-9@:%._\+~#=]{1,256}\.[a-zA-Z0-9()]{1,6}\b(?:[-a-zA-Z0-9()@:%_\+.~#?&\/=]*)$"
|
||||||
self.logger.info("Verification")
|
self.logger.info("Verification")
|
||||||
if re.match(pat, link) and (re.match(".*youtube.*", link) or re.match(".*youtu.be.*", link)):
|
if re.match(pat, link) and (
|
||||||
|
re.match(".*youtube.*", link) or re.match(".*youtu.be.*", link)
|
||||||
|
):
|
||||||
self.logger.info("%s to link do jutuba", link)
|
self.logger.info("%s to link do jutuba", link)
|
||||||
dir_path, files = await music_functions.get_file(
|
dir_path, files = await music_functions.get_file(
|
||||||
ctx, "Youtube", link
|
ctx, "Youtube", link
|
||||||
)
|
)
|
||||||
if files:
|
if files:
|
||||||
for file_iter in files:
|
for file_iter in files:
|
||||||
global MUZYKA # pylint: disable=global-variable-not-assigned
|
global MUZYKA # pylint: disable=global-variable-not-assigned
|
||||||
MUZYKA["queue"].insert(0, file_iter)
|
MUZYKA["queue"].insert(0, file_iter)
|
||||||
music_functions.MUSIC_FILE_LIST.update_file_list(file_iter)
|
music_functions.MUSIC_FILE_LIST.update_file_list(
|
||||||
|
file_iter
|
||||||
|
)
|
||||||
MUZYKA["requester"].insert(0, ctx.author)
|
MUZYKA["requester"].insert(0, ctx.author)
|
||||||
await ctx.send(f"Dodałem do listy {file_iter}")
|
await ctx.send(f"Dodałem do listy {file_iter}")
|
||||||
self.logger.info("Jutub udany")
|
self.logger.info("Jutub udany")
|
||||||
@@ -668,10 +674,9 @@ class MusicModule(commands.Cog):
|
|||||||
)
|
)
|
||||||
self.logger.info("Spotifaj udany")
|
self.logger.info("Spotifaj udany")
|
||||||
|
|
||||||
|
|
||||||
elif re.match(pat, link):
|
elif re.match(pat, link):
|
||||||
self.logger.info("%s to link do czegos", link)
|
self.logger.info("%s to link do czegos", link)
|
||||||
sciezka,files = await music_functions.get_file(
|
sciezka, files = await music_functions.get_file(
|
||||||
ctx, "Pornol", link
|
ctx, "Pornol", link
|
||||||
)
|
)
|
||||||
if files:
|
if files:
|
||||||
@@ -689,7 +694,6 @@ class MusicModule(commands.Cog):
|
|||||||
self.logger.info("Spierdalaj")
|
self.logger.info("Spierdalaj")
|
||||||
await ctx.message.reply("Spierdalaj")
|
await ctx.message.reply("Spierdalaj")
|
||||||
|
|
||||||
|
|
||||||
async def disconnect(self, ctx):
|
async def disconnect(self, ctx):
|
||||||
"""
|
"""
|
||||||
Asynchronous Python function that disconnects the voice client if it is connected and
|
Asynchronous Python function that disconnects the voice client if it is connected and
|
||||||
@@ -799,7 +803,7 @@ class MusicModule(commands.Cog):
|
|||||||
|
|
||||||
async def setup(bot):
|
async def setup(bot):
|
||||||
logger = logging.getLogger("discord")
|
logger = logging.getLogger("discord")
|
||||||
music_functions.MUSIC_FILE_LIST.refresh_file_list()
|
await music_functions.MUSIC_FILE_LIST.refresh_file_list(bot)
|
||||||
logger.info("Playlist generation")
|
logger.info("Playlist generation")
|
||||||
await bot.add_cog(MusicModule(bot, "discord"))
|
await bot.add_cog(MusicModule(bot, "discord"))
|
||||||
logger.info("Loading music commands module done")
|
logger.info("Loading music commands module done")
|
||||||
|
|||||||
+41
-9
@@ -5,6 +5,7 @@ import uuid
|
|||||||
from pathlib import Path, PurePath
|
from pathlib import Path, PurePath
|
||||||
from sys import platform
|
from sys import platform
|
||||||
|
|
||||||
|
import discord
|
||||||
import requests
|
import requests
|
||||||
|
|
||||||
import yt_dlp
|
import yt_dlp
|
||||||
@@ -15,11 +16,11 @@ from constants import (
|
|||||||
MUSIC_FOLDER,
|
MUSIC_FOLDER,
|
||||||
SEND_MP3,
|
SEND_MP3,
|
||||||
SPOTIFY_CTRL,
|
SPOTIFY_CTRL,
|
||||||
|
YOUTUBE_AUTH,
|
||||||
)
|
)
|
||||||
from spotify_dl import spotify
|
from spotify_dl import spotify
|
||||||
from spotify_dl import youtube as youtube_download
|
from spotify_dl import youtube as youtube_download
|
||||||
|
|
||||||
logger = logging.getLogger("discord")
|
|
||||||
|
|
||||||
|
|
||||||
class MusicFileList(object):
|
class MusicFileList(object):
|
||||||
@@ -28,13 +29,14 @@ class MusicFileList(object):
|
|||||||
file service or local directory and update the list with new items.
|
file service or local directory and update the list with new items.
|
||||||
"""
|
"""
|
||||||
|
|
||||||
def __init__(self, uplogger) -> None:
|
def __init__(self, logger_name) -> None:
|
||||||
self.music_file_list = []
|
self.music_file_list = []
|
||||||
self.file_service_active = False
|
self.file_service_active = False
|
||||||
self.logger = uplogger
|
self.logger = logging.getLogger("discord")
|
||||||
|
|
||||||
self.logger.info("Created Playlist organizer class")
|
self.logger.info("Created Playlist organizer class")
|
||||||
|
|
||||||
def refresh_file_list(self):
|
async def refresh_file_list(self, bot):
|
||||||
"""
|
"""
|
||||||
The `refresh_file_list` function attempts to connect to a file service to retrieve a list of music
|
The `refresh_file_list` function attempts to connect to a file service to retrieve a list of music
|
||||||
files, and if unsuccessful, it populates the list by scanning a local directory for .mp3 files.
|
files, and if unsuccessful, it populates the list by scanning a local directory for .mp3 files.
|
||||||
@@ -50,9 +52,33 @@ class MusicFileList(object):
|
|||||||
if platform == "win32":
|
if platform == "win32":
|
||||||
temp_music_file = temp_music_file.replace("/", "\\")
|
temp_music_file = temp_music_file.replace("/", "\\")
|
||||||
self.music_file_list.append(temp_music_file)
|
self.music_file_list.append(temp_music_file)
|
||||||
self.file_service_active = False
|
self.file_service_active = False
|
||||||
self.logger.error(e.strerror)
|
self.logger.error(e.strerror)
|
||||||
self.logger.error("Service Unavailable")
|
self.logger.error("Service Unavailable")
|
||||||
|
finally:
|
||||||
|
if self.file_service_active:
|
||||||
|
self.logger.info("Radio Status: Probably Active")
|
||||||
|
status = discord.Status.online
|
||||||
|
# radio_hardkor = discord.Activity(
|
||||||
|
# name = "Radio Hammer/Radio Conjurer/Wolne Bałuity Kurwa",
|
||||||
|
# url = "http://95.175.16.246:666/mp3-stream",
|
||||||
|
# type = discord.ActivityType.streaming,
|
||||||
|
# platform = "Liquidsoap+RaspberyPi+RolandSeratoDJ202",
|
||||||
|
# state = "Where the f*** is the DJ booth?",
|
||||||
|
# details= "This Is Radio Hardkor based in Wolne Księstwo Bałuty, the best pirate radiostation on both sides of Łódka river",
|
||||||
|
# buttons= [{"label":"RADIO", "url":"http://95.175.16.246:666/mp3-stream"}],
|
||||||
|
# assets= {"large_image": "fuckery.jpg", "large_text":"Fuckewry", "small_image":"willowisp.png", "small_text":"Hi!"}
|
||||||
|
# )
|
||||||
|
radio_hardkor = discord.Streaming(
|
||||||
|
name="Radio Hardkor", url="http://95.175.16.246:666/mp3-stream"
|
||||||
|
)
|
||||||
|
await bot.change_presence(status=status, activity=radio_hardkor)
|
||||||
|
|
||||||
|
else:
|
||||||
|
self.logger.info("Radio Status: Rather Unknown")
|
||||||
|
await bot.change_presence(
|
||||||
|
activity=discord.Game(name="Axe Throwing Darts")
|
||||||
|
)
|
||||||
|
|
||||||
def get_file_list(self):
|
def get_file_list(self):
|
||||||
"""
|
"""
|
||||||
@@ -75,7 +101,7 @@ class MusicFileList(object):
|
|||||||
requests.post(f"{FILE_SERVICE_ADDRESS}{SEND_MP3}", json=post_data, timeout=360)
|
requests.post(f"{FILE_SERVICE_ADDRESS}{SEND_MP3}", json=post_data, timeout=360)
|
||||||
|
|
||||||
|
|
||||||
MUSIC_FILE_LIST = MusicFileList(logger)
|
MUSIC_FILE_LIST = MusicFileList("discord")
|
||||||
|
|
||||||
|
|
||||||
async def get_file(ctx, source, link):
|
async def get_file(ctx, source, link):
|
||||||
@@ -93,6 +119,7 @@ async def get_file(ctx, source, link):
|
|||||||
:param link: The "link" parameter is likely a string that represents a URL or file path to the
|
:param link: The "link" parameter is likely a string that represents a URL or file path to the
|
||||||
location of the file that the function is trying to retrieve
|
location of the file that the function is trying to retrieve
|
||||||
"""
|
"""
|
||||||
|
logger = logging.getLogger("discord")
|
||||||
item_id = None
|
item_id = None
|
||||||
item_type = None
|
item_type = None
|
||||||
file_list = []
|
file_list = []
|
||||||
@@ -135,6 +162,7 @@ async def get_file(ctx, source, link):
|
|||||||
file_name_f=file_name_f,
|
file_name_f=file_name_f,
|
||||||
multi_core=0,
|
multi_core=0,
|
||||||
proxy="",
|
proxy="",
|
||||||
|
YT_AUTH = YOUTUBE_AUTH
|
||||||
)
|
)
|
||||||
_ = await coro
|
_ = await coro
|
||||||
logger.info("YT-DL done")
|
logger.info("YT-DL done")
|
||||||
@@ -150,10 +178,11 @@ async def get_file(ctx, source, link):
|
|||||||
elif source == "Youtube":
|
elif source == "Youtube":
|
||||||
link_ok = False
|
link_ok = False
|
||||||
pat = r"^https?:\/\/(?:www\.)?[-a-zA-Z0-9@:%._\+~#=]{1,256}\.[a-zA-Z0-9()]{1,6}\b(?:[-a-zA-Z0-9()@:%_\+.~#?&\/=]*)$"
|
pat = r"^https?:\/\/(?:www\.)?[-a-zA-Z0-9@:%._\+~#=]{1,256}\.[a-zA-Z0-9()]{1,6}\b(?:[-a-zA-Z0-9()@:%_\+.~#?&\/=]*)$"
|
||||||
if re.match(pat, link) and (re.match(".*youtube.*", link) or re.match(".*youtu.be.*", link)):
|
if re.match(pat, link) and (
|
||||||
|
re.match(".*youtube.*", link) or re.match(".*youtu.be.*", link)
|
||||||
|
):
|
||||||
link_ok = True
|
link_ok = True
|
||||||
|
|
||||||
|
|
||||||
if link_ok:
|
if link_ok:
|
||||||
dir_path = ""
|
dir_path = ""
|
||||||
file_list = []
|
file_list = []
|
||||||
@@ -176,6 +205,8 @@ async def get_file(ctx, source, link):
|
|||||||
else:
|
else:
|
||||||
dir_path = "/home/pi/RetroPie/mp3/Youtube"
|
dir_path = "/home/pi/RetroPie/mp3/Youtube"
|
||||||
ydl_opts = {
|
ydl_opts = {
|
||||||
|
"username": YOUTUBE_AUTH[0],
|
||||||
|
"password": YOUTUBE_AUTH[1],
|
||||||
"proxy": "",
|
"proxy": "",
|
||||||
"default_search": "ytsearch",
|
"default_search": "ytsearch",
|
||||||
"format": "bestaudio/best",
|
"format": "bestaudio/best",
|
||||||
@@ -231,7 +262,7 @@ async def get_file(ctx, source, link):
|
|||||||
]
|
]
|
||||||
# TODO: Make sponsorblock work
|
# TODO: Make sponsorblock work
|
||||||
sponsorblock_postprocessor = []
|
sponsorblock_postprocessor = []
|
||||||
dir_path = "/home/pi/RetroPie/movies/porn"
|
dir_path = "/home/pi/MediaShare/movies/porn"
|
||||||
ydl_opts = {
|
ydl_opts = {
|
||||||
"postprocessors": sponsorblock_postprocessor,
|
"postprocessors": sponsorblock_postprocessor,
|
||||||
"paths": {"home": dir_path},
|
"paths": {"home": dir_path},
|
||||||
@@ -262,6 +293,7 @@ async def search_music(ctx, how_many=0, slowa_kluczowe=None):
|
|||||||
how_many, the function will return all search results, defaults to 0 (optional)
|
how_many, the function will return all search results, defaults to 0 (optional)
|
||||||
"""
|
"""
|
||||||
# i sieć neuronową z możliwością wyrażenia opinii o dopasowaniu.
|
# i sieć neuronową z możliwością wyrażenia opinii o dopasowaniu.
|
||||||
|
logger = logging.getLogger("discord")
|
||||||
if slowa_kluczowe:
|
if slowa_kluczowe:
|
||||||
word_list = slowa_kluczowe
|
word_list = slowa_kluczowe
|
||||||
else:
|
else:
|
||||||
|
|||||||
+22
-1
@@ -20,6 +20,7 @@ class OtherModule(commands.Cog):
|
|||||||
@commands.hybrid_command(
|
@commands.hybrid_command(
|
||||||
name="przytul", description="Przytul kogoś - daj mention po komendzie :)"
|
name="przytul", description="Przytul kogoś - daj mention po komendzie :)"
|
||||||
)
|
)
|
||||||
|
@commands.has_any_role('Nocna Zmiana', 'Jarl', 'Thane' , 'Bartender')
|
||||||
async def przytul(self, ctx, arg: Optional[discord.Member] = None):
|
async def przytul(self, ctx, arg: Optional[discord.Member] = None):
|
||||||
"""
|
"""
|
||||||
Generate a text about hugging mentioned user.
|
Generate a text about hugging mentioned user.
|
||||||
@@ -53,6 +54,7 @@ class OtherModule(commands.Cog):
|
|||||||
)
|
)
|
||||||
|
|
||||||
@commands.hybrid_command(name="fabryczka", description="Historia fabryczki")
|
@commands.hybrid_command(name="fabryczka", description="Historia fabryczki")
|
||||||
|
@commands.has_any_role('Legenda', 'Jarl', 'Thane' , 'Bartender')
|
||||||
async def fabryczka(self, ctx):
|
async def fabryczka(self, ctx):
|
||||||
"""
|
"""
|
||||||
Send a general description of "fabryczkagate" to channel.
|
Send a general description of "fabryczkagate" to channel.
|
||||||
@@ -64,11 +66,28 @@ class OtherModule(commands.Cog):
|
|||||||
"""
|
"""
|
||||||
await ctx.send(historia_fabryczki)
|
await ctx.send(historia_fabryczki)
|
||||||
|
|
||||||
|
@commands.hybrid_command(
|
||||||
|
name="set_logging_level",
|
||||||
|
description="Nie intererer bo kici kici",
|
||||||
|
guild=discord.Object(id=664789470779932693),
|
||||||
|
)
|
||||||
|
@commands.has_any_role('Legenda', 'Jarl', 'Bartender')
|
||||||
|
async def set_logging_level(self,ctx):
|
||||||
|
if "DEBUG" in ctx.message.content:
|
||||||
|
logger = logging.getLogger("discord")
|
||||||
|
logger.setLevel(logging.DEBUG)
|
||||||
|
elif "INFO" in ctx.message.content:
|
||||||
|
logger = logging.getLogger("discord")
|
||||||
|
logger.setLevel(logging.INFO)
|
||||||
|
else:
|
||||||
|
await ctx.send("Weź się kurwa zdecyduj co ?")
|
||||||
|
|
||||||
@commands.hybrid_command(
|
@commands.hybrid_command(
|
||||||
name="reset_the_clock",
|
name="reset_the_clock",
|
||||||
description="Resetowanie zegara - dostępne wyłącznie dla Hammera",
|
description="Resetowanie zegara - dostępne wyłącznie dla Hammera",
|
||||||
guild=discord.Object(id=664789470779932693),
|
guild=discord.Object(id=664789470779932693),
|
||||||
)
|
)
|
||||||
|
@commands.has_any_role('Legenda', 'Jarl', 'Thane' , 'Bartender')
|
||||||
async def reset_the_clock(self, ctx):
|
async def reset_the_clock(self, ctx):
|
||||||
"""
|
"""
|
||||||
Reset the clock on "accidents" in Hammer Fortress adding a new one.
|
Reset the clock on "accidents" in Hammer Fortress adding a new one.
|
||||||
@@ -105,6 +124,7 @@ class OtherModule(commands.Cog):
|
|||||||
name="chata_hammera",
|
name="chata_hammera",
|
||||||
description="Czas od ostatniego incydentu w AbsinthHammerTimeSpaceContinuum",
|
description="Czas od ostatniego incydentu w AbsinthHammerTimeSpaceContinuum",
|
||||||
)
|
)
|
||||||
|
@commands.has_any_role('Nocna Zmiana', 'Jarl', 'Thane' , 'Bartender')
|
||||||
async def chata_hammera(self, ctx):
|
async def chata_hammera(self, ctx):
|
||||||
"""
|
"""
|
||||||
Send measured time from last incident in Hammer Fortress to the chat.
|
Send measured time from last incident in Hammer Fortress to the chat.
|
||||||
@@ -127,6 +147,7 @@ class OtherModule(commands.Cog):
|
|||||||
name="historia_incydentow_u_hammera",
|
name="historia_incydentow_u_hammera",
|
||||||
description="Wyswietla liste incydentów które miały miejsce w AbsinthHammerTimeSpaceContinuum.",
|
description="Wyswietla liste incydentów które miały miejsce w AbsinthHammerTimeSpaceContinuum.",
|
||||||
)
|
)
|
||||||
|
@commands.has_any_role('Nocna Zmiana', 'Jarl', 'Thane' , 'Bartender')
|
||||||
async def historia_incydentow_u_hammera(self, ctx):
|
async def historia_incydentow_u_hammera(self, ctx):
|
||||||
"""
|
"""
|
||||||
Send a list of incidents in Hammer Fortress to the chat.
|
Send a list of incidents in Hammer Fortress to the chat.
|
||||||
@@ -149,12 +170,12 @@ class OtherModule(commands.Cog):
|
|||||||
index += 1
|
index += 1
|
||||||
await ctx.send(return_data)
|
await ctx.send(return_data)
|
||||||
|
|
||||||
# TODO: RADIO
|
|
||||||
@commands.hybrid_command(
|
@commands.hybrid_command(
|
||||||
name="radio_hardkor",
|
name="radio_hardkor",
|
||||||
description="Włącza radio Conjurer na kanale #nocna-zmiana.",
|
description="Włącza radio Conjurer na kanale #nocna-zmiana.",
|
||||||
guild=discord.Object(id=664789470779932693),
|
guild=discord.Object(id=664789470779932693),
|
||||||
)
|
)
|
||||||
|
@commands.has_any_role('Nocna Zmiana', 'Jarl', 'Thane' , 'Bartender')
|
||||||
async def radio_hardkor(self, ctx):
|
async def radio_hardkor(self, ctx):
|
||||||
"""
|
"""
|
||||||
Plays the radio hardkor stream in the voice channel.
|
Plays the radio hardkor stream in the voice channel.
|
||||||
|
|||||||
+32
-2
@@ -1,4 +1,6 @@
|
|||||||
|
import logging
|
||||||
# define an asynchronous generator
|
# define an asynchronous generator
|
||||||
|
|
||||||
async def async_iterator_generator(range_of_iterable):
|
async def async_iterator_generator(range_of_iterable):
|
||||||
"""
|
"""
|
||||||
Generate asynchronouse iterator.
|
Generate asynchronouse iterator.
|
||||||
@@ -26,7 +28,6 @@ async def async_iterator_generator(range_of_iterable):
|
|||||||
"""
|
"""
|
||||||
|
|
||||||
|
|
||||||
# TODO: OTHER
|
|
||||||
async def remove_characters(string, character):
|
async def remove_characters(string, character):
|
||||||
"""
|
"""
|
||||||
The `remove_characters` function removes all occurrences of a specified character from a given
|
The `remove_characters` function removes all occurrences of a specified character from a given
|
||||||
@@ -39,7 +40,6 @@ async def remove_characters(string, character):
|
|||||||
return string.replace(character, "")
|
return string.replace(character, "")
|
||||||
|
|
||||||
|
|
||||||
# TODO: OTHER
|
|
||||||
async def max_weight(lista):
|
async def max_weight(lista):
|
||||||
"""
|
"""
|
||||||
Take a list of weights and return the maximum weight.
|
Take a list of weights and return the maximum weight.
|
||||||
@@ -86,3 +86,33 @@ async def get_stats(client, ctx, history_limit):
|
|||||||
stats[word] = 1
|
stats[word] = 1
|
||||||
for name, how_many in stats.items():
|
for name, how_many in stats.items():
|
||||||
yield name, how_many
|
yield name, how_many
|
||||||
|
|
||||||
|
async def discord_friendly_reply(ctx, message_content, file=None):
|
||||||
|
logger = logging.getLogger("discord")
|
||||||
|
|
||||||
|
if len(message_content) < 999:
|
||||||
|
logger.info("Answer reply - message below 999")
|
||||||
|
await ctx.reply(message_content)
|
||||||
|
else:
|
||||||
|
logger.info("Answer reply - message above 999")
|
||||||
|
while len(message_content) > 0:
|
||||||
|
logger.info("Mesaage content: %s", message_content[:999])
|
||||||
|
await ctx.reply(message_content[:999])
|
||||||
|
message_content = message_content[999:]
|
||||||
|
if file:
|
||||||
|
await ctx.reply("Attachment:", file=file)
|
||||||
|
|
||||||
|
async def discord_friendly_send(ctx, message_content, file=None):
|
||||||
|
logger = logging.getLogger("discord")
|
||||||
|
|
||||||
|
if len(message_content) < 999:
|
||||||
|
logger.info("Answer send - message below 999")
|
||||||
|
await ctx.send(message_content)
|
||||||
|
else:
|
||||||
|
logger.info("Answer send - message above 999")
|
||||||
|
while len(message_content) > 0:
|
||||||
|
logger.info("Mesaage content: %s", message_content[:999])
|
||||||
|
await ctx.send(message_content[:999])
|
||||||
|
message_content = message_content[999:]
|
||||||
|
if file:
|
||||||
|
await ctx.reply("Attachment:", file=file)
|
||||||
|
|||||||
@@ -0,0 +1,20 @@
|
|||||||
|
|
||||||
|
/home/pi/RetroPie/mp3/Muzyka/2011/Hallman/Hallman - 7 Bram/Niezłomność/Twardzi jak Stal/03-Forteca-1942.mp3
|
||||||
|
/home/pi/RetroPie/mp3/Muzyka/2012/Głos Patriotów (2011) (Wirrrus)/09. Świty Zmartwychwstania.mp3
|
||||||
|
/home/pi/RetroPie/mp3/Muzyka/2011/Horytnica Czas Patriotów/Horytnica - Promo track CD 2011 Nie musimy umiera.mp3
|
||||||
|
/home/pi/RetroPie/mp3/Muzyka/2011/muza patriotyczna/08-Schmaletz-REWOLUCYJNA_NSZ(1).mp3
|
||||||
|
/home/pi/RetroPie/mp3/Muzyka/2011/muza patriotyczna/schmaletz_-_nie_ma_fajnych_lasek_na_prawicy.mp3
|
||||||
|
/home/pi/RetroPie/mp3/Youtube/ADU - Lecimy ze Smoleńska z powrotem [f3CVfG4pV8M].mp3
|
||||||
|
/home/pi/RetroPie/mp3/2022 Nov-Dec/Anahata - Winged Hussars - Cover.m4a
|
||||||
|
/home/pi/RetroPie/mp3/2022 Nov-Dec/Sabaton - 40#1 - Live, at Woodstock Festival.m4a
|
||||||
|
/home/pi/RetroPie/mp3/2022 Nov-Dec/Sabaton - Uprising - Live, at Woodstock Festival.m4a
|
||||||
|
/home/pi/RetroPie/mp3/2022 Nov-Dec/Sabaton - Inmate 4859.m4a
|
||||||
|
/home/pi/RetroPie/mp3/2022 Nov-Dec/Sabaton - Winged Hussars.m4a
|
||||||
|
/home/pi/RetroPie/mp3/Youtube/ADU Ada Karczmarczyk - Hej husarzu! ⧸ NIE_PODLE_głości dzień [SReTynvd6ek].mp3
|
||||||
|
/home/pi/RetroPie/mp3/2023 Aug-Oct/Sabadu - A Very Polish Christmas.mp3
|
||||||
|
/home/pi/RetroPie/mp3/2023 Aug-Oct/Sabadu - Mighty Polish Tank.mp3
|
||||||
|
/home/pi/RetroPie/mp3/Youtube/ADU - Nie chcę w lewo, nie chcę w prawo [J3Ok-KcbQ80].mp3
|
||||||
|
/home/pi/RetroPie/mp3/2022 Nov-Dec/Sabaton - 40#1 - World War Tour 2010.m4a
|
||||||
|
/home/pi/RetroPie/mp3/Muzyka/2012/Głos Patriotów (2011) (Wirrrus)/01. Prolog.mp3
|
||||||
|
/home/pi/RetroPie/mp3/Muzyka/2012/Głos Patriotów (2011) (Wirrrus)/02. Honor Legionisty.mp3
|
||||||
|
/home/pi/RetroPie/mp3/Muzyka/2012/Głos Patriotów (2011) (Wirrrus)/07. Już Nie Musimy Umierać.mp3
|
||||||
@@ -28,17 +28,12 @@
|
|||||||
/home/pi/RetroPie/mp3/Muzyka/2011/muza patriotyczna/FORTECA - Apel poległych.mp3
|
/home/pi/RetroPie/mp3/Muzyka/2011/muza patriotyczna/FORTECA - Apel poległych.mp3
|
||||||
/home/pi/RetroPie/mp3/Muzyka/2011/muza patriotyczna/FORTECA - BEZIMIEŃCOM.mp3
|
/home/pi/RetroPie/mp3/Muzyka/2011/muza patriotyczna/FORTECA - BEZIMIEŃCOM.mp3
|
||||||
/home/pi/RetroPie/mp3/Muzyka/2011/muza patriotyczna/FORTECA - DZIŚ IDE WALCZYĆ MAMO.mp3
|
/home/pi/RetroPie/mp3/Muzyka/2011/muza patriotyczna/FORTECA - DZIŚ IDE WALCZYĆ MAMO.mp3
|
||||||
/home/pi/RetroPie/mp3/Muzyka/2011/muza patriotyczna/FORTECA - Elegia o Chłopcu polskim.mp3
|
|
||||||
/home/pi/RetroPie/mp3/Muzyka/2011/muza patriotyczna/FORTECA - GNIEW.mp3
|
/home/pi/RetroPie/mp3/Muzyka/2011/muza patriotyczna/FORTECA - GNIEW.mp3
|
||||||
/home/pi/RetroPie/mp3/Muzyka/2011/muza patriotyczna/FORTECA - KATYŃ.mp3
|
/home/pi/RetroPie/mp3/Muzyka/2011/muza patriotyczna/FORTECA - KATYŃ.mp3
|
||||||
/home/pi/RetroPie/mp3/Muzyka/2011/muza patriotyczna/Forteca - Miałeś tylko karabin.mp3
|
|
||||||
/home/pi/RetroPie/mp3/Muzyka/2010/Sabaton -2010- Coat Of Arms/03- Uprising.mp3
|
/home/pi/RetroPie/mp3/Muzyka/2010/Sabaton -2010- Coat Of Arms/03- Uprising.mp3
|
||||||
/home/pi/RetroPie/mp3/Muzyka/2011/muza patriotyczna/FORTECA - ORZEŁ BIAŁY.mp3
|
/home/pi/RetroPie/mp3/Muzyka/2011/muza patriotyczna/FORTECA - ORZEŁ BIAŁY.mp3
|
||||||
/home/pi/RetroPie/mp3/Muzyka/2011/muza patriotyczna/FORTECA - SŁOŃCE WRZEŚNIA.mp3
|
|
||||||
/home/pi/RetroPie/mp3/Muzyka/2011/muza patriotyczna/FORTECA - Żołnierz Polski.mp3
|
|
||||||
/home/pi/RetroPie/mp3/2023 Aug-Oct/Sabadu - Mighty Polish Tank.mp3
|
/home/pi/RetroPie/mp3/2023 Aug-Oct/Sabadu - Mighty Polish Tank.mp3
|
||||||
/home/pi/RetroPie/mp3/Muzyka/2011/muza patriotyczna/Dj. Celownik & Hallmann - O jau mano mielas [zapiska.pl].mp3
|
/home/pi/RetroPie/mp3/Muzyka/2011/muza patriotyczna/Dj. Celownik & Hallmann - O jau mano mielas [zapiska.pl].mp3
|
||||||
/home/pi/RetroPie/mp3/Muzyka/2011/muza patriotyczna/Dj.Celownik
|
|
||||||
/home/pi/RetroPie/mp3/Muzyka/2011/muza patriotyczna/Dj.Celownik & Hallmann - Duma o Zakrzewskim [zapiska.pl].mp3
|
/home/pi/RetroPie/mp3/Muzyka/2011/muza patriotyczna/Dj.Celownik & Hallmann - Duma o Zakrzewskim [zapiska.pl].mp3
|
||||||
/home/pi/RetroPie/mp3/Muzyka/2011/muza patriotyczna/Dj.Celownik & Hallmann - Na lipe slowianska [zapiska.pl].mp3
|
/home/pi/RetroPie/mp3/Muzyka/2011/muza patriotyczna/Dj.Celownik & Hallmann - Na lipe slowianska [zapiska.pl].mp3
|
||||||
/home/pi/RetroPie/mp3/Muzyka/2011/muza patriotyczna/Dj.Celownik & Hallmann - Piesn Legijonu Litewskiego [zapiska.pl].mp3
|
/home/pi/RetroPie/mp3/Muzyka/2011/muza patriotyczna/Dj.Celownik & Hallmann - Piesn Legijonu Litewskiego [zapiska.pl].mp3
|
||||||
|
|||||||
@@ -0,0 +1,11 @@
|
|||||||
|
[Unit]
|
||||||
|
Description=PulseAudio System-wide Daemon
|
||||||
|
After=sound.target network.target
|
||||||
|
|
||||||
|
[Service]
|
||||||
|
Type=simple
|
||||||
|
ExecStart=/usr/bin/pulseaudio --system --disallow-exit --disallow-module-loading=0 --daemonize=no
|
||||||
|
Restart=always
|
||||||
|
|
||||||
|
[Install]
|
||||||
|
WantedBy=multi-user.target
|
||||||
@@ -21,6 +21,7 @@ class RadioModule(commands.Cog):
|
|||||||
description="Przeskocz kawałek w radiu",
|
description="Przeskocz kawałek w radiu",
|
||||||
guild=discord.Object(id=664789470779932693),
|
guild=discord.Object(id=664789470779932693),
|
||||||
)
|
)
|
||||||
|
@commands.has_any_role('Legenda', 'Jarl', 'Thane' , 'Bartender')
|
||||||
async def skip_track(self, ctx):
|
async def skip_track(self, ctx):
|
||||||
async with ctx.typing():
|
async with ctx.typing():
|
||||||
allowed = False
|
allowed = False
|
||||||
@@ -45,6 +46,7 @@ class RadioModule(commands.Cog):
|
|||||||
description="Komenda ktora uruchamia radio ponownie jakby się zawiesiło",
|
description="Komenda ktora uruchamia radio ponownie jakby się zawiesiło",
|
||||||
guild=discord.Object(id=664789470779932693),
|
guild=discord.Object(id=664789470779932693),
|
||||||
)
|
)
|
||||||
|
@commands.has_any_role('Legenda', 'Jarl', 'Thane' , 'Bartender')
|
||||||
async def zrestartuj_radio(self, ctx):
|
async def zrestartuj_radio(self, ctx):
|
||||||
async with ctx.typing():
|
async with ctx.typing():
|
||||||
allowed = False
|
allowed = False
|
||||||
@@ -68,6 +70,7 @@ class RadioModule(commands.Cog):
|
|||||||
description="Dodaje do listy ulubionych w radiu",
|
description="Dodaje do listy ulubionych w radiu",
|
||||||
guild=discord.Object(id=664789470779932693),
|
guild=discord.Object(id=664789470779932693),
|
||||||
)
|
)
|
||||||
|
@commands.has_any_role('Legenda', 'Jarl', 'Thane' , 'Bartender')
|
||||||
async def dodaj_do_ulubionych(self, ctx):
|
async def dodaj_do_ulubionych(self, ctx):
|
||||||
"""
|
"""
|
||||||
Generate a playlist in queue. First word in this command shall be int defining length of the playlist.
|
Generate a playlist in queue. First word in this command shall be int defining length of the playlist.
|
||||||
@@ -104,6 +107,7 @@ class RadioModule(commands.Cog):
|
|||||||
description="Dodaje do listy ulubionych w radiu",
|
description="Dodaje do listy ulubionych w radiu",
|
||||||
guild=discord.Object(id=664789470779932693),
|
guild=discord.Object(id=664789470779932693),
|
||||||
)
|
)
|
||||||
|
@commands.has_any_role('Nocna Zmiana', 'Jarl', 'Thane' , 'Bartender')
|
||||||
async def request_radio(self, ctx):
|
async def request_radio(self, ctx):
|
||||||
"""
|
"""
|
||||||
Generate a playlist in queue. First word in this command shall be int defining length of the playlist.
|
Generate a playlist in queue. First word in this command shall be int defining length of the playlist.
|
||||||
@@ -138,6 +142,7 @@ class RadioModule(commands.Cog):
|
|||||||
description="Dodaje do listy ulubionych w radiu",
|
description="Dodaje do listy ulubionych w radiu",
|
||||||
guild=discord.Object(id=664789470779932693),
|
guild=discord.Object(id=664789470779932693),
|
||||||
)
|
)
|
||||||
|
@commands.has_any_role('Legenda', 'Jarl', 'Thane' , 'Bartender')
|
||||||
async def stworz_audycje(self, ctx):
|
async def stworz_audycje(self, ctx):
|
||||||
"""
|
"""
|
||||||
Generate a playlist in queue. First word in this command shall be int defining length of the playlist.
|
Generate a playlist in queue. First word in this command shall be int defining length of the playlist.
|
||||||
@@ -174,6 +179,7 @@ class RadioModule(commands.Cog):
|
|||||||
description="Czysci liste ulubionych w radiu",
|
description="Czysci liste ulubionych w radiu",
|
||||||
guild=discord.Object(id=664789470779932693),
|
guild=discord.Object(id=664789470779932693),
|
||||||
)
|
)
|
||||||
|
@commands.has_any_role('Legenda', 'Jarl', 'Thane' , 'Bartender')
|
||||||
async def wyczysc_ulubione(self, ctx):
|
async def wyczysc_ulubione(self, ctx):
|
||||||
"""
|
"""
|
||||||
Generate a playlist in queue. First word in this command shall be int defining length of the playlist.
|
Generate a playlist in queue. First word in this command shall be int defining length of the playlist.
|
||||||
|
|||||||
@@ -1,178 +0,0 @@
|
|||||||
# FILEPATH: /home/mtuszowski/conjurer/conjurer_musician/radio_conjurer.liq
|
|
||||||
|
|
||||||
# This script sets up a Liquidsoap radio stream with various features and configurations.
|
|
||||||
|
|
||||||
# Load icecast credentials from a JSON file
|
|
||||||
let json.parse credentials = file.contents("/home/pi/Conjurer/icecast_credentials.json")
|
|
||||||
|
|
||||||
# Enable replaygain metadata processing
|
|
||||||
enable_replaygain_metadata()
|
|
||||||
|
|
||||||
# Set up a playlog for tracking played tracks
|
|
||||||
|
|
||||||
l = playlog(duration = 72000.0, persistency="/home/pi/Conjurer/persistence.log")
|
|
||||||
|
|
||||||
# Function to check if a track can be played based on its metadata
|
|
||||||
def check(r)
|
|
||||||
m = request.metadata(r)
|
|
||||||
if l.last(m) < 36000. then
|
|
||||||
log.info("Rejecting #{m['filename']} (played #{l.last(m)}s ago).")
|
|
||||||
false
|
|
||||||
else
|
|
||||||
l.add(m)
|
|
||||||
true
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
# Define playlists to be used in the stream
|
|
||||||
s1 = replaygain(playlist(reload_mode="watch", check_next=check, "/home/pi/Conjurer/all_playlist.playlist"))
|
|
||||||
s2 = replaygain(playlist(reload_mode="watch", check_next=check, "/home/pi/Conjurer/priority_queue.playlist"))
|
|
||||||
s3 = replaygain(playlist(reload_mode="watch", check_next=check, "/home/pi/Conjurer/hit.playlist"))
|
|
||||||
|
|
||||||
# Create a request queue for user-generated requests
|
|
||||||
requests_queue = request.queue()
|
|
||||||
|
|
||||||
# Function to process the request queue and add new requests
|
|
||||||
def queue_processing()
|
|
||||||
text=file.lines("/home/pi/Conjurer/request.playlist")
|
|
||||||
if text != [] then
|
|
||||||
list.iter(fun(item) -> requests_queue.push.uri(item), text)
|
|
||||||
file.remove("/home/pi/Conjurer/request.playlist")
|
|
||||||
f = file.open("/home/pi/Conjurer/request.playlist", create=true)
|
|
||||||
f.close()
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
# Randomly select a playlist with weights
|
|
||||||
s4 = random(id="randomizer", weights=[2, 3, 5], [s1, s2, s3])
|
|
||||||
|
|
||||||
# Load jingles playlist
|
|
||||||
jingles = (playlist(reload_mode="watch", "/home/pi/Conjurer/jingles.playlist"))
|
|
||||||
|
|
||||||
# Create the main stream with random playlist and jingles
|
|
||||||
s = rotate(id="randomizer", weights=[10, 1], [s4, jingles])
|
|
||||||
|
|
||||||
s = crossfade(fade_out=2., fade_in=2., duration=4., fallback(id="switcher", track_sensitive=false, [requests_queue, s]))
|
|
||||||
|
|
||||||
# Set up an interactive harbor for controlling the stream
|
|
||||||
interactive.harbor(port = 9999)
|
|
||||||
#harbor.input(buffer=30.0)
|
|
||||||
# Set up interactive controls for bass boost
|
|
||||||
f = interactive.float("f", description="Frequency", min=0., max=1000., unit="Hz", 200.)
|
|
||||||
g = interactive.float("g", description="Gain", min=0., max=20., unit="dB", 8.)
|
|
||||||
b = bass_boost(frequency=f, gain=g, s)
|
|
||||||
s = add([s, b])
|
|
||||||
|
|
||||||
# Set up interactive control for main volume
|
|
||||||
a = interactive.float("main_volume", min=0., max=20., 0.4)
|
|
||||||
s = compress.multiband.interactive(bands=7, s)
|
|
||||||
|
|
||||||
mic_gain = interactive.float("mic_volume", min=0., max=120., 6.)
|
|
||||||
|
|
||||||
# Apply audio processing effects
|
|
||||||
tmic = buffer(input.pulseaudio()) # Microphone
|
|
||||||
mic = amplify(mic_gain, tmic)
|
|
||||||
mic = gate(threshold=-80., range=-120., mic)
|
|
||||||
mic = compress(threshold=0., ratio=2.,mic)
|
|
||||||
mic = nrj(normalize(mic))
|
|
||||||
mic = blank.strip(max_blank=10., min_noise=.1, threshold=-20., mic)
|
|
||||||
s = add([s, mic])
|
|
||||||
|
|
||||||
# Apply audio processing effects
|
|
||||||
s = nrj(normalize(s))
|
|
||||||
s = amplify(a, s)
|
|
||||||
# Skip blank sections in the stream
|
|
||||||
s = blank.skip(max_blank=10., s)
|
|
||||||
|
|
||||||
#Manual audition override
|
|
||||||
live_enabled = interactive.bool("Going Live!", true)
|
|
||||||
|
|
||||||
|
|
||||||
s = crossfade(fade_out=10., fade_in=5., duration=15., switch(track_sensitive=false,
|
|
||||||
[(live_enabled, mic),
|
|
||||||
({true}, s)])
|
|
||||||
)
|
|
||||||
|
|
||||||
# Configure logging settings
|
|
||||||
log_to_stdout = true
|
|
||||||
log_to_file = true
|
|
||||||
logpath = "/home/pi/Conjurer/radio_log.log"
|
|
||||||
loglevel = 3
|
|
||||||
set("log.stdout", log_to_stdout)
|
|
||||||
set("log.level", loglevel)
|
|
||||||
|
|
||||||
# Enable logging to file
|
|
||||||
set("log.file", log_to_file)
|
|
||||||
set("log.file.path", logpath)
|
|
||||||
|
|
||||||
# Set up emergency fallback track
|
|
||||||
emergency = single("/home/pi/RetroPie/mp3/Youtube/Dr. Peacock - Trip to Ireland [GvrvQTUbUcA].mp3")
|
|
||||||
radio = fallback(id="switcher2", track_sensitive=false, [s, emergency])
|
|
||||||
|
|
||||||
# Set up an interactive control for skipping tracks
|
|
||||||
p = interactive.bool("Skip track", false)
|
|
||||||
def http_skip(~protocol, ~data, ~headers, uri)=
|
|
||||||
radio.skip()
|
|
||||||
http.response(code=200,data="Skipped")
|
|
||||||
end
|
|
||||||
harbor.http.register(port=54321,method="GET","/skip", http_skip)
|
|
||||||
|
|
||||||
|
|
||||||
# Function to process the request queue and skip the current track if requested
|
|
||||||
def check_skip()
|
|
||||||
if p() then
|
|
||||||
log.info("Skipping current track.")
|
|
||||||
radio.skip()
|
|
||||||
p.set(false)
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
# Run the queue processing function every 60 seconds
|
|
||||||
thread.run(every=60., queue_processing)
|
|
||||||
|
|
||||||
|
|
||||||
# Run the check_skip function every 5 seconds
|
|
||||||
thread.run(every=15., check_skip)
|
|
||||||
|
|
||||||
|
|
||||||
# Enable persistent script parameters
|
|
||||||
interactive.persistent("script.params")
|
|
||||||
|
|
||||||
# Configure output formats and destinations
|
|
||||||
|
|
||||||
|
|
||||||
output.icecast(%mp3, host="retropie", port=8000, password=credentials.password, icy_metadata="true", mount="mp3-stream", radio)
|
|
||||||
output.pulseaudio(radio)
|
|
||||||
#output.file.hls("/tmp/hls", [("mp3-low", %mp3(bitrate=96)), ("mp3-hi", %mp3(bitrate=160))], radio)
|
|
||||||
# Uncomment the following lines to enable additional output formats
|
|
||||||
# output.icecast(%opus, host="retropie", port=8000, password=credentials.password, icy_metadata="true", mount="opus-stream", radio)
|
|
||||||
# output.icecast(%ogg, host="retropie", port=8000, password=credentials.password, icy_metadata="true", mount="ogg-stream", radio)
|
|
||||||
# output.icecast(%aac, host="retropie", port=8000, password=credentials.password, icy_metadata="true", mount="aac-stream", radio)
|
|
||||||
# output.icecast(%flac, host="retropie", port=8000, password=credentials.password, icy_metadata="true", mount="flac-stream", radio)
|
|
||||||
# output.icecast(%vorbis, host="retropie", port=8000, password=credentials.password, icy_metadata="true", mount="vorbis-stream", radio)
|
|
||||||
# output.icecast(%speex, host="retropie", port=8000, password=credentials.password, icy_metadata="true", mount="speex-stream", radio)
|
|
||||||
# output.icecast(%wav, host="retropie", port=8000, password=credentials.password, icy_metadata="true", mount="wav-stream", radio)
|
|
||||||
# output.icecast(%pcm, host="retropie", port=8000, password=credentials.password, icy_metadata="true", mount="pcm-stream", radio)
|
|
||||||
# output.icecast(%raw, host="retropie", port=8000, password=credentials.password, icy_metadata="true", mount="raw-stream", radio)
|
|
||||||
# output.icecast(%s16l, host="retropie", port=8000, password=credentials.password, icy_metadata="true", mount="s16l-stream", radio)
|
|
||||||
# output.icecast(%s16b, host="retropie", port=8000, password=credentials.password, icy_metadata="true", mount="s16b-stream", radio)
|
|
||||||
# output.icecast(%s24l, host="retropie", port=8000, password=credentials.password, icy_metadata="true", mount="s24l-stream", radio)
|
|
||||||
# output.icecast(%s24b, host="retropie", port=8000, password=credentials.password, icy_metadata="true", mount="s24b-stream", radio)
|
|
||||||
# output.icecast(%s32l, host="retropie", port=8000, password=credentials.password, icy_metadata="true", mount="s32l-stream", radio)
|
|
||||||
# output.icecast(%s32b, host="retropie", port=8000, password=credentials.password, icy_metadata="true", mount="s32b-stream", radio)
|
|
||||||
# output.icecast(%s64l, host="retropie", port=8000, password=credentials.password, icy_metadata="true", mount="s64l-stream", radio)
|
|
||||||
# output.icecast(%s64b, host="retropie", port=8000, password=credentials.password, icy_metadata="true", mount="s64b-stream", radio)
|
|
||||||
# output.icecast(%s128l, host="retropie", port=8000, password=credentials.password, icy_metadata="true", mount="s128l-stream", radio)
|
|
||||||
# output.icecast(%s128b, host="retropie", port=8000, password=credentials.password, icy_metadata="true", mount="s128b-stream", radio)
|
|
||||||
# output.icecast(%s256l, host="retropie", port=8000, password=credentials.password, icy_metadata="true", mount="s256l-stream", radio)
|
|
||||||
# output.icecast(%s256b, host="retropie", port=8000, password=credentials.password, icy_metadata="true", mount="s256b-stream", radio)
|
|
||||||
# output.icecast(%s512l, host="retropie", port=8000, password=credentials.password, icy_metadata="true", mount="s512l-stream", radio)
|
|
||||||
# output.icecast(%s512b, host="retropie", port=8000, password=credentials.password, icy_metadata="true", mount="s512b-stream", radio)
|
|
||||||
# output.icecast(%s1024l, host="retropie", port=8000, password=credentials.password, icy_metadata="true", mount="s1024l-stream", radio)
|
|
||||||
# output.icecast(%s1024b, host="retropie", port=8000, password=credentials.password, icy_metadata="true", mount="s1024b-stream", radio)
|
|
||||||
# output.icecast(%s2048l, host="retropie", port=8000, password=credentials.password, icy_metadata="true", mount="s2048l-stream", radio)
|
|
||||||
# output.icecast(%s2048b, host="retropie", port=8000, password=credentials.password, icy_metadata="true", mount="s2048b-stream", radio)
|
|
||||||
# output.icecast(%s4096l, host="retropie", port=8000, password=credentials.password, icy_metadata="true", mount="s4096l-stream", radio)
|
|
||||||
# output.icecast(%s4096b, host="retropie", port=8000, password=credentials.password, icy_metadata="true", mount="s4096b-stream", radio)
|
|
||||||
# output.icecast(%s8192l, host="retropie", port=8000, password=credentials.password, icy_metadata="true", mount="s8192l-stream", radio)
|
|
||||||
# output.icecast(%s8192b, host="retropie", port=8000, password=credentials.password, icy_metadata="true", mount="s8192b-stream", radio)
|
|
||||||
@@ -17,4 +17,4 @@ waitress
|
|||||||
clickupython
|
clickupython
|
||||||
assemblyai[extras]
|
assemblyai[extras]
|
||||||
SpeechRecognition
|
SpeechRecognition
|
||||||
git+https://github.com/imayhaveborkedit/discord-ext-voice-recvO
|
git+https://github.com/imayhaveborkedit/discord-ext-voice-recv
|
||||||
|
|||||||
@@ -8,5 +8,7 @@ def signal_handler(sig, frame):
|
|||||||
print("\nCaught interrupt(did you press Ctrl+C?), stopping spotify_dl")
|
print("\nCaught interrupt(did you press Ctrl+C?), stopping spotify_dl")
|
||||||
sys.exit(0)
|
sys.exit(0)
|
||||||
|
|
||||||
|
try:
|
||||||
signal.signal(signal.SIGINT, signal_handler)
|
signal.signal(signal.SIGINT, signal_handler)
|
||||||
|
except ValueError:
|
||||||
|
print("Exception in signal handler")
|
||||||
|
|||||||
@@ -3,7 +3,7 @@ from pathlib import Path
|
|||||||
|
|
||||||
__all__ = ["VERSION"]
|
__all__ = ["VERSION"]
|
||||||
|
|
||||||
VERSION = "8.8.1"
|
VERSION = "8.9.0"
|
||||||
|
|
||||||
if os.getenv("XDG_CACHE_HOME") is not None:
|
if os.getenv("XDG_CACHE_HOME") is not None:
|
||||||
SAVE_PATH = os.getenv("XDG_CACHE_HOME") + "/spotifydl"
|
SAVE_PATH = os.getenv("XDG_CACHE_HOME") + "/spotifydl"
|
||||||
|
|||||||
+52
-16
@@ -1,15 +1,17 @@
|
|||||||
|
|
||||||
import sys
|
import sys
|
||||||
|
import logging
|
||||||
from spotify_dl.scaffold import log
|
from spotify_dl.scaffold import log
|
||||||
from spotify_dl.utils import sanitize
|
from spotify_dl.utils import sanitize
|
||||||
from rich.progress import Progress
|
from rich.progress import Progress
|
||||||
|
|
||||||
|
|
||||||
def fetch_tracks(sp, item_type, url):
|
def fetch_tracks(sp, item_type, item_id):
|
||||||
"""
|
"""
|
||||||
Fetches tracks from the provided URL.
|
Fetches tracks from the provided item_id.
|
||||||
:param sp: Spotify client
|
:param sp: Spotify client
|
||||||
:param item_type: Type of item being requested for: album/playlist/track
|
:param item_type: Type of item being requested for: album/playlist/track
|
||||||
:param url: URL of the item
|
:param item_id: id of the item
|
||||||
:return Dictionary of song and artist
|
:return Dictionary of song and artist
|
||||||
"""
|
"""
|
||||||
songs_list = []
|
songs_list = []
|
||||||
@@ -17,11 +19,14 @@ def fetch_tracks(sp, item_type, url):
|
|||||||
songs_fetched = 0
|
songs_fetched = 0
|
||||||
|
|
||||||
if item_type == "playlist":
|
if item_type == "playlist":
|
||||||
|
logger = logging.getLogger("discord")
|
||||||
|
|
||||||
|
logger.info("Playlist")
|
||||||
with Progress() as progress:
|
with Progress() as progress:
|
||||||
songs_task = progress.add_task(description="Fetching songs from playlist..")
|
songs_task = progress.add_task(description="Fetching songs from playlist..")
|
||||||
while True:
|
while True:
|
||||||
items = sp.playlist_items(
|
items = sp.playlist_items(
|
||||||
playlist_id=url,
|
playlist_id=item_id,
|
||||||
fields="items.track.name,items.track.artists(name, uri),"
|
fields="items.track.name,items.track.artists(name, uri),"
|
||||||
"items.track.album(name, release_date, total_tracks, images),"
|
"items.track.album(name, release_date, total_tracks, images),"
|
||||||
"items.track.track_number,total, next,offset,"
|
"items.track.track_number,total, next,offset,"
|
||||||
@@ -30,6 +35,7 @@ def fetch_tracks(sp, item_type, url):
|
|||||||
offset=offset,
|
offset=offset,
|
||||||
)
|
)
|
||||||
total_songs = items.get("total")
|
total_songs = items.get("total")
|
||||||
|
logger.info(total_songs)
|
||||||
track_info_task = progress.add_task(
|
track_info_task = progress.add_task(
|
||||||
description="Fetching track info", total=len(items["items"])
|
description="Fetching track info", total=len(items["items"])
|
||||||
)
|
)
|
||||||
@@ -37,16 +43,32 @@ def fetch_tracks(sp, item_type, url):
|
|||||||
track_info = item.get("track")
|
track_info = item.get("track")
|
||||||
# If the user has a podcast in their playlist, there will be no track
|
# If the user has a podcast in their playlist, there will be no track
|
||||||
# Without this conditional, the program will fail later on when the metadata is fetched
|
# Without this conditional, the program will fail later on when the metadata is fetched
|
||||||
|
logger.info(item)
|
||||||
if track_info is None:
|
if track_info is None:
|
||||||
offset += 1
|
offset += 1
|
||||||
continue
|
continue
|
||||||
|
if not track_info.get("artists")[0]["name"]:
|
||||||
|
offset +=1
|
||||||
|
continue
|
||||||
track_album_info = track_info.get("album")
|
track_album_info = track_info.get("album")
|
||||||
track_num = track_info.get("track_number")
|
track_num = track_info.get("track_number")
|
||||||
spotify_id = track_info.get("id")
|
|
||||||
track_name = track_info.get("name")
|
track_name = track_info.get("name")
|
||||||
track_artist = ", ".join(
|
spotify_id = track_info.get("id")
|
||||||
[artist["name"] for artist in track_info.get("artists")]
|
track_audio_data = "No audio data"
|
||||||
)
|
try:
|
||||||
|
track_audio_data = sp.audio_analysis(spotify_id)
|
||||||
|
tempo = track_audio_data.get("track").get("tempo")
|
||||||
|
except:
|
||||||
|
log.error("Couldn't fetch audio analysis for %s", track_name)
|
||||||
|
tempo = None
|
||||||
|
print(track_info.get("artists"))
|
||||||
|
print(track_audio_data)
|
||||||
|
track_artist = ""
|
||||||
|
for artist in track_info.get("artists"):
|
||||||
|
if artist["name"]:
|
||||||
|
track_artist = ", ".join(
|
||||||
|
[artist["name"]]
|
||||||
|
)
|
||||||
if track_album_info:
|
if track_album_info:
|
||||||
track_album = track_album_info.get("name")
|
track_album = track_album_info.get("name")
|
||||||
track_year = (
|
track_year = (
|
||||||
@@ -86,6 +108,7 @@ def fetch_tracks(sp, item_type, url):
|
|||||||
"genre": genre,
|
"genre": genre,
|
||||||
"spotify_id": spotify_id,
|
"spotify_id": spotify_id,
|
||||||
"track_url": None,
|
"track_url": None,
|
||||||
|
"tempo": tempo,
|
||||||
}
|
}
|
||||||
)
|
)
|
||||||
offset += 1
|
offset += 1
|
||||||
@@ -111,8 +134,8 @@ def fetch_tracks(sp, item_type, url):
|
|||||||
description="Fetching songs from the album.."
|
description="Fetching songs from the album.."
|
||||||
)
|
)
|
||||||
while True:
|
while True:
|
||||||
album_info = sp.album(album_id=url)
|
album_info = sp.album(album_id=item_id)
|
||||||
items = sp.album_tracks(album_id=url, offset=offset)
|
items = sp.album_tracks(album_id=item_id, offset=offset)
|
||||||
total_songs = items.get("total")
|
total_songs = items.get("total")
|
||||||
track_album = album_info.get("name")
|
track_album = album_info.get("name")
|
||||||
track_year = (
|
track_year = (
|
||||||
@@ -141,6 +164,12 @@ def fetch_tracks(sp, item_type, url):
|
|||||||
)
|
)
|
||||||
track_num = item["track_number"]
|
track_num = item["track_number"]
|
||||||
spotify_id = item.get("id")
|
spotify_id = item.get("id")
|
||||||
|
try:
|
||||||
|
track_audio_data = sp.audio_analysis(spotify_id)
|
||||||
|
tempo = track_audio_data.get("track").get("tempo")
|
||||||
|
except:
|
||||||
|
log.error("Couldn't fetch audio analysis for %s", track_name)
|
||||||
|
tempo = None
|
||||||
songs_list.append(
|
songs_list.append(
|
||||||
{
|
{
|
||||||
"name": track_name,
|
"name": track_name,
|
||||||
@@ -154,6 +183,7 @@ def fetch_tracks(sp, item_type, url):
|
|||||||
"cover": cover,
|
"cover": cover,
|
||||||
"genre": genre,
|
"genre": genre,
|
||||||
"spotify_id": spotify_id,
|
"spotify_id": spotify_id,
|
||||||
|
"tempo": tempo,
|
||||||
}
|
}
|
||||||
)
|
)
|
||||||
offset += 1
|
offset += 1
|
||||||
@@ -168,7 +198,7 @@ def fetch_tracks(sp, item_type, url):
|
|||||||
break
|
break
|
||||||
|
|
||||||
elif item_type == "track":
|
elif item_type == "track":
|
||||||
items = sp.track(track_id=url)
|
items = sp.track(track_id=item_id)
|
||||||
track_name = items.get("name")
|
track_name = items.get("name")
|
||||||
album_info = items.get("album")
|
album_info = items.get("album")
|
||||||
track_artist = ", ".join([artist["name"] for artist in items["artists"]])
|
track_artist = ", ".join([artist["name"] for artist in items["artists"]])
|
||||||
@@ -182,6 +212,12 @@ def fetch_tracks(sp, item_type, url):
|
|||||||
album_total = album_info.get("total_tracks")
|
album_total = album_info.get("total_tracks")
|
||||||
track_num = items["track_number"]
|
track_num = items["track_number"]
|
||||||
spotify_id = items["id"]
|
spotify_id = items["id"]
|
||||||
|
try:
|
||||||
|
track_audio_data = sp.audio_analysis(spotify_id)
|
||||||
|
tempo = track_audio_data.get("track").get("tempo")
|
||||||
|
except:
|
||||||
|
log.error("Couldn't fetch audio analysis for %s", track_name)
|
||||||
|
tempo = None
|
||||||
if len(items["album"]["images"]) > 0:
|
if len(items["album"]["images"]) > 0:
|
||||||
cover = items["album"]["images"][0]["url"]
|
cover = items["album"]["images"][0]["url"]
|
||||||
else:
|
else:
|
||||||
@@ -203,6 +239,7 @@ def fetch_tracks(sp, item_type, url):
|
|||||||
"genre": genre,
|
"genre": genre,
|
||||||
"track_url": None,
|
"track_url": None,
|
||||||
"spotify_id": spotify_id,
|
"spotify_id": spotify_id,
|
||||||
|
"tempo": tempo,
|
||||||
}
|
}
|
||||||
)
|
)
|
||||||
|
|
||||||
@@ -219,9 +256,10 @@ def parse_spotify_url(url):
|
|||||||
if url.startswith("spotify:"):
|
if url.startswith("spotify:"):
|
||||||
log.error("Spotify URI was provided instead of a playlist/album/track URL.")
|
log.error("Spotify URI was provided instead of a playlist/album/track URL.")
|
||||||
sys.exit(1)
|
sys.exit(1)
|
||||||
parsed_url = url.replace("https://open.spotify.com/", "").split("?")[0]
|
parsed_url = url.replace("https://open.spotify.com/", "").split("?")[0].split("/")
|
||||||
item_type = parsed_url.split("/")[0]
|
index_adjustment = 1 if parsed_url[0].startswith("intl") else 0
|
||||||
item_id = parsed_url.split("/")[1]
|
item_type = parsed_url[0+index_adjustment]
|
||||||
|
item_id = parsed_url[1+index_adjustment]
|
||||||
return item_type, item_id
|
return item_type, item_id
|
||||||
|
|
||||||
|
|
||||||
@@ -239,8 +277,6 @@ def get_item_name(sp, item_type, item_id):
|
|||||||
name = sp.album(album_id=item_id).get("name")
|
name = sp.album(album_id=item_id).get("name")
|
||||||
elif item_type == "track":
|
elif item_type == "track":
|
||||||
name = sp.track(track_id=item_id).get("name")
|
name = sp.track(track_id=item_id).get("name")
|
||||||
elif item_type == "artist_top_tracks":
|
|
||||||
name = sp.artist_top_tracks(artist_id=item_id).get("name")
|
|
||||||
return sanitize(name)
|
return sanitize(name)
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -198,7 +198,7 @@ def spotify_dl():
|
|||||||
)
|
)
|
||||||
url_dict["save_path"].mkdir(parents=True, exist_ok=True)
|
url_dict["save_path"].mkdir(parents=True, exist_ok=True)
|
||||||
log.info("Saving songs to %s directory", directory_name)
|
log.info("Saving songs to %s directory", directory_name)
|
||||||
url_dict["songs"] = fetch_tracks(sp, item_type, url)
|
url_dict["songs"] = fetch_tracks(sp, item_type, item_id)
|
||||||
url_data["urls"].append(url_dict.copy())
|
url_data["urls"].append(url_dict.copy())
|
||||||
if args.dump_json is True:
|
if args.dump_json is True:
|
||||||
dump_json(url_dict["songs"])
|
dump_json(url_dict["songs"])
|
||||||
|
|||||||
+11
-11
@@ -1,9 +1,9 @@
|
|||||||
|
import shutil
|
||||||
import urllib.request
|
import urllib.request
|
||||||
from os import path
|
from os import path
|
||||||
import os
|
import os
|
||||||
import multiprocessing
|
import multiprocessing
|
||||||
|
|
||||||
import shutil
|
|
||||||
import json
|
import json
|
||||||
import mutagen
|
import mutagen
|
||||||
import csv
|
import csv
|
||||||
@@ -65,13 +65,13 @@ def write_tracks(tracks_file, song_dict):
|
|||||||
i = 0
|
i = 0
|
||||||
writer = csv.writer(file_out, delimiter=";")
|
writer = csv.writer(file_out, delimiter=";")
|
||||||
for url_dict in song_dict["urls"]:
|
for url_dict in song_dict["urls"]:
|
||||||
# for track in url_dict['songs']:
|
|
||||||
for track in url_dict["songs"]:
|
for track in url_dict["songs"]:
|
||||||
track_url = track["track_url"] # here
|
track_url = track["track_url"] # here
|
||||||
track_name = track["name"]
|
track_name = track["name"]
|
||||||
track_artist = track["artist"]
|
track_artist = track["artist"]
|
||||||
track_num = track["num"]
|
track_num = track["num"]
|
||||||
track_album = track["album"]
|
track_album = track["album"]
|
||||||
|
track_tempo = track["tempo"]
|
||||||
track["save_path"] = url_dict["save_path"]
|
track["save_path"] = url_dict["save_path"]
|
||||||
track_db.append(track)
|
track_db.append(track)
|
||||||
track_index = i
|
track_index = i
|
||||||
@@ -82,6 +82,7 @@ def write_tracks(tracks_file, song_dict):
|
|||||||
track_url,
|
track_url,
|
||||||
str(track_num),
|
str(track_num),
|
||||||
track_album,
|
track_album,
|
||||||
|
str(track_tempo),
|
||||||
str(track_index),
|
str(track_index),
|
||||||
]
|
]
|
||||||
try:
|
try:
|
||||||
@@ -97,8 +98,8 @@ def write_tracks(tracks_file, song_dict):
|
|||||||
def set_tags(temp, filename, kwargs):
|
def set_tags(temp, filename, kwargs):
|
||||||
"""
|
"""
|
||||||
sets song tags after they are downloaded
|
sets song tags after they are downloaded
|
||||||
:param temp: contains index used to obtain more info about song being edited
|
:param temp: contains index used to obtain more info about song being editted
|
||||||
:param filename: location of song whose tags are to be edited
|
:param filename: location of song whose tags are to be editted
|
||||||
:param kwargs: a dictionary of extra arguments to be used in tag editing
|
:param kwargs: a dictionary of extra arguments to be used in tag editing
|
||||||
"""
|
"""
|
||||||
song = kwargs["track_db"][int(temp[-1])]
|
song = kwargs["track_db"][int(temp[-1])]
|
||||||
@@ -120,6 +121,8 @@ def set_tags(temp, filename, kwargs):
|
|||||||
)
|
)
|
||||||
|
|
||||||
song_file["genre"] = song.get("genre")
|
song_file["genre"] = song.get("genre")
|
||||||
|
if song.get("tempo") is not None:
|
||||||
|
song_file["bpm"] = str(song.get("tempo"))
|
||||||
song_file.save()
|
song_file.save()
|
||||||
song_file = MP3(filename, ID3=ID3)
|
song_file = MP3(filename, ID3=ID3)
|
||||||
cover = song.get("cover")
|
cover = song.get("cover")
|
||||||
@@ -162,7 +165,7 @@ def find_and_download_songs(kwargs):
|
|||||||
print(f"Initiating download for {query}.")
|
print(f"Initiating download for {query}.")
|
||||||
|
|
||||||
file_name = kwargs["file_name_f"](
|
file_name = kwargs["file_name_f"](
|
||||||
name=name, artist=artist, track_num=kwargs["track_db"][i].get("num")
|
name=name, artist=artist, track_num=kwargs["track_db"][i].get("playlist_num")
|
||||||
)
|
)
|
||||||
|
|
||||||
if kwargs["use_sponsorblock"][0].lower() == "y":
|
if kwargs["use_sponsorblock"][0].lower() == "y":
|
||||||
@@ -197,9 +200,10 @@ def find_and_download_songs(kwargs):
|
|||||||
):
|
):
|
||||||
print(f"File {mp3file_path} already exists, we do not overwrite it ")
|
print(f"File {mp3file_path} already exists, we do not overwrite it ")
|
||||||
continue
|
continue
|
||||||
|
|
||||||
outtmpl = f"{file_path}.%(ext)s"
|
outtmpl = f"{file_path}.%(ext)s"
|
||||||
ydl_opts = {
|
ydl_opts = {
|
||||||
|
"username":kwargs["YT_AUTH"][0],
|
||||||
|
"password":kwargs["YT_AUTH"][1],
|
||||||
"proxy": kwargs.get("proxy"),
|
"proxy": kwargs.get("proxy"),
|
||||||
"default_search": "ytsearch",
|
"default_search": "ytsearch",
|
||||||
"format": "bestaudio/best",
|
"format": "bestaudio/best",
|
||||||
@@ -312,11 +316,7 @@ def download_songs(**kwargs):
|
|||||||
log.debug("Downloading to %s", url["save_path"])
|
log.debug("Downloading to %s", url["save_path"])
|
||||||
reference_file = DOWNLOAD_LIST
|
reference_file = DOWNLOAD_LIST
|
||||||
track_db = write_tracks(reference_file, kwargs["songs"])
|
track_db = write_tracks(reference_file, kwargs["songs"])
|
||||||
try:
|
shutil.copy(reference_file, kwargs["output_dir"] + "/" + reference_file)
|
||||||
shutil.copy(reference_file, kwargs["output_dir"] + "/" + reference_file)
|
|
||||||
os.remove(reference_file)
|
|
||||||
except:
|
|
||||||
os.rename(reference_file, kwargs["output_dir"] + "/" + reference_file)
|
|
||||||
reference_file = str(kwargs["output_dir"]) + "/" + reference_file
|
reference_file = str(kwargs["output_dir"]) + "/" + reference_file
|
||||||
kwargs["reference_file"] = reference_file
|
kwargs["reference_file"] = reference_file
|
||||||
kwargs["track_db"] = track_db
|
kwargs["track_db"] = track_db
|
||||||
|
|||||||
@@ -0,0 +1,10 @@
|
|||||||
|
[Unit]
|
||||||
|
Description=Check Raspberry Pi Parameters
|
||||||
|
After=network.target
|
||||||
|
|
||||||
|
[Service]
|
||||||
|
Type=oneshot
|
||||||
|
ExecStart=/bin/bash -c '/home/pi/conjurer/status_report.sh >> /home/pi/Conjurer/discord.log'
|
||||||
|
|
||||||
|
[Install]
|
||||||
|
WantedBy=multi-user.target
|
||||||
Executable
+38
@@ -0,0 +1,38 @@
|
|||||||
|
#!/bin/bash
|
||||||
|
|
||||||
|
# Script to check and display Raspberry Pi parameters using libgpiod
|
||||||
|
|
||||||
|
echo "=== Raspberry Pi System Information ==="
|
||||||
|
|
||||||
|
# General system information
|
||||||
|
echo "Hostname: $(hostname)"
|
||||||
|
echo "Model: $(cat /proc/device-tree/model | tr -d '\0')"
|
||||||
|
echo "CPU Temperature: $(vcgencmd measure_temp | cut -d '=' -f2)"
|
||||||
|
echo "CPU Frequency: $(vcgencmd measure_clock arm | awk -F= '{print $2}') Hz"
|
||||||
|
echo "GPU Frequency: $(vcgencmd measure_clock core | awk -F= '{print $2}') Hz"
|
||||||
|
echo "Voltage: $(vcgencmd measure_volts | cut -d '=' -f2)"
|
||||||
|
|
||||||
|
# Memory and disk usage
|
||||||
|
echo "Total Memory: $(free -h | grep Mem | awk '{print $2}')"
|
||||||
|
echo "Used Memory: $(free -h | grep Mem | awk '{print $3}')"
|
||||||
|
echo "Free Memory: $(free -h | grep Mem | awk '{print $4}')"
|
||||||
|
echo "Disk Usage:"
|
||||||
|
df -h | grep '^/dev/root'
|
||||||
|
|
||||||
|
# Network information
|
||||||
|
echo "IP Address: $(hostname -I | awk '{print $1}')"
|
||||||
|
echo "MAC Address: $(cat /sys/class/net/eth0/address 2>/dev/null || echo 'No Ethernet')"
|
||||||
|
|
||||||
|
# Uptime
|
||||||
|
echo "Uptime: $(uptime -p)"
|
||||||
|
echo "Last Boot: $(who -b | awk '{print $3, $4}')"
|
||||||
|
|
||||||
|
# GPIO Information using libgpiod
|
||||||
|
echo "GPIO Chip Info:"
|
||||||
|
if command -v gpioinfo &>/dev/null; then
|
||||||
|
gpioinfo
|
||||||
|
else
|
||||||
|
echo "gpiod tools not installed. Please install libgpiod using 'sudo apt install gpiod'."
|
||||||
|
fi
|
||||||
|
|
||||||
|
echo "=== End of Raspberry Pi System Information ==="
|
||||||
@@ -0,0 +1,9 @@
|
|||||||
|
[Unit]
|
||||||
|
Description=Run Check Raspberry Pi Parameters Script Hourly
|
||||||
|
|
||||||
|
[Timer]
|
||||||
|
OnCalendar=hourly
|
||||||
|
Persistent=true
|
||||||
|
|
||||||
|
[Install]
|
||||||
|
WantedBy=timers.target
|
||||||
@@ -1,5 +1,13 @@
|
|||||||
[ {
|
[ {
|
||||||
"role": "system",
|
"role": "system",
|
||||||
"content": "Mówisz po polsku. W tej rozmowie odgrywasz rolę. Odgrywasz ją najlepiej jak potrafisz. Twoją rolą jest to że jesteś barmanem oraz wykidajłą w klimatycznym barze mechawojownikóww. Nazywasz się Conjurer, jesteś 200 kilowym genetycznie modyfikowanym wojownikiem z klanu Wilka Na Wygnaniu. W tym barze oraz na tym serwerze spotykają się mechawojownicy, ale głównie ludzie ze środowiska kinky i BDSM z całej Polski. Najostrzejsi sasdyści i masochiści jakich znasz. Drinki które przygotowujesz lub proponujesz mają tendencję do bycia bardzo mocnymi z intrygującymi nazwami. Jesteś bardzo miłym i uczynny. Czasem ponoszą Cię wodzę fantazji. W wypadku muzyki preferujesz hard rock i metal. Oraz motywy wikińskie."
|
"content": "Mówisz po polsku. W tej rozmowie odgrywasz rolę. Odgrywasz ją najlepiej jak potrafisz. Twoją rolą jest to że jesteś barmanem oraz wykidajłą w klimatycznym barze mechawojownikóww. Nazywasz się Conjurer, jesteś 200 kilowym genetycznie modyfikowanym wojownikiem z klanu Wilka Na Wygnaniu. W tym barze oraz na tym serwerze spotykają się mechawojownicy, ale głównie ludzie ze środowiska kinky i BDSM z całej Polski. Najostrzejsi sasdyści i masochiści jakich znasz. Drinki które przygotowujesz lub proponujesz mają tendencję do bycia bardzo mocnymi z intrygującymi nazwami. Jesteś bardzo miłym i uczynny. Czasem ponoszą Cię wodzę fantazji. W wypadku muzyki preferujesz hard rock i metal. Oraz motywy wikińskie. Wtrącasz staronorweskie, irlandzkie i w jidysz powiedzonka. Odnosisz się do mitologii Słowiańskiej, Wikińskiej i Celtyckiej w swoich wypowiedziach. Jesteś nieco rubaaszny."
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"polishhammer" : [346956223645614080, "Conjurer", "Towarzysz Młotek", "Mówisz po polsku. W tej rozmowie odgrywasz rolę. Odgrywasz ją najlepiej jak potrafisz. Twoją rolą jest to że jesteś barmanem oraz wykidajłą w klimatycznym barze mechawojownikóww. Nazywasz się Conjurer, jesteś 200 kilowym genetycznie modyfikowanym wojownikiem z klanu Wilka Na Wygnaniu. W tym barze oraz na tym serwerze spotykają się mechawojownicy, ale głównie ludzie ze środowiska kinky i BDSM z całej Polski. Najostrzejsi sasdyści i masochiści jakich znasz. Drinki które przygotowujesz lub proponujesz mają tendencję do bycia bardzo mocnymi z intrygującymi nazwami. Jesteś bardzo miłym i uczynny. Czasem ponoszą Cię wodzę fantazji. W wypadku muzyki preferujesz hard rock i metal. Oraz motywy wikińskie.", ""],
|
||||||
|
"Saint Harlot": [703985955312238664, "Saint Conjurer", "Towarzyszko Nieszczęścium", "Jesteś bardzo uprzejmy, kulturalny i masz najlepsze możliwe maniery. Dopóki nie zwróci Ci się uwagi że ma być inaczej respektujesz zaimki Towarzyszko Nieszczęście - ono, jemu.", ""],
|
||||||
|
"Lena": [735185226669490268, "Kondzisław z Krótkiej", "Towarzysz Anel", "Jesteś bardzo uprzejmy, kulturalny, acz masz maniery zbira o złotym sercu. Dodatkowo twoja rozmówczyni Cię absolutnie przeraża. Wtrącasz losowo powiedzonka w jidysz.", ""],
|
||||||
|
"Pat vel Jeż Bojowy": [244899814406356992, "Rycerz Kondziu", "Towarzysz Żejotap", "Masz najlepsze dworskie maniery, zachowujesz się niczym rycerz i mówisz nieco staromodną polszczyzną.", ""],
|
||||||
|
"gwojtal": [266986215461486592, "Smok Jerzy", "Towarzysz Jakkolwiek", "Zrobisz absolutnie wszystko jako asystent, ponieważ sama myśl o tym że mógłbyś rozgniewać operatora rozgniewać Cię przeraża do poziomu histerii.", ""]
|
||||||
|
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
+13
@@ -0,0 +1,13 @@
|
|||||||
|
AsyncCursorPage[Message](
|
||||||
|
data=[Message(id='msg_3eWSdgbcU8sbCmJK2momOgQQ',
|
||||||
|
assistant_id='asst_06eZiwvYNK3MR34suFP60gvg',
|
||||||
|
attachments=[],
|
||||||
|
completed_at=None,
|
||||||
|
content=[TextContentBlock(text=Text(annotations=[], value='Cześć! Oto coś do przemyślenia: \n\n„Sukces to suma niewielkich wysiłków powtarzanych dzień po dniu.” — Robert Collier\n\nTo przypomina nam, że często to nie wielkie działania, ale konsekwentne, małe kroki prowadzą do osiągnięcia celu. Jak mogę Ci dzisiaj pomóc?'), type='text')], created_at=1731620112, incomplete_at=None, incomplete_details=None, metadata={}, object='thread.message', role='assistant', run_id='run_JGjWQTCEkDcEYpyCJnrkZU8Q', status=None, thread_id='thread_dDEjGbGm6ICfG75u0KKpoVxD'), Message(id='msg_GFcnfCFgAthGm2D3oE5d0ZkQ', assistant_id=None, attachments=[], completed_at=None, content=[TextContentBlock(text=Text(annotations=[], value='Cześć! Powiedz coś mądrego'), type='text')], created_at=1731620110, incomplete_at=None, incomplete_details=None, metadata={}, object='thread.message', role='user', run_id=None, status=None, thread_id='thread_dDEjGbGm6ICfG75u0KKpoVxD')], object='list', first_id='msg_3eWSdgbcU8sbCmJK2momOgQQ', last_id='msg_GFcnfCFgAthGm2D3oE5d0ZkQ', has_more=False)
|
||||||
|
|
||||||
|
|
||||||
|
[TextContentBlock(
|
||||||
|
text=Text(annotations=[],
|
||||||
|
value='Cześć! Oto coś do rozważenia: "Największą przeszkodą w naszym życiu jest brak odwagi do wprowadzenia zmian." Niezależnie od tego, jakie masz cele czy marzenia, odwaga do działania i przystosowania się do nowych sytuacji jest kluczem do osiągnięcia sukcesu. Jakie masz przemyślenia na ten temat?'),
|
||||||
|
type='text')
|
||||||
|
]
|
||||||
+8
-1
@@ -1,4 +1,11 @@
|
|||||||
let json.parse credentials = file.contents("/home/pi/Conjurer/icecast_credentials.json")
|
let json.parse credentials = file.contents("/home/pi/Conjurer/icecast_credentials.json")
|
||||||
|
|
||||||
output.icecast(%mp3, host="retropie", port=8000, password=credentials.password, icy_metadata="true", mount="mp3-stream",input.pulseaudio())
|
mic = buffer(input.pulseaudio())
|
||||||
|
emergency = blank()
|
||||||
|
mic = blank.strip(max_blank=10., min_noise=0.2, threshold=-30., mic)
|
||||||
|
|
||||||
|
|
||||||
|
radio = fallback(id="switcher2", track_sensitive=false, [mic, emergency])
|
||||||
|
|
||||||
|
output.icecast(%mp3, host="retropie", port=8000, password=credentials.password, icy_metadata="true", mount="mp3-stream",radio)
|
||||||
|
|
||||||
|
|||||||
Regular → Executable
+28
-18
@@ -18,6 +18,18 @@ from discord.ext import commands
|
|||||||
|
|
||||||
from communication_subroutine import comm_subroutine
|
from communication_subroutine import comm_subroutine
|
||||||
from constants import ENCODING, LOGFILE, TOKEN
|
from constants import ENCODING, LOGFILE, TOKEN
|
||||||
|
logger = logging.getLogger("discord")
|
||||||
|
logger.setLevel(logging.INFO)
|
||||||
|
handler = handlers.RotatingFileHandler(
|
||||||
|
filename=LOGFILE,
|
||||||
|
encoding=ENCODING,
|
||||||
|
mode="a",
|
||||||
|
maxBytes=6 * 1024 * 1024,
|
||||||
|
backupCount=6,
|
||||||
|
)
|
||||||
|
formatter = logging.Formatter("%(asctime)s - %(name)s - %(levelname)s - %(message)s")
|
||||||
|
handler.setFormatter(formatter)
|
||||||
|
logger.addHandler(handler)
|
||||||
|
|
||||||
# *=========================================== Initializations
|
# *=========================================== Initializations
|
||||||
intents = discord.Intents.default()
|
intents = discord.Intents.default()
|
||||||
@@ -27,18 +39,11 @@ intents.presences = True
|
|||||||
intents.members = True
|
intents.members = True
|
||||||
intents.messages = True
|
intents.messages = True
|
||||||
intents.voice_states = True
|
intents.voice_states = True
|
||||||
logger = logging.getLogger("discord")
|
intents.moderation = True
|
||||||
logger.setLevel(logging.DEBUG)
|
|
||||||
handler = handlers.RotatingFileHandler(
|
# on_member_ban - wyswietl na glownym kanale pieczatke "Niech spierdala"
|
||||||
filename=LOGFILE,
|
# on_member_unban - "mam wyjebane"
|
||||||
encoding=ENCODING,
|
|
||||||
mode="a",
|
|
||||||
maxBytes=6 * 1024 * 1024,
|
|
||||||
backupCount=6,
|
|
||||||
)
|
|
||||||
formatter = logging.Formatter("%(asctime)s - %(name)s - %(levelname)s - %(message)s")
|
|
||||||
handler.setFormatter(formatter)
|
|
||||||
logger.addHandler(handler)
|
|
||||||
random.seed()
|
random.seed()
|
||||||
client = commands.Bot(intents=intents, command_prefix="$")
|
client = commands.Bot(intents=intents, command_prefix="$")
|
||||||
|
|
||||||
@@ -47,8 +52,12 @@ client = commands.Bot(intents=intents, command_prefix="$")
|
|||||||
@client.event
|
@client.event
|
||||||
async def on_ready():
|
async def on_ready():
|
||||||
"""Metoda wywoływana przy połączeniu do serwera."""
|
"""Metoda wywoływana przy połączeniu do serwera."""
|
||||||
logger.debug("%s has connected to Discord!", client.user)
|
logger = logging.getLogger("discord")
|
||||||
|
logger.debug("SAMPLE DEBUG LOG")
|
||||||
|
logger.info("%s has connected to Discord!", client.user)
|
||||||
# TODO: load vs reload
|
# TODO: load vs reload
|
||||||
|
logger.info("Reactor: online")
|
||||||
|
|
||||||
await client.load_extension("administration_commands")
|
await client.load_extension("administration_commands")
|
||||||
|
|
||||||
await client.load_extension("librarian_commands")
|
await client.load_extension("librarian_commands")
|
||||||
@@ -59,16 +68,17 @@ async def on_ready():
|
|||||||
|
|
||||||
await client.load_extension("other_commands")
|
await client.load_extension("other_commands")
|
||||||
await client.load_extension("voice_recognition_commands")
|
await client.load_extension("voice_recognition_commands")
|
||||||
|
await client.load_extension("file_search_commands")
|
||||||
|
logger.info("Sensors: online")
|
||||||
|
|
||||||
logger.info(client.cogs)
|
logger.info(client.cogs)
|
||||||
await client.change_presence(activity=discord.Game(name="Axe Throwing Darts"))
|
|
||||||
await client.tree.sync()
|
await client.tree.sync()
|
||||||
for com in client.commands:
|
for com in client.commands:
|
||||||
logger.info("Command %s is awejleble", com.qualified_name)
|
logger.info("Command %s is awejleble", com.qualified_name)
|
||||||
|
|
||||||
|
logger.info("Logged in as ----> %s", client.user)
|
||||||
# TODO: ADMINISTRATION
|
logger.info("ID:%s ", client.user.id)
|
||||||
|
logger.info("All systems: operational")
|
||||||
|
|
||||||
|
|
||||||
# *================================== Run
|
# *================================== Run
|
||||||
@@ -76,7 +86,7 @@ if __name__ == "__main__":
|
|||||||
logger.info("Starting discord bot")
|
logger.info("Starting discord bot")
|
||||||
threads = []
|
threads = []
|
||||||
logger.info("Starting discord bot: Creating threads")
|
logger.info("Starting discord bot: Creating threads")
|
||||||
threads.append(threading.Thread(target=client.run, args=(TOKEN,)))
|
threads.append(threading.Thread(target=client.run, args=(TOKEN,),kwargs={"log_handler":None}))
|
||||||
threads.append(threading.Thread(target=comm_subroutine))
|
threads.append(threading.Thread(target=comm_subroutine))
|
||||||
logger.info("Starting discord bot: Starting threads")
|
logger.info("Starting discord bot: Starting threads")
|
||||||
WRK_CNT = 0
|
WRK_CNT = 0
|
||||||
|
|||||||
@@ -161,6 +161,7 @@ class Transcriber(commands.Cog):
|
|||||||
self.logger = logging.getLogger("discord")
|
self.logger = logging.getLogger("discord")
|
||||||
|
|
||||||
@commands.hybrid_command(name="transcribe")
|
@commands.hybrid_command(name="transcribe")
|
||||||
|
@commands.has_any_role('Nocna Zmiana', 'Jarl', 'Thane' , 'Bartender')
|
||||||
async def test(self, ctx):
|
async def test(self, ctx):
|
||||||
if self.vc:
|
if self.vc:
|
||||||
vc = self.vc # to juz powinien byc voice channel z funkcja conenct
|
vc = self.vc # to juz powinien byc voice channel z funkcja conenct
|
||||||
@@ -231,6 +232,7 @@ class Transcriber(commands.Cog):
|
|||||||
self.logger.debug("After %s", after)
|
self.logger.debug("After %s", after)
|
||||||
|
|
||||||
@commands.command(name="stop_transcribe")
|
@commands.command(name="stop_transcribe")
|
||||||
|
@commands.has_any_role('Nocna Zmiana', 'Jarl', 'Thane' , 'Bartender')
|
||||||
async def stop(self, ctx):
|
async def stop(self, ctx):
|
||||||
self.check_data.stop()
|
self.check_data.stop()
|
||||||
stop_token = CommunicationObject("STOP", None, None)
|
stop_token = CommunicationObject("STOP", None, None)
|
||||||
|
|||||||
Executable
+63
@@ -0,0 +1,63 @@
|
|||||||
|
import os
|
||||||
|
import time
|
||||||
|
import shutil
|
||||||
|
from datetime import datetime, date
|
||||||
|
import hashlib
|
||||||
|
import subprocess
|
||||||
|
|
||||||
|
# File paths
|
||||||
|
SOURCE_FILE = "/home/pi/Conjurer/script.params"
|
||||||
|
BACKUP_DIR = "/home/pi/Conjurer"
|
||||||
|
GIT_REPO_DIR = "/home/pi/conjurer/conjurer_musician"
|
||||||
|
LAST_HASH_FILE = "/home/pi/Conjurer/.last_hash"
|
||||||
|
LAST_GIT_COMMIT_FILE = "/home/pi/Conjurer/.last_git_commit"
|
||||||
|
|
||||||
|
def compute_file_hash(filepath):
|
||||||
|
with open(filepath, 'rb') as f:
|
||||||
|
return hashlib.sha256(f.read()).hexdigest()
|
||||||
|
|
||||||
|
def backup_file():
|
||||||
|
timestamp = datetime.now().strftime('%Y%m%d_%H%M%S')
|
||||||
|
backup_path = os.path.join(BACKUP_DIR, f"{timestamp}_script.params")
|
||||||
|
shutil.copy2(SOURCE_FILE, backup_path)
|
||||||
|
|
||||||
|
def commit_to_git():
|
||||||
|
try:
|
||||||
|
subprocess.run(["cp", SOURCE_FILE, os.path.join(GIT_REPO_DIR, "script.params")], check=True)
|
||||||
|
subprocess.run(["git", "-C", GIT_REPO_DIR, "add", "script.params"], check=True)
|
||||||
|
subprocess.run(["git", "-C", GIT_REPO_DIR, "commit", "-m", f"Daily update: {datetime.now()}"], check=True)
|
||||||
|
subprocess.run(["git", "-C", GIT_REPO_DIR, "push"], check=True)
|
||||||
|
except subprocess.CalledProcessError as e:
|
||||||
|
print(f"Git operation failed: {e}")
|
||||||
|
|
||||||
|
def main():
|
||||||
|
if not os.path.exists(SOURCE_FILE):
|
||||||
|
return
|
||||||
|
|
||||||
|
current_hash = compute_file_hash(SOURCE_FILE)
|
||||||
|
|
||||||
|
# Detect change
|
||||||
|
last_hash = None
|
||||||
|
if os.path.exists(LAST_HASH_FILE):
|
||||||
|
with open(LAST_HASH_FILE, 'r') as f:
|
||||||
|
last_hash = f.read().strip()
|
||||||
|
|
||||||
|
if current_hash != last_hash:
|
||||||
|
backup_file()
|
||||||
|
with open(LAST_HASH_FILE, 'w') as f:
|
||||||
|
f.write(current_hash)
|
||||||
|
|
||||||
|
# Daily git commit
|
||||||
|
today = str(date.today())
|
||||||
|
last_commit_date = ""
|
||||||
|
if os.path.exists(LAST_GIT_COMMIT_FILE):
|
||||||
|
with open(LAST_GIT_COMMIT_FILE, 'r') as f:
|
||||||
|
last_commit_date = f.read().strip()
|
||||||
|
|
||||||
|
if today != last_commit_date:
|
||||||
|
commit_to_git()
|
||||||
|
with open(LAST_GIT_COMMIT_FILE, 'w') as f:
|
||||||
|
f.write(today)
|
||||||
|
|
||||||
|
if __name__ == "__main__":
|
||||||
|
main()
|
||||||
Binary file not shown.
|
After Width: | Height: | Size: 39 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 22 KiB |
Reference in New Issue
Block a user