Compare commits

...

46 Commits

Author SHA1 Message Date
gitea 9f262e5d2f Two util scripts 2025-08-16 21:55:41 +02:00
gitea ba80523d6c aaa 2025-08-16 20:19:37 +02:00
gitea af20f6128c Figure out 2025-08-16 20:16:58 +02:00
gitea 92f2992b97 rollback 2025-08-16 19:16:03 +02:00
gitea ab1ebed5f4 upgrade 2025-08-16 19:12:47 +02:00
gitea 6dc4c9d1b3 disable exc masking 2025-08-16 19:03:13 +02:00
gitea c49615aab6 debug 2025-08-16 18:56:34 +02:00
gitea 340a2e706b debug 2025-08-16 18:55:07 +02:00
gitea 5204c257cf tectonic 2025-08-16 18:49:51 +02:00
gitea 3126ad5266 don't trust ai 2025-08-16 18:19:11 +02:00
gitea 2fa4771b54 fx to fx 2025-08-16 18:10:51 +02:00
gitea dd869cef36 var fx 2025-08-16 18:10:07 +02:00
gitea 62b4046366 installer fix 2025-08-16 18:00:16 +02:00
gitea f0bd6c4015 Latex incoming changes 2025-08-16 17:54:06 +02:00
gitea 6cc43ed16d fx and upgd 2025-08-16 17:36:57 +02:00
gitea 5b8d1ebb27 bgfx 2025-08-16 17:29:30 +02:00
gitea c0326288ff Added the following changes to the codebase: 2025-08-16 17:26:15 +02:00
gitea 97f43bc6a7 Update AI and librarian commands to use 'GENERAL' context" 2025-08-16 16:58:28 +02:00
gitea b52e9be5f9 Merge branch 'main' of https://github.com/migatu/conjurer 2025-08-15 19:31:38 +02:00
gitea cae1f48035 RPG 2025-08-15 19:31:22 +02:00
gitea 1f5b678139 small fixes 2025-05-04 21:15:28 +02:00
gitea b778a1c3f9 Watcher 2025-05-04 16:15:45 +02:00
gitea 074452e6a9 Params of radio 2025-05-03 16:41:22 +02:00
gitea 7edd60c10a zmiana nazwy 2025-05-02 20:20:15 +02:00
gitea c7af223155 fix deploy 2025-05-02 20:12:33 +02:00
gitea a79aa4e9a7 fix 2025-05-02 20:10:18 +02:00
gitea d0c972c69b M 2025-05-02 20:09:11 +02:00
gitea 78c958e8f5 added server side search 2025-05-02 19:55:52 +02:00
gitea 3ee7fcab59 serverside 2025-05-02 19:55:52 +02:00
gitea 75932ec507 Search client 2025-05-02 19:54:08 +02:00
gitea ee84d6ec32 more work needed 2025-05-02 19:17:27 +02:00
gitea a8001ec19d new function 2025-05-02 19:01:51 +02:00
gitea 95cd4760b7 Generated scripts 2025-04-26 13:18:02 +02:00
gitea 0297527965 install manual 2025-04-19 17:16:28 +02:00
gitea f56935e48b How to setup radio 2025-04-19 17:15:11 +02:00
gitea b9e0f73534 Fix in default config 2025-04-18 13:45:33 +02:00
gitea 7f560decd3 Add musician fixes 2025-04-17 22:59:47 +02:00
gitea 88fdf35dc5 fixx 2025-04-17 21:51:30 +02:00
gitea b4fe6270a9 Fixes after reinstall 2025-04-17 20:44:39 +02:00
gitea c103b6b22e Modified spotipy for auth 2025-04-09 18:21:37 +01:00
gitea 0e860fe6a9 Add auth to ytdlp 2025-04-09 18:55:52 +02:00
gitea 894235569e bgfx: 2025-02-24 22:12:22 +01:00
gitea fdccde6137 refactor: comment out unused AutoIndex import and related code 2025-02-08 13:25:46 +01:00
gitea 043b1d3628 Fix 2025-01-31 20:16:43 +01:00
gitea afc5c42e30 of course fix needed 2025-01-31 20:15:21 +01:00
gitea 74b7c22b6c New command added that sets logging level dymnamically 2025-01-31 20:13:47 +01:00
56 changed files with 1965 additions and 218 deletions
+2 -2
View File
@@ -294,7 +294,7 @@ class Events(commands.Cog):
bartender, bartender,
MESSAGE_TABLE, MESSAGE_TABLE,
username, username,
"CONVERSATION", "GENERAL",
) )
await discord_friendly_reply(message, result) await discord_friendly_reply(message, result)
@@ -332,7 +332,7 @@ class Events(commands.Cog):
True, True,
MESSAGE_TABLE, MESSAGE_TABLE,
username, username,
"RANDOM", "GENERAL",
) )
await discord_friendly_reply( await discord_friendly_reply(
message, 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}"
+117 -74
View File
@@ -5,6 +5,7 @@ import random
import openai import openai
import tiktoken import tiktoken
import time
from other_functions import discord_friendly_send from other_functions import discord_friendly_send
from constants import ( from constants import (
ASSISTANTS, ASSISTANTS,
@@ -23,6 +24,39 @@ from constants import (
#this do per user #this do per user
VECTOR_STORE_ID = -1 VECTOR_STORE_ID = -1
async def _openai_call(messages, model, temperature=0.2):
"""
Responses API dla 4o/4.1*, fallback Chat Completions dla gpt-3.5-turbo.
Zwraca czysty string odpowiedzi.
"""
logger = logging.getLogger("discord")
if model.startswith("gpt-3.5"):
logger.info("3.5")
# legacy path bez zmian w Twoim kodzie wyżej/niżej
resp = await OPENAICLIENT.chat.completions.create(
model=model,
messages=messages,
temperature=temperature,
)
result = ""
for choice in resp.choices:
result += choice.message.content
return result.strip()
else:
logger.info("4.0+")
# Responses API (zalecane dla 4o/4.1*)
resp = await OPENAICLIENT.responses.create(
model=model,
temperature=temperature,
input=messages,
)
# SDK zapewnia output_text dla zwykłych odpowiedzi
return (getattr(resp.output_text, "output_text", None) or "").strip() or str(resp.output_text)
def create_vector_store(): def create_vector_store():
# Create a vector store caled "Financial Statements" # Create a vector store caled "Financial Statements"
return OPENAICLIENT.beta.vector_stores.create_and_poll(name="Hammer Stash") return OPENAICLIENT.beta.vector_stores.create_and_poll(name="Hammer Stash")
@@ -99,7 +133,7 @@ def num_tokens_from_string(message, model):
async def handle_response( async def handle_response(
prompt, vykidailo, bartender, history, username, request_type prompt, vykidailo, bartender, history, username, request_type, algorithm="gpt-4o", none_request=""
): ):
""" """
Handle responses by appending them to a history, use OpenAI to Handle responses by appending them to a history, use OpenAI to
@@ -115,6 +149,10 @@ async def handle_response(
:param music: The "music" parameter is a boolean value that indicates whether the conversation is :param music: The "music" parameter is a boolean value that indicates whether the conversation is
related to music or not. If it is True, the conversation history will be stored in a different file related to music or not. If it is True, the conversation history will be stored in a different file
and the response will be generated using a different model and the response will be generated using a different model
:param request_type: The type of request being made, which can be "MUSIC", "RANDOM", "NONE" or "GENERAL"
GENERAL is for regular conversations, MUSIC is for music-related requests,
RANDOM is for random requests, and NONE is to not store the request in memory
:param algorithm: The algorithm to be used for generating the response, default is "gpt-4o"
: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`.
""" """
logger = logging.getLogger("discord") logger = logging.getLogger("discord")
@@ -141,7 +179,7 @@ async def handle_response(
file_memory.seek(0) file_memory.seek(0)
# convert back to json. # convert back to json.
json.dump(file_data, file_memory, indent=4) json.dump(file_data, file_memory, indent=4)
else: elif request_type == "GENERAL":
with open(MEMORY_FIVE_SIARA, "r+", encoding=ENCODING) as file_memory: with open(MEMORY_FIVE_SIARA, "r+", encoding=ENCODING) as file_memory:
# First we load existing data into a dict. # First we load existing data into a dict.
file_data = json.load(file_memory) file_data = json.load(file_memory)
@@ -151,69 +189,79 @@ async def handle_response(
# convert back to json. # convert back to json.
json.dump(file_data, file_memory, indent=4) json.dump(file_data, file_memory, indent=4)
history = [] history = []
history.append(GPT_SETTINGS[0]) if request_type != "NONE":
chat_gpt_config_request_size = num_tokens_from_string(GPT_SETTINGS[0], "gpt-4") history.append(GPT_SETTINGS[0])
chat_gpt_config_request_size = num_tokens_from_string(GPT_SETTINGS[0], "gpt-4")
for slowo, reakcja in WORD_REACTIONS.items(): for slowo, reakcja in WORD_REACTIONS.items():
if not reakcja[3]: if not reakcja[3]:
content = ( content = (
"Kiedy słyszysz " "Kiedy słyszysz "
+ slowo + slowo
+ " to reagujesz lub dzieje się to " + " to reagujesz lub dzieje się to "
+ reakcja[0] + reakcja[0]
) )
temp = {"role": "system", "content": content} temp = {"role": "system", "content": content}
chat_gpt_config_request_size += num_tokens_from_string(temp, "gpt-4") chat_gpt_config_request_size += num_tokens_from_string(temp, "gpt-4")
history.append(temp) history.append(temp)
final_prompt = username + ":" + prompt final_prompt = username + ":" + prompt
logger.debug(
"Rozmiar zapytania przed dodaniem historii %s", chat_gpt_config_request_size
)
if request_type == "MUSIC":
algorithm = "gpt-4o"
table = MESSAGE_TABLE_MUZYKA
token_amount = 10700
elif request_type == "RANDOM":
algorithm = "gpt-4o"
table = MESSAGE_TABLE
token_amount = 10700
else:
table = MESSAGE_TABLE
algorithm = "gpt-4o"
token_amount = 10700
prompt_gpt_request_size = num_tokens_from_string(
{"role": "user", "content": final_prompt}, "gpt-4"
)
temptable = []
for i in reversed(table):
temp_token = num_tokens_from_string(i, "gpt-4")
logger.debug( logger.debug(
"Rozmiar zapytania %s prompt %s temp %s", "Rozmiar zapytania przed dodaniem historii %s", chat_gpt_config_request_size
chat_gpt_config_request_size,
prompt_gpt_request_size,
temp_token,
) )
if ( if request_type == "MUSIC":
chat_gpt_config_request_size table = MESSAGE_TABLE_MUZYKA
< token_amount + prompt_gpt_request_size + temp_token token_amount = 10700
): elif request_type == "RANDOM":
temptable.insert(1, i) table = MESSAGE_TABLE
chat_gpt_config_request_size += temp_token token_amount = 10700
history.extend(temptable) elif request_type == "GENERAL":
temp = {"role": "user", "content": final_prompt} table = MESSAGE_TABLE
history.append(temp) token_amount = 10700
else:
table = []
token_amount = 10000
prompt_gpt_request_size = num_tokens_from_string(
{"role": "user", "content": final_prompt}, "gpt-4"
)
temptable = []
for i in reversed(table):
temp_token = num_tokens_from_string(i, "gpt-4")
logger.debug(
"Rozmiar zapytania %s prompt %s temp %s",
chat_gpt_config_request_size,
prompt_gpt_request_size,
temp_token,
)
if (
chat_gpt_config_request_size
< token_amount + prompt_gpt_request_size + temp_token
):
temptable.insert(1, i)
chat_gpt_config_request_size += temp_token
history.extend(temptable)
temp = {"role": "user", "content": final_prompt}
history.append(temp)
else:
history = none_request
logger.info("Rozmiar zapytania po wyslaniu %s", chat_gpt_config_request_size) logger.info("Rozmiar zapytania po wyslaniu %s", chat_gpt_config_request_size)
try: try:
response = await OPENAICLIENT.chat.completions.create( # ...przygotowanie messages/system prompt/itp. jak masz...
model=algorithm, messages=history # retry/backoff + deadline (zachowuje Twoją semantykę logowania)
timeout_sec = 120
deadline = time.time() + timeout_sec
response = await asyncio.wait_for(
_openai_call(messages=history, model=algorithm),
timeout=max(0.1, deadline - time.time())
) )
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
result = 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}" response = 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:
result = 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}" response = 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
resp, _ = await handle_response( resp, _ = await handle_response(
@@ -224,7 +272,7 @@ async def handle_response(
username, username,
"RANDOM", "RANDOM",
) )
result = f"Sorki, cenzura: {resp}. Jak chcesz to są kanały na nudle #sexy-foteczky i #kanal-do-fapania *Na ekranie pojawia się: {e}" response = 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.APIResponseValidationError as e: except openai.APIResponseValidationError as e:
# Handle invalid request error, e.g. validate parameters or log # Handle invalid request error, e.g. validate parameters or log
resp, _ = await handle_response( resp, _ = await handle_response(
@@ -235,33 +283,25 @@ async def handle_response(
username, username,
"RANDOM", "RANDOM",
) )
result = f"Sorki, cenzura: {resp}. Jak chcesz to są kanały na nudle #sexy-foteczky i #kanal-do-fapania *Na ekranie pojawia się: {e}" response = 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
result = 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}" response = 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
result = 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}" response = 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:
result = f"*Kondziu patrzy na terminal* Wołaj szefa. Zapłacić rachunki za AI trzeba. Jak chcesz to się na #zebranie dorzuć. {e}" response = f"*Kondziu patrzy na terminal* Wołaj szefa. Zapłacić rachunki za AI trzeba. Jak chcesz to się na #zebranie dorzuć. {e}"
except openai.UnprocessableEntityError as e: except openai.UnprocessableEntityError as e:
result = f"*Kondziu patrzy na terminal. Potem na to co każesz mu wysłać....* Ja wiem że jesteśmy w barze BDSM - ale nie da się włożyć TEGO w TO. *Za jego plecami na terminalu pojawia się:* {e}" response = f"*Kondziu patrzy na terminal. Potem na to co każesz mu wysłać....* Ja wiem że jesteśmy w barze BDSM - ale nie da się włożyć TEGO w TO. *Za jego plecami na terminalu pojawia się:* {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
result = f"*Kondziu nurkuje za bar, terminal wybucha. Przed tobą ląduje pergamin zapisany pięknym gotykiem a na nim*: {e}" response = f"*Kondziu nurkuje za bar, terminal wybucha. Przed tobą ląduje pergamin zapisany pięknym gotykiem a na nim*: {e}"
logger.info("Historia wysłana:") logger.info("Historia wysłana:")
logger.info(history) logger.info(history)
await asyncio.sleep(15) await asyncio.sleep(15)
result = "" temp = {"role": "assistant", "content": response}
logger.debug("Odpowiedzi")
logger.info(response)
logger.debug(response.choices)
for choice in response.choices:
result += choice.message.content
logger.info("Sformatowane odpowiedzi")
logger.info(result)
temp = {"role": "assistant", "content": result}
history.append(temp) history.append(temp)
if request_type == "MUSIC": if request_type == "MUSIC":
with open(MEMORY_FIVE_MUZYKA, "r+", encoding=ENCODING) as file_music_memory: with open(MEMORY_FIVE_MUZYKA, "r+", encoding=ENCODING) as file_music_memory:
@@ -272,6 +312,7 @@ async def handle_response(
file_music_memory.seek(0) file_music_memory.seek(0)
# convert back to json. # convert back to json.
json.dump(file_data, file_music_memory, indent=4) json.dump(file_data, file_music_memory, indent=4)
return response, MESSAGE_TABLE_MUZYKA
elif request_type == "RANDOM": elif request_type == "RANDOM":
with open(MEMORY_FIVE_SIARA, "r+", encoding=ENCODING) as file_memory: with open(MEMORY_FIVE_SIARA, "r+", encoding=ENCODING) as file_memory:
# First we load existing data into a dict. # First we load existing data into a dict.
@@ -281,7 +322,8 @@ async def handle_response(
file_memory.seek(0) file_memory.seek(0)
# convert back to json. # convert back to json.
json.dump(file_data, file_memory, indent=4) json.dump(file_data, file_memory, indent=4)
else: return response, MESSAGE_TABLE
elif request_type == "GENERAL":
with open(MEMORY_FIVE_SIARA, "r+", encoding=ENCODING) as file_memory: with open(MEMORY_FIVE_SIARA, "r+", encoding=ENCODING) as file_memory:
# First we load existing data into a dict. # First we load existing data into a dict.
file_data = json.load(file_memory) file_data = json.load(file_memory)
@@ -290,8 +332,9 @@ async def handle_response(
file_memory.seek(0) file_memory.seek(0)
# convert back to json. # convert back to json.
json.dump(file_data, file_memory, indent=4) json.dump(file_data, file_memory, indent=4)
return result, MESSAGE_TABLE return response, MESSAGE_TABLE
else:
return response, []
async def get_random_cyclic_message(client): async def get_random_cyclic_message(client):
""" """
+36 -4
View File
@@ -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
@@ -29,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"
@@ -48,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"
@@ -332,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():
""" """
@@ -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
@@ -0,0 +1,9 @@
/home/pi/Conjurer/radio_log.log {
daily
rotate 7
compress
delaycompress
missingok
notifempty
copytruncate
}
+21 -6
View File
@@ -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,7 +68,8 @@ 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)
@@ -87,7 +104,7 @@ s = blank.skip(max_blank=10., s)
live_enabled = interactive.bool("Going Live!", true) live_enabled = interactive.bool("Going Live!", true)
s = add([mic,s]) s = add([mic,s])
s=switch(track_sensitive=false, s=switch(track_sensitive=true,
[(live_enabled, mic), [(live_enabled, mic),
({true}, s)]) ({true}, s)])
@@ -102,9 +119,8 @@ 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
@@ -138,8 +154,7 @@ interactive.persistent("script.params")
# Configure output formats and destinations # Configure output formats and destinations
output.icecast(%mp3, host="radio", port=8000, password=credentials.password, icy_metadata="true", mount="mp3-stream", radio)
output.icecast(%mp3, host="retropie", 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
+2 -1
View File
@@ -1,3 +1,4 @@
flask flask
waitress waitress
sshtunnel sshtunnel
requests
+99
View File
@@ -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()
+44
View File
@@ -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()
+6
View File
@@ -0,0 +1,6 @@
[Unit]
Description=Oneshot scan of /mnt/shares → JSON
[Service]
Type=oneshot
ExecStart=/usr/local/bin/scan_shares.py
+11
View File
@@ -0,0 +1,11 @@
[Unit]
Description=Hourly timer for sharescanner
[Timer]
# delay 2min after boot, then every hour
OnBootSec=20min
OnUnitActiveSec=24h
Unit=scan_shares.service
[Install]
WantedBy=timers.target
+195
View File
@@ -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
]
]
}
+93
View File
@@ -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()
+18 -4
View File
@@ -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"]
@@ -137,3 +140,14 @@ with open(MEMORY_FIVE_MUZYKA, "r+", encoding=ENCODING) as temp_music_memory_file
MESSAGE_TABLE_MUZYKA = json.load(temp_music_memory_file) MESSAGE_TABLE_MUZYKA = json.load(temp_music_memory_file)
SPECJALNE_ZIEMNIACZKI = GPT_SETTINGS[1] SPECJALNE_ZIEMNIACZKI = GPT_SETTINGS[1]
ASSISTANTS = {} ASSISTANTS = {}
LATEX_TEX_ENGINE = "tectonic"
LATEX_MAX_COMPILE_SECONDS = 45
LATEX_MAX_ATTACH_MB = 8
LATEX_MAX_ZIP_MB = 25
OPENAI_MODEL = "gpt-4o-mini"
ALLOWED_ROLES = ["Nocna Zmiana", "Jarl", "Thane", "Bartender"]
GUILD_ID = 664789470779932693
+18 -2
View File
@@ -1,6 +1,6 @@
#!/bin/bash #!/bin/bash
total_commands=24 total_commands=29
current_command=0 current_command=0
function print_progress { function print_progress {
@@ -79,8 +79,24 @@ 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/" 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/latex_commands.py ./Conjurer/
print_progress "cp ./conjurer/latex_commands.py ./Conjurer/"
cp ./conjurer/latex_functions.py ./Conjurer/
print_progress "cp ./conjurer/latex_functions.py ./Conjurer/"
cp ./conjurer/librarian_functions.py ./Conjurer
print_progress "cp ./conjurer/librarian_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" 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" print_progress "sudo systemctl restart conjurer.service"
+2 -1
View File
@@ -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
+40
View File
@@ -0,0 +1,40 @@
#!/usr/bin/env bash
set -euo pipefail
exists() { command -v "$1" >/dev/null 2>&1; }
echo "[i] Checking environment..."
for c in fc-list pdffonts tectonic; do
if ! exists "$c"; then
echo " - $c: NOT FOUND (optional but recommended: sudo apt install -y fontconfig poppler-utils tectonic)"
else
echo " - $c: OK"
fi
done
echo "[i] Listing local ./fonts content:"
ls -l ./fonts 2>/dev/null || echo " (no ./fonts directory)"
if exists fc-list; then
echo "[i] System fonts (grep Garamond|Cinzel|FELL):"
fc-list | grep -Ei "Garamond|Cinzel|Fell" || echo " (none found in system)"
fi
pdfs=(dj_cheat_sheet_transitions.pdf dj_tracklist.pdf dj_mini_sheet.pdf dj_notes.pdf dj_setup_mapping.pdf dj_one_laptop_fallback.pdf dj_rider.pdf dj_podrecznik.pdf)
if exists pdffonts; then
for p in "${pdfs[@]}"; do
[ -f "$p" ] || continue
echo "[i] Fonts embedded in $p:"
pdffonts "$p" || true
done
else
echo "[!] pdffonts not installed; cannot list embedded fonts."
fi
echo "[i] Grepping last Tectonic log (if any .log files exist)..."
logs=$(ls -1 *.log 2>/dev/null || true)
if [ -n "$logs" ]; then
grep -Ei "fontspec|warning|not found" *.log || echo " (no relevant warnings)"
else
echo " (no .log files)"
fi
+40
View File
@@ -0,0 +1,40 @@
#!/usr/bin/env bash
set -euo pipefail
need() { command -v "$1" >/dev/null 2>&1 || { echo "Missing: $1" >&2; exit 1; }; }
echo "[+] Checking tools..."
need wget
need unzip
need tectonic || { echo "Install tectonic first (e.g. sudo apt install tectonic)"; exit 1; }
mkdir -p fonts
echo "[+] Downloading EB Garamond (Initials) to ./fonts ..."
tmpzip="/tmp/ebgaramond.zip"
wget -q -O "$tmpzip" https://github.com/octaviopardo/EBGaramond/releases/download/v0.016/EBGaramond-ttf.zip
unzip -jq "$tmpzip" "*Initials*.ttf" -d fonts
ls -1 fonts | grep -i initials || echo "WARN: EBGaramond Initials not found in zip?"
echo "[+] Downloading Cinzel Decorative (Black) to ./fonts ..."
tmpzip="/tmp/cinzel.zip"
wget -q -O "$tmpzip" "https://fonts.google.com/download?family=Cinzel%20Decorative" || true
unzip -jq "$tmpzip" "*Decorative-Black*.ttf" -d fonts || echo "WARN: Cinzel Decorative Black not found; continuing."
echo "[+] (Optional) Downloading IM FELL English SC to ./fonts ..."
tmpzip="/tmp/imfell.zip"
wget -q -O "$tmpzip" "https://fonts.google.com/download?family=IM%20Fell%20English%20SC" || true
unzip -jq "$tmpzip" "*.ttf" -d fonts || echo "INFO: IM FELL SC optional; skip if not needed."
echo "[+] Building PDFs with Tectonic..."
for f in dj_cheat_sheet_transitions.tex dj_tracklist.tex dj_mini_sheet.tex dj_notes.tex dj_setup_mapping.tex dj_one_laptop_fallback.tex dj_rider.tex dj_podrecznik.tex; do
if [ -f "$f" ]; then
echo " -> $f"
tectonic "$f" >/dev/null
else
echo "SKIP: $f not found"
fi
done
echo "[+] Done. Generated PDFs:"
ls -1 *.pdf 2>/dev/null || true
+3
View File
@@ -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
+71
View File
@@ -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))
+31
View File
@@ -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', [])
+11 -9
View File
@@ -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/
+6 -2
View File
@@ -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
+142
View File
@@ -0,0 +1,142 @@
# latex_commands.py
# -*- coding: utf-8 -*-
from __future__ import annotations
import io
from typing import Optional, List
import logging
import discord
from discord import app_commands
from discord.ext import commands
from constants import (
LATEX_TEX_ENGINE, LATEX_MAX_COMPILE_SECONDS, LATEX_MAX_ATTACH_MB, LATEX_MAX_ZIP_MB,
OPENAI_MODEL, ALLOWED_ROLES, GUILD_ID
)
from latex_functions import (
is_tex_attachment, compile_single_tex_bytes, compile_zip_to_zip, ask_openai_diagnosis
)
class LatexModule(commands.Cog):
def __init__(self, bot: commands.Bot, logger_name: str):
self.bot = bot
self.logger = logging.getLogger(logger_name)
self.logger_name = logger_name
# -------- /tex (PDF + diagnoza; log -> debug logger) --------
@commands.hybrid_command(
nsfw=False,
name="tex",
description="Kompiluje załączone .tex; PDF-y odsyła. Błędy: diagnoza z OpenAI.",
guild=None if GUILD_ID is None else discord.Object(id=GUILD_ID),
)
@commands.has_any_role(*ALLOWED_ROLES)
async def tex(self, ctx: commands.Context, include_source_excerpt: Optional[bool] = True):
self.logger.info("LaTeX command invoked by %s", ctx.author)
ch = ctx.message.channel
async with ch.typing():
atts = [a for a in (ctx.message.attachments or []) if is_tex_attachment(a, LATEX_MAX_ATTACH_MB)]
if not atts:
return await ctx.reply(f"Dołącz .tex (≤{LATEX_MAX_ATTACH_MB} MiB).", mention_author=False)
self.logger.debug("LaTeX attachments: %s", ", ".join(a.filename for a in atts))
files: List[discord.File] = []
parts: List[str] = []
for att in atts:
try:
data = await att.read()
self.logger.info("LaTeX read %s bytes from %s", len(data), att.filename)
res = await compile_single_tex_bytes(data, att.filename, LATEX_TEX_ENGINE, LATEX_MAX_COMPILE_SECONDS, logger=self.logger_name)
self.logger.info("LaTeX result for %s: %s", att.filename, res)
self.logger.info("LaTeX log (%s)\n%s", att.filename, (res["log_text"] or "")[-2000:])
if res["ok"] and res["pdf_bytes"]:
b = io.BytesIO(res["pdf_bytes"])
b.seek(0)
b.name = res["pdf_name"]
files.append(discord.File(b, filename=res["pdf_name"]))
parts.append(f"✅ `{att.filename}` → `{res['pdf_name']}`")
else:
self.logger.info("LaTeX compile failed for %s", att.filename)
excerpt = ""
if include_source_excerpt:
try:
excerpt = data.decode("utf-8", errors="ignore")[:4000]
except Exception:
excerpt = ""
advice = await ask_openai_diagnosis(res["log_text"] or "", excerpt, OPENAI_MODEL, logger=self.logger_name)
parts.append(f"❌ `{att.filename}` — błąd kompilacji.\nDiagnoza:\n{advice}")
raise
except Exception as e:
self.logger.info("Exception %s: %s", att.filename, e)
parts.append(f"⚠️ `{att.filename}` — wyjątek (szczegóły w logu).")
raise
content = f"**LaTeX** — {len(atts)} plik(ów). Model: `{OPENAI_MODEL}`\n\n" + "\n\n".join(parts)
await ctx.reply(content if len(content)<1900 else content[:1900]+"", files=files, mention_author=False)
# -------- /latexclean (PDF only; log -> debug logger) --------
@commands.hybrid_command(
nsfw=False,
name="latexclean",
description="Kompiluje .tex i odsyła TYLKO PDF (log w debug).",
guild=None if GUILD_ID is None else discord.Object(id=GUILD_ID),
)
@commands.has_any_role(*ALLOWED_ROLES)
async def latexclean(self, ctx: commands.Context):
ch = ctx.message.channel
async with ch.typing():
atts = [a for a in (ctx.message.attachments or []) if is_tex_attachment(a, LATEX_MAX_ATTACH_MB)]
if not atts:
return await ctx.reply(f"Dołącz .tex (≤{LATEX_MAX_ATTACH_MB} MiB).", mention_author=False)
files: List[discord.File] = []
parts: List[str] = []
for att in atts:
try:
data = await att.read()
res = await compile_single_tex_bytes(data, att.filename, LATEX_TEX_ENGINE, LATEX_MAX_COMPILE_SECONDS, logger=self.logger_name)
self.logger.debug("LaTeX CLEAN (%s)\n%s", att.filename, (res["log_text"] or "")[-2000:])
if res["ok"] and res["pdf_bytes"]:
b = io.BytesIO(res["pdf_bytes"])
b.seek(0)
b.name = res["pdf_name"]
files.append(discord.File(b, filename=res["pdf_name"]))
parts.append(f"✅ `{att.filename}`")
else:
parts.append(f"❌ `{att.filename}` — błąd (log w debug).")
except Exception as e:
self.logger.debug("CLEAN exception %s: %s", att.filename, e)
parts.append(f"⚠️ `{att.filename}` — wyjątek (log w debug).")
raise
await ctx.reply("**LaTeX clean** — " + ", ".join(parts), files=files, mention_author=False)
# -------- /texbatch (ZIP -> ZIP) --------
@app_commands.command(
name="texbatch",
description="Wyślij ZIP z .tex → odeślę ZIP z PDF-ami (tylko udane)."
)
@app_commands.describe(archive=f"Archiwum .zip (max ~{LATEX_MAX_ZIP_MB} MiB)")
@app_commands.checks.has_any_role(*ALLOWED_ROLES)
async def texbatch(self, interaction: discord.Interaction, archive: discord.Attachment):
await interaction.response.defer()
if not archive or not archive.filename.lower().endswith(".zip"):
return await interaction.followup.send("Dołącz ZIP (.zip) z plikami .tex.", ephemeral=True)
if archive.size > LATEX_MAX_ZIP_MB * 1024 * 1024:
return await interaction.followup.send(f"ZIP > {LATEX_MAX_ZIP_MB} MiB — za duży.", ephemeral=True)
data = await archive.read()
out_zip_bytes, failed = await compile_zip_to_zip(data, LATEX_TEX_ENGINE, LATEX_MAX_COMPILE_SECONDS, logger=self.logger_name)
if not out_zip_bytes and failed:
return await interaction.followup.send("Brak PDF-ów. " + "; ".join(failed[:10]), ephemeral=True)
bio = io.BytesIO(out_zip_bytes)
bio.seek(0)
bio.name = "compiled_pdfs.zip"
if failed:
self.logger.debug("BATCH failed: %s", ", ".join(failed))
await interaction.followup.send("✅ Gotowe (ZIP w załączniku)." + (f" ❌ Błędy: {len(failed)}" if failed else ""), files=[discord.File(bio, filename=bio.name)])
async def setup(bot):
logger = logging.getLogger("discord")
await bot.add_cog(LatexModule(bot, logger_name="discord"))
logger.info("Loading kinky latex module done")
+233
View File
@@ -0,0 +1,233 @@
# latex_functions.py
# -*- coding: utf-8 -*-
from __future__ import annotations
import asyncio
import logging
import re
import tempfile
import zipfile
from pathlib import Path
from typing import Dict, List, Optional, Tuple
from ai_functions import handle_response
SAFE_TEX_NAME = re.compile(r"^[\w\-. ]+\.tex$", re.IGNORECASE)
def is_safe_tex_name(name: str) -> bool:
return bool(SAFE_TEX_NAME.match(name or "")) and name.lower().endswith(".tex")
def is_tex_attachment(att, max_mb: int) -> bool:
"""Filtruje discord.Attachment: tylko .tex + limit MB + nazwa bezpieczna."""
return bool(
getattr(att, "filename", "")
and is_safe_tex_name(att.filename)
and getattr(att, "size", 0) <= max_mb * 1024 * 1024
)
def _build_cmd(engine: str, tex_filename: str) -> list[str]:
base = (engine or "").strip().lower()
if base in ("pdflatex", "xelatex", "lualatex"):
return [
base,
"-interaction=nonstopmode",
"-halt-on-error",
"-file-line-error",
"-no-shell-escape",
tex_filename,
]
if base == "latexmk":
return [
"latexmk",
"-pdf",
"-interaction=nonstopmode",
"-halt-on-error",
"-file-line-error",
tex_filename,
]
if base == "tectonic":
return [
"tectonic",
"-X",
"compile",
"--keep-logs",
"--outdir",
".",
tex_filename,
]
return [
"pdflatex",
"-interaction=nonstopmode",
"-halt-on-error",
"-file-line-error",
"-no-shell-escape",
tex_filename,
]
async def run_latex_two_passes(
tex_filename: str,
workdir: Path,
tex_engine: str,
timeout_sec: int,
logger: str = None,
):
logger = logging.getLogger(logger) if logger else None
async def run_once(cmd: list[str]) -> tuple[int, str]:
proc = await asyncio.create_subprocess_exec(
*cmd,
cwd=str(workdir),
stdout=asyncio.subprocess.PIPE,
stderr=asyncio.subprocess.STDOUT,
)
try:
out_b, _ = await asyncio.wait_for(proc.communicate(), timeout=timeout_sec)
return (proc.returncode or 0), (out_b or b"").decode(
"utf-8", errors="replace"
)
except asyncio.TimeoutError:
try:
proc.kill()
except Exception:
raise
return 124, f"[Timeout] Compilation exceeded {timeout_sec}s.\n"
logs = []
cmd = _build_cmd(tex_engine, tex_filename)
if logger:
logger.debug("LaTeX cmd: %s (cwd=%s)", " ".join(cmd), workdir)
rc1, out1 = await run_once(cmd)
logs.append(out1)
second_pass = not ((tex_engine or "").strip().lower() == "tectonic")
if rc1 != 0:
log_text = "".join(logs)
pdf = workdir / (Path(tex_filename).stem + ".pdf")
return False, log_text, pdf
if second_pass:
rc2, out2 = await run_once(cmd)
logs.append(out2)
ok = rc2 == 0
else:
ok = rc1 == 0
log_text = "".join(logs)
pdf = workdir / (Path(tex_filename).stem + ".pdf")
ok = ok and pdf.exists()
return ok, log_text, pdf
async def compile_single_tex_bytes(
tex_bytes: bytes,
filename: str,
tex_engine: str,
timeout_sec: int,
logger: str = None,
) -> Dict[str, Optional[object]]:
if not is_safe_tex_name(filename):
return {
"ok": False,
"pdf_bytes": None,
"log_text": "Invalid .tex filename",
"pdf_name": None,
}
with tempfile.TemporaryDirectory(prefix="latex_one_") as td:
wd = Path(td)
tex_path = wd / filename
tex_path.write_bytes(tex_bytes)
ok, log_text, pdf_path = await run_latex_two_passes(
filename, wd, tex_engine, timeout_sec, logger=logger
)
if ok and pdf_path.exists():
return {
"ok": True,
"pdf_bytes": pdf_path.read_bytes(),
"log_text": log_text,
"pdf_name": pdf_path.name,
}
return {
"ok": False,
"pdf_bytes": None,
"log_text": log_text,
"pdf_name": pdf_path.name,
}
async def compile_zip_to_zip(
zip_bytes: bytes, tex_engine: str, timeout_sec: int, logger: str = None
) -> Tuple[bytes, List[str]]:
failed: List[str] = []
out_pdf_paths: List[Path] = []
with tempfile.TemporaryDirectory(prefix="latex_zip_") as td:
td_path = Path(td)
in_zip = td_path / "in.zip"
in_zip.write_bytes(zip_bytes)
extract_dir = td_path / "in"
extract_dir.mkdir(parents=True, exist_ok=True)
with zipfile.ZipFile(in_zip, "r") as zf:
zf.extractall(extract_dir)
tex_files = [p for p in extract_dir.rglob("*.tex") if is_safe_tex_name(p.name)]
if not tex_files:
return b"", ["No .tex files found in archive."]
for tex in tex_files:
try:
work = td_path / f"build_{tex.stem}"
work.mkdir(parents=True, exist_ok=True)
target_tex = work / tex.name
target_tex.write_bytes(tex.read_bytes())
ok, log_text, pdf_path = await run_latex_two_passes(
target_tex.name, work, tex_engine, timeout_sec, logger=logger
)
if ok and pdf_path.exists():
out_pdf_paths.append(pdf_path)
else:
failed.append(tex.name)
if logger:
logger.debug("BATCH FAIL %s\n%s", tex.name, log_text[-1500:])
except Exception as e:
failed.append(f"{tex.name} (exception: {e})")
if logger:
logger.debug("BATCH EXC %s: %s", tex.name, e)
raise
out_zip = td_path / "compiled_pdfs.zip"
with zipfile.ZipFile(out_zip, "w", compression=zipfile.ZIP_DEFLATED) as zf:
for pdf in out_pdf_paths:
zf.write(pdf, arcname=pdf.name)
return out_zip.read_bytes(), failed
async def ask_openai_diagnosis(
log_text: str, tex_excerpt: str, model: str, logger: str = None
) -> str:
logger = logging.getLogger(logger) if logger else None
sys = (
"You are a LaTeX build diagnostician. Analyze pdflatex log and return:\n"
"1) Root causes (bullets)\n2) Minimal working fix (code block)\n3) Alternative fix"
)
logger.debug("LaTeX DIAG (%s)\n%s", model, log_text[-9000:])
usr = f"---LOG---\n{log_text[-9000:]}\n---END LOG---"
if tex_excerpt:
usr += f"\n---TEX EXCERPT---\n{tex_excerpt[:4000]}\n---END EXCERPT---"
prompt = [{"role": sys, "content": "none"}, {"role": "user", "content": usr}]
response, _ = await handle_response(
prompt,
None,
None,
prompt,
"latex_diagnosis",
"NONE",
algorithm=model,
none_request=prompt,
)
return response
+30 -15
View File
@@ -8,6 +8,7 @@ from queue import Empty
import discord import discord
import pdf2image import pdf2image
import fitz
import PyPDF2 import PyPDF2
import requests import requests
from discord.ext import commands, tasks from discord.ext import commands, tasks
@@ -53,20 +54,34 @@ class DataModule(commands.Cog):
filename = res[random.randrange(0, len(res) - 1)] filename = res[random.randrange(0, len(res) - 1)]
# select random page # select random page
file = open(DIR_PATH_SADOX + filename, "rb") file = open(DIR_PATH_SADOX + filename, "rb")
readpdf = PyPDF2.PdfReader(file) if True:
totalpages = len(readpdf.pages) doc = fitz.open(DIR_PATH_SADOX + filename)
# trunk-ignore(bandit/B311) totalpages = len(doc)
page = random.randrange(1, totalpages) # trunk-ignore(bandit/B311)
# convert page to image page_index = random.randrange(0, totalpages)
image = pdf2image.convert_from_path( page = doc.load_page(page_index)
DIR_PATH_SADOX + filename, first_page=page, last_page=page mat = fitz.Matrix(2.0, 2.0) # powiększenie
) pix = page.get_pixmap(matrix=mat, alpha=False)
byte_io_stream = io.BytesIO()
image[0].save(byte_io_stream, "JPEG") byte_io_stream = io.BytesIO(pix.tobytes("png"))
byte_io_stream.seek(0) byte_io_stream.seek(0)
byte_io_stream.name = "image.jpg" byte_io_stream.name = "image.png"
file = discord.File(byte_io_stream) await ctx.send(file=discord.File(byte_io_stream))
await ctx.send(file=file) else: #legacy
readpdf = PyPDF2.PdfReader(file)
totalpages = len(readpdf.pages)
# trunk-ignore(bandit/B311)
page = random.randrange(1, totalpages)
# convert page to image
image = pdf2image.convert_from_path(
DIR_PATH_SADOX + filename, first_page=page, last_page=page
)
byte_io_stream = io.BytesIO()
image[0].save(byte_io_stream, "JPEG")
byte_io_stream.seek(0)
byte_io_stream.name = "image.jpg"
file = discord.File(byte_io_stream)
await ctx.send(file=file)
self.logger.info("Get sadox completed") self.logger.info("Get sadox completed")
@tasks.loop(seconds=3) @tasks.loop(seconds=3)
@@ -222,7 +237,7 @@ class DataModule(commands.Cog):
global MESSAGE_TABLE # pylint: disable=global-statement global MESSAGE_TABLE # pylint: disable=global-statement
result, MESSAGE_TABLE = await handle_response( result, MESSAGE_TABLE = await handle_response(
prompt, vykidailo, bartender, MESSAGE_TABLE, username, "CONVERSATION" prompt, vykidailo, bartender, MESSAGE_TABLE, username, "GENERAL"
) )
if len(result) < 1500: if len(result) < 1500:
await ctx.send(result) await ctx.send(result)
+28
View File
@@ -0,0 +1,28 @@
# pdf_render.py
import io
try:
import fitz # PyMuPDF
_HAS_PYMUPDF = True
except Exception:
_HAS_PYMUPDF = False
from pdf2image import convert_from_path
def pdf_page_to_image_bytes(path: str, page_index: int = 0, zoom: float = 2.0, fmt: str = "PNG") -> bytes:
"""
Zwraca bytes obrazka z jednej strony PDF:
- PyMuPDF (szybki) jeśli dostępny,
- inaczej pdf2image + poppler (wymaga 'pdftoppm').
page_index: 0-based
"""
if _HAS_PYMUPDF:
doc = fitz.open(path)
page = doc.load_page(page_index)
mat = fitz.Matrix(zoom, zoom)
pix = page.get_pixmap(matrix=mat, alpha=False)
return pix.tobytes(fmt.lower())
# fallback
images = convert_from_path(path, first_page=page_index+1, last_page=page_index+1, fmt=fmt)
bio = io.BytesIO()
images[0].save(bio, fmt)
return bio.getvalue()
+101
View File
@@ -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
+5 -1
View File
@@ -16,6 +16,7 @@ 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
@@ -161,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")
@@ -203,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",
@@ -258,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},
+16
View File
@@ -66,6 +66,22 @@ 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",
+11
View File
@@ -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
+2 -1
View File
@@ -13,8 +13,9 @@ spotipy
tiktoken tiktoken
PyNaCl PyNaCl
flask[async] flask[async]
PyMuPDF
waitress 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
+3
View File
@@ -0,0 +1,3 @@
name,type,locations,ap_head,ap_body,ap_larm,ap_rarm,ap_lleg,ap_rleg,max_ag,traits,weight,availability,source,notes
Flak Vest,armor,"Body",0,4,0,0,0,0,,Flak,7,Common,"DH2 CRB","PRZYKŁAD ZASTĄP"
Power Armour (Astartes),armor,"All",8,10,8,8,9,9,,Environmental; Auto-senses,100,"Very Rare","DW CRB","PRZYKŁAD ZASTĄP"
1 name type locations ap_head ap_body ap_larm ap_rarm ap_lleg ap_rleg max_ag traits weight availability source notes
2 Flak Vest armor Body 0 4 0 0 0 0 Flak 7 Common DH2 CRB PRZYKŁAD – ZASTĄP
3 Power Armour (Astartes) armor All 8 10 8 8 9 9 Environmental; Auto-senses 100 Very Rare DW CRB PRZYKŁAD – ZASTĄP
+60
View File
@@ -0,0 +1,60 @@
// DH2 Attack Test v2 — presets: Aim/Range/Fire + Size/Light/Cover
const actor = canvas.tokens.controlled[0]?.actor ?? game.user.character;
if (!actor) return ui.notifications.warn("Zaznacz token albo przypisz postać.");
new Dialog({
title: "🎯 Attack Test (WS/BS)",
content: `
<form>
<div class="form-group"><label>Base Target (WS/BS)</label><input name="base" type="number" value="40"/></div>
<div class="form-group"><label>Aim</label>
<select name="aim"><option value="0">None</option><option value="10">Half (+10)</option><option value="20">Full (+20)</option></select></div>
<div class="form-group"><label>Range</label>
<select name="range">
<option value="0">Standard</option>
<option value="30">Point Blank (+30)</option>
<option value="10">Short (+10)</option>
<option value="-10">Long (-10)</option>
<option value="-30">Extreme (-30)</option>
</select></div>
<div class="form-group"><label>Fire / Attack</label>
<select name="stance">
<option value="0">Standard / Single</option>
<option value="10">Semi (+10)</option>
<option value="-10">Full Auto (-10)</option>
<option value="30">All Out (Melee +30)</option>
</select></div>
<div class="form-group"><label>Target Size</label>
<select name="size">
<option value="0">Average</option>
<option value="10">Hulking (+10)</option>
<option value="20">Enormous (+20)</option>
<option value="30">Massive (+30)</option>
<option value="-10">Puny (-10)</option>
</select></div>
<div class="form-group"><label>Lighting</label>
<select name="light"><option value="0">Normal</option><option value="10">Good (+10)</option><option value="-10">Poor (-10)</option></select></div>
<div class="form-group"><label>Cover</label>
<select name="cover"><option value="0">None</option><option value="-10">Light (-10)</option><option value="-20">Heavy (-20)</option></select></div>
<div class="form-group"><label>Other Modifiers</label><input name="mod" type="number" value="0"/></div>
</form>`,
buttons: {
roll: {
label: "Roll",
callback: async (html) => {
const get = n => Number(html.find(`[name="${n}"]`).val());
const base = get("base");
const total = base + get("aim") + get("range") + get("stance") + get("size") + get("light") + get("cover") + get("mod");
const r = await(new Roll("1d100")).roll({async:true});
const ok = r.total <= total;
const margin = Math.abs(total - r.total);
const dox = ok ? 1 + Math.floor(margin/10) : Math.floor(margin/10);
const table = `
<table style="width:100%;border-collapse:collapse">
<tr><td><b>Target</b></td><td>${total}</td><td><b>Roll</b></td><td>${r.total}</td></tr>
<tr><td><b>Result</b></td><td colspan="3">${ok?'<span style="color:green">SUCCESS</span>':'<span style="color:red">FAIL</span>'} ${ok?dox+' DoS':dox+' DoF'}</td></tr>
</table>`;
r.toMessage({speaker: ChatMessage.getSpeaker({actor}), flavor: `🎯 <b>Attack Test</b><br/>${table}`});
}
}
}
}).render(true);
+6
View File
@@ -0,0 +1,6 @@
Roll,Result
1,Energy/Head — wpis 1
2,Energy/Head — wpis 2
3,Energy/Head — wpis 3
4,Energy/Head — wpis 4
5,Energy/Head — wpis 5
1 Roll Result
2 1 Energy/Head — wpis 1
3 2 Energy/Head — wpis 2
4 3 Energy/Head — wpis 3
5 4 Energy/Head — wpis 4
6 5 Energy/Head — wpis 5
+50
View File
@@ -0,0 +1,50 @@
// 🧠 Focus Power (DH2) — WP test + Phenomena/Perils with mode presets
const actor = canvas.tokens.controlled[0]?.actor ?? game.user.character;
if (!actor) return ui.notifications.warn("Zaznacz token.");
new Dialog({
title: "🧠 Focus Power",
content: `
<form>
<div class="form-group"><label>Willpower (target)</label><input name="wp" type="number" value="40"/></div>
<div class="form-group"><label>Psychic Rating (PR)</label><input name="pr" type="number" value="3"/></div>
<div class="form-group"><label>Mode</label>
<select name="mode"><option value="fettered">Fettered (no PP; PR/2)</option><option value="unfettered" selected>Unfettered (PP on doubles)</option><option value="push">Push (always PP; +PR)</option></select></div>
<div class="form-group"><label>Power difficulty/gear/etc. (flat mod)</label><input name="flat" type="number" value="0"/></div>
<div class="form-group"><label>Perils threshold</label><input name="thr" type="number" value="75"/></div>
</form>`,
buttons: {
roll: { label: "Roll", callback: async html => {
const wp = Number(html.find('[name="wp"]').val());
const pr = Number(html.find('[name="pr"]').val());
const mode = html.find('[name="mode"]').val();
const flat = Number(html.find('[name="flat"]').val());
const thr = Number(html.find('[name="thr"]').val());
let effPR = pr, ppmod = 0, ppAlways = false, note = "";
if (mode==="fettered"){ effPR = Math.max(1, Math.floor(pr/2)); note="(Fettered: PR/2, brak Phenomena)"; }
if (mode==="push"){ effPR = pr+3; ppmod=10; ppAlways = true; note="(Push: +3 PR, Phenomena zawsze, +10)"; }
const target = wp + flat;
const roll = await (new Roll("1d100")).roll({async:true});
const ok = roll.total <= target;
const dos = ok ? 1 + Math.floor((target - roll.total)/10) : Math.floor((roll.total - target)/10);
const doubles = (roll.total%11===0) || (roll.total===100);
const info = `<table style="width:100%;border-collapse:collapse">
<tr><td><b>Target</b></td><td>${target}</td><td><b>Roll</b></td><td>${roll.total}</td></tr>
<tr><td><b>Result</b></td><td colspan="3">${ok?'<span style="color:green">SUCCESS</span>':'<span style="color:red">FAIL</span>'} ${ok?dos+' DoS':dos+' DoF'} ${doubles?' <b>DOUBLES</b>':''}</td></tr>
<tr><td><b>Eff. PR</b></td><td>${effPR}</td><td><b>Range hint</b></td><td>${effPR*10} m (jeśli moc tak działa)</td></tr>
</table>`;
roll.toMessage({speaker: ChatMessage.getSpeaker({actor}), flavor:`🧠 <b>Focus Power</b> ${note}<br/>${info}`});
const needPP = (mode==="unfettered" && doubles) || (mode==="push") ;
if (needPP){
const tbl = game.tables.getName("Psychic Phenomena");
if (tbl){
const r = await (new Roll(`1d100 + ${ppmod}`)).roll({async:true});
await tbl.draw({displayResults:true, roll:r});
if (r.total >= thr){
const per = game.tables.getName("Perils of the Warp");
if (per) await per.draw({displayResults:true});
}
} else ChatMessage.create({content:"Utwórz RollTable: <b>Psychic Phenomena</b> (+ <b>Perils of the Warp</b>)"});
}
}}
}
}).render(true);
+22
View File
@@ -0,0 +1,22 @@
// 🎯 Hit Location (DH mapping by reversed roll)
new Dialog({
title:"🎯 Hit Location",
content:`<form>
<div class="form-group"><label>Attack d100 roll</label><input name="roll" type="number" value="37"/></div>
</form>`,
buttons:{
go:{label:"Resolve", callback: html=>{
const n = Math.max(1, Math.min(100, Number(html.find('[name="roll"]').val())));
const rev = Number(String(n).padStart(2,"0").split("").reverse().join(""));
let loc = "";
if (rev<=10) loc="Head";
else if (rev<=20) loc="Right Arm";
else if (rev<=30) loc="Left Arm";
else if (rev<=70) loc="Body";
else if (rev<=85) loc="Right Leg";
else loc="Left Leg";
ChatMessage.create({content:`🎯 <b>Hit Location</b>: roll ${n} → reversed ${rev} → <b>${loc}</b>`});
}}
}
}).render(true);
+6
View File
@@ -0,0 +1,6 @@
const text=`<b>House Rules — DH2 chassis</b><br/>
Unnatural mapowanie: dawne ×2 bonus Unnatural (+X) tak, by SB/TB odzwierciedlały linię źródłową.<br/>
Pancerz Astartes: zachowaj AP; zużycie zasilania jako +1 Fatigue co X scen zamiast liczenia minut.<br/>
Aptitudes: archetypy z RT/DW/BC mają przypisane 23 Aptitudes DH2 dla kosztów XP.<br/>
Psy: testy i PR z DH2 dla wszystkich; GK posiada Aegis Discipline (1×/scena reroll Perils) + 12 signature powers z DW.<br/>
RT Acquisition DH2 Influence z modyfikatorami kontekstowymi (teatr działań, mandat Inkwizycji, czas).`;ChatMessage.create({content:text});
+11
View File
@@ -0,0 +1,11 @@
// 🚦 Initiative for selected tokens (1d10 + AG Bonus prompt)
if (!canvas.tokens.controlled.length) return ui.notifications.warn("Zaznacz co najmniej jeden token.");
const combat = game.combat ?? await Combat.implementation.create({});
for (const t of canvas.tokens.controlled){
if (!combat.combatants.some(c=>c.tokenId===t.id)) await combat.createEmbeddedDocuments("Combatant",[ {tokenId:t.id, sceneId: canvas.scene.id, hidden:false} ]);
const ag = Number(await Dialog.prompt({title:`AG Bonus for ${t.name}`, content:`<input type="number" value="4">`, label:"OK"}));
const r = await (new Roll(`1d10 + ${ag}`)).roll({async:true});
await combat.setInitiative(combat.combatants.find(c=>c.tokenId===t.id).id, r.total);
r.toMessage({flavor:`🚦 <b>Initiative</b> — ${t.name}: ${r.total}`});
}
ui.notifications.info("Inicjatywy ustawione.");
+21
View File
@@ -0,0 +1,21 @@
Roll,Result
1-5,Perils 15 — WPISZ
6-10,Perils 610 — WPISZ
11-15,Perils 1115 — WPISZ
16-20,Perils 1620 — WPISZ
21-25,Perils 2125 — WPISZ
26-30,Perils 2630 — WPISZ
31-35,Perils 3135 — WPISZ
36-40,Perils 3640 — WPISZ
41-45,Perils 4145 — WPISZ
46-50,Perils 4650 — WPISZ
51-55,Perils 5155 — WPISZ
56-60,Perils 5660 — WPISZ
61-65,Perils 6165 — WPISZ
66-70,Perils 6670 — WPISZ
71-75,Perils 7175 — WPISZ
76-80,Perils 7680 — WPISZ
81-85,Perils 8185 — WPISZ
86-90,Perils 8690 — WPISZ
91-95,Perils 9195 — WPISZ
96-100,Perils 96100 — WPISZ
1 Roll Result
2 1-5 Perils 1–5 — WPISZ
3 6-10 Perils 6–10 — WPISZ
4 11-15 Perils 11–15 — WPISZ
5 16-20 Perils 16–20 — WPISZ
6 21-25 Perils 21–25 — WPISZ
7 26-30 Perils 26–30 — WPISZ
8 31-35 Perils 31–35 — WPISZ
9 36-40 Perils 36–40 — WPISZ
10 41-45 Perils 41–45 — WPISZ
11 46-50 Perils 46–50 — WPISZ
12 51-55 Perils 51–55 — WPISZ
13 56-60 Perils 56–60 — WPISZ
14 61-65 Perils 61–65 — WPISZ
15 66-70 Perils 66–70 — WPISZ
16 71-75 Perils 71–75 — WPISZ
17 76-80 Perils 76–80 — WPISZ
18 81-85 Perils 81–85 — WPISZ
19 86-90 Perils 86–90 — WPISZ
20 91-95 Perils 91–95 — WPISZ
21 96-100 Perils 96–100 — WPISZ
+3
View File
@@ -0,0 +1,3 @@
name,type,discipline,action,test,range,sustained,effect,source,notes
Smite,power,Biomancy,Half,"WP Challenging (+0)","PR*10m",No,"1d10+PR E; Tearing","DH2 CRB","PRZYKŁAD ZASTĄP"
Foreboding,power,Divination,Reaction,"Per Difficult (-10)","Self",No,"Use as Evasion; DoS rules","DH2 CRB","PRZYKŁAD ZASTĄP"
1 name type discipline action test range sustained effect source notes
2 Smite power Biomancy Half WP Challenging (+0) PR*10m No 1d10+PR E; Tearing DH2 CRB PRZYKŁAD – ZASTĄP
3 Foreboding power Divination Reaction Per Difficult (-10) Self No Use as Evasion; DoS rules DH2 CRB PRZYKŁAD – ZASTĄP
+21
View File
@@ -0,0 +1,21 @@
Roll,Result
1-5,PP 15 — WPISZ
6-10,PP 610 — WPISZ
11-15,PP 1115 — WPISZ
16-20,PP 1620 — WPISZ
21-25,PP 2125 — WPISZ
26-30,PP 2630 — WPISZ
31-35,PP 3135 — WPISZ
36-40,PP 3640 — WPISZ
41-45,PP 4145 — WPISZ
46-50,PP 4650 — WPISZ
51-55,PP 5155 — WPISZ
56-60,PP 5660 — WPISZ
61-65,PP 6165 — WPISZ
66-70,PP 6670 — WPISZ
71-75,PP 7175 — WPISZ
76-80,PP 7680 — WPISZ
81-85,PP 8185 — WPISZ
86-90,PP 8690 — WPISZ
91-95,PP 9195 — WPISZ
96-100,PP 96100 — WPISZ
1 Roll Result
2 1-5 PP 1–5 — WPISZ
3 6-10 PP 6–10 — WPISZ
4 11-15 PP 11–15 — WPISZ
5 16-20 PP 16–20 — WPISZ
6 21-25 PP 21–25 — WPISZ
7 26-30 PP 26–30 — WPISZ
8 31-35 PP 31–35 — WPISZ
9 36-40 PP 36–40 — WPISZ
10 41-45 PP 41–45 — WPISZ
11 46-50 PP 46–50 — WPISZ
12 51-55 PP 51–55 — WPISZ
13 56-60 PP 56–60 — WPISZ
14 61-65 PP 61–65 — WPISZ
15 66-70 PP 66–70 — WPISZ
16 71-75 PP 71–75 — WPISZ
17 76-80 PP 76–80 — WPISZ
18 81-85 PP 81–85 — WPISZ
19 86-90 PP 86–90 — WPISZ
20 91-95 PP 91–95 — WPISZ
21 96-100 PP 96–100 — WPISZ
+28
View File
@@ -0,0 +1,28 @@
// 🩹 Toggle conditions on selected tokens (Foundry v13)
const choices = [
{id:"fatigued", label:"Fatigued"},
{id:"stunned", label:"Stunned"},
{id:"prone", label:"Prone"},
{id:"frightened", label:"Frightened (Fear)"}
];
const opts = choices.map(c=>`<label><input type="checkbox" name="c" value="${c.id}"> ${c.label}</label>`).join("<br/>");
new Dialog({
title:"🩹 Conditions",
content:`<form>${opts}<div class="form-group"><label>Mode</label>
<select name="mode"><option value="toggle">Toggle</option><option value="on">Apply</option><option value="off">Remove</option></select></div></form>`,
buttons:{
go:{label:"Apply",callback: html=>{
const ids = Array.from(html.find('input[name="c"]:checked')).map(e=>e.value);
const mode = html.find('[name="mode"]').val();
const getEf = id => CONFIG.statusEffects.find(e=>e.id===id) ?? {id};
canvas.tokens.controlled.forEach(t=>{
ids.forEach(id=>{
if (mode==="toggle") t.toggleEffect(getEf(id));
else if (mode==="on") t.actor?.effects?.some(e=>e.getFlag("core","statusId")===id) ? null : t.toggleEffect(getEf(id));
else if (mode==="off") t.actor?.effects?.some(e=>e.getFlag("core","statusId")===id) ? t.toggleEffect(getEf(id)) : null;
});
});
}}
}
}).render(true);
+38
View File
@@ -0,0 +1,38 @@
// 💥 Quick Damage — supports Tearing, Proven(X), Primitive(X), flat mod
new Dialog({
title:"💥 Damage Roller",
content: `
<form>
<div class="form-group"><label>Flat modifier (e.g., +3)</label><input name="mod" type="number" value="0"/></div>
<div class="form-group"><label>Traits</label>
<label><input type="checkbox" name="tear"> Tearing</label>
<label><input type="checkbox" name="prov"> Proven</label>
<input name="provV" type="number" value="0" style="width:60px" placeholder="X"/>
<label><input type="checkbox" name="prim"> Primitive</label>
<input name="primV" type="number" value="0" style="width:60px" placeholder="X"/>
</div>
</form>`,
buttons:{
go:{label:"Roll", callback: async html=>{
const mod = Number(html.find('[name="mod"]').val());
const tearing = html.find('[name="tear"]')[0].checked;
const proven = html.find('[name="prov"]')[0].checked ? Number(html.find('[name="provV"]').val()) : 0;
const primitive = html.find('[name="prim"]')[0].checked ? Number(html.find('[name="primV"]').val()) : 0;
// base die (d10) with tearing (best of 2)
const r1 = await (new Roll("1d10")).roll({async:true});
const r2 = tearing ? await (new Roll("1d10")).roll({async:true}) : null;
let die = tearing ? Math.max(r1.total, r2.total) : r1.total;
// apply Proven/Primitive
if (proven>0) die = Math.max(die, proven);
if (primitive>0) die = Math.min(die, primitive);
const rf = (die===10); // potential Zealous Hatred trigger
const total = die + mod;
let flavor = `💥 <b>Damage</b><br/>Die: ${die}${tearing?` (Tearing ${r1.total}/${r2.total.total})`:''} + Mod ${mod} = <b>${total}</b>`;
if (proven>0) flavor += `<br/>Proven(${proven}) zastosowano`;
if (primitive>0) flavor += `<br/>Primitive(${primitive}) zastosowano`;
if (rf) flavor += `<br/><b>⚡ Natural 10</b> — rozważ Zealous Hatred.`;
ChatMessage.create({speaker: ChatMessage.getSpeaker(), content: flavor});
}}
}
}).render(true);
+26
View File
@@ -0,0 +1,26 @@
// 📚 Create placeholder RollTables for Crits + Psychic Phenomena/Perils (with icons)
const icon = {Energy:"⚡", Impact:"🔨", Rending:"🗡️", Explosive:"💥"};
const dmgTypes = ["Energy","Impact","Rending","Explosive"];
const locs = ["Head","Body","Left Arm","Right Arm","Left Leg","Right Leg"];
async function makeCrit(dtype, loc){
const name = `Crit: ${dtype} - ${loc}`;
if (game.tables.getName(name)) return;
const results = [];
for (let i=1;i<=5;i++){
results.push({type:0, text:`${icon[dtype]||""} ${dtype}/${loc} — wpis ${i} (uzupełnij z PDF)`, weight:1, range:[i,i]});
}
await RollTable.implementation.create({name, formula:"1d5", replacement:true, displayRoll:false, results});
}
async function makeWide(name, emoji){
if (game.tables.getName(name)) return;
const results = [];
for (let i=0;i<20;i++){
const lo=i*5+1, hi=i*5+5;
results.push({type:0, text:`${emoji} ${name} ${lo}-${hi} — wpis (uzupełnij z PDF)`, weight:1, range:[lo,hi]});
}
await RollTable.implementation.create({name, formula:"1d100", replacement:true, displayRoll:false, results});
}
for (const d of dmgTypes) for (const l of locs) await makeCrit(d,l);
await makeWide("Psychic Phenomena","🌀");
await makeWide("Perils of the Warp","☠️");
ui.notifications.info("Utworzono puste tabele: Crits (4×6) + Phenomena + Perils.");
+3
View File
@@ -0,0 +1,3 @@
name,type,tier,aptitudes,prereq,effect,source,notes
Ambidextrous,talent,1,"Agility; Offence","Ag 30","-10 to off-hand penalty","DH2 CRB","PRZYKŁAD ZASTĄP"
Aegis Discipline (GK),talent,2,"Willpower; Defence","Psyker","Reroll Perils 1×scene","HOUSE","DODAJ WŁASNY OPIS"
1 name type tier aptitudes prereq effect source notes
2 Ambidextrous talent 1 Agility; Offence Ag 30 -10 to off-hand penalty DH2 CRB PRZYKŁAD – ZASTĄP
3 Aegis Discipline (GK) talent 2 Willpower; Defence Psyker Reroll Perils 1×scene HOUSE DODAJ WŁASNY OPIS
+3
View File
@@ -0,0 +1,3 @@
name,type,subtype,damage,pen,range,rof,qualities,weight,availability,source,notes
Lasgun M36,weapon,Basic,"1d10+3",0,100m,"S/3/","Reliable",4,Common,"DH2 CRB p.142","PRZYKŁAD ZASTĄP"
Astartes Bolter,weapon,Basic,"1d10+9",4,90m,"S/2/","Tearing; Unreliable",9,Rare,"DW CRB","PRZYKŁAD ZASTĄP"
1 name type subtype damage pen range rof qualities weight availability source notes
2 Lasgun M36 weapon Basic 1d10+3 0 100m S/3/– Reliable 4 Common DH2 CRB p.142 PRZYKŁAD – ZASTĄP
3 Astartes Bolter weapon Basic 1d10+9 4 90m S/2/– Tearing; Unreliable 9 Rare DW CRB PRZYKŁAD – ZASTĄP
+33
View File
@@ -0,0 +1,33 @@
// ⚡ Zealous Hatred helper (DH2) — roll 1d5 crit OR add +1d5 dmg
new Dialog({
title: "⚡ Zealous Hatred",
content: `
<form>
<div class="form-group"><label>Wound damage after Armour/TB?</label>
<select name="penetrated"><option value="yes">Yes roll Critical (1d5)</option><option value="no">No add +1d5 damage</option></select></div>
<div class="form-group"><label>Damage Type</label>
<select name="dtype"><option>Energy</option><option>Impact</option><option>Rending</option><option>Explosive</option></select></div>
<div class="form-group"><label>Hit Location</label>
<select name="loc"><option>Head</option><option>Body</option><option>Left Arm</option><option>Right Arm</option><option>Left Leg</option><option>Right Leg</option></select></div>
<div class="form-group"><label>Table name (optional override)</label><input name="tname" type="text" placeholder="Crit: Energy - Head"/></div>
</form>`,
buttons: {
go: { label: "Resolve", callback: async html => {
const pen = html.find('[name="penetrated"]').val();
if (pen === "yes") {
const dtype = html.find('[name="dtype"]').val();
const loc = html.find('[name="loc"]').val();
const override = html.find('[name="tname"]').val()?.trim();
const name = override || `Crit: ${dtype} - ${loc}`;
const r = await (new Roll("1d5")).roll({async:true});
const table = game.tables.getName(name);
if (table) await table.draw({displayResults:true, roll:r});
else r.toMessage({flavor:`⚡ <b>Zealous Hatred</b>: Critical ${r.total} — brak tabeli <b>${name}</b> (utwórz lub zmień nazwę).`});
} else {
const r = await (new Roll("1d5")).roll({async:true});
r.toMessage({flavor:"⚡ <b>Zealous Hatred</b>: Dodaj do obrażeń <b>+1d5</b> (atak nie przebił Soak)."});
}
}}
}
}).render(true);
-63
View File
@@ -22,20 +22,6 @@
false, false,
false false
], ],
"indie\\b": [
"Indie? *Wyciąga rewolwerową wyrzutnię taktycznych bomb jądrowych* Gdzie??? *Zaczyna się maniakalnie śmiać*",
15.0,
0,
false,
false
],
"hindus": [
"Hindus? Gdzie.... *Wyciąga spod lady ciężki miotacz płomieni i zaczyna się maniakalnie śmiać*",
15.0,
0,
false,
false
],
"chuj\\b": [ "chuj\\b": [
"Eeeee.... Szefie... ktoś cię woła! Wskazuje na Hammera", "Eeeee.... Szefie... ktoś cię woła! Wskazuje na Hammera",
15.0, 15.0,
@@ -99,27 +85,6 @@
false, false,
false false
], ],
"tatarek\\b": [
"Tatarek? Nie dramatyzuj....",
15.0,
0,
false,
false
],
"krowa\\b": [
"Krówka? Nie dramatyzuj....",
15.0,
0,
false,
false
],
"krówka\\b": [
"Krówka? Nie dramatyzuj....",
15.0,
0,
false,
false
],
"jessenia\\b": [ "jessenia\\b": [
"Jessenia? Jak przyszła tu w różowej pidżamie z uszkami to nawet nie mrugnąłem okiem. Te oczy.... No ale jakiś debil Ją prowokował mówiąc \"Zdominuj mnie\" Akurat miała dobry humor więc przeżył - ale po 115.0 sekundach był już na \"Tak Pani, przepraszam że zająłem czas Pani\" Respect dla kobitki", "Jessenia? Jak przyszła tu w różowej pidżamie z uszkami to nawet nie mrugnąłem okiem. Te oczy.... No ale jakiś debil Ją prowokował mówiąc \"Zdominuj mnie\" Akurat miała dobry humor więc przeżył - ale po 115.0 sekundach był już na \"Tak Pani, przepraszam że zająłem czas Pani\" Respect dla kobitki",
15.0, 15.0,
@@ -190,20 +155,6 @@
false, false,
false false
], ],
"elokwentna\\b": [
"O matko. Znowu ta dyskusja? Hammer ma stary słownik gdzie elokwentna i pyskata są praktycznie synonimami. Jedyna różnica że swojej uległej można za bycie pyskatym dać po dupie.",
15.0,
0,
false,
false
],
"elokwencja\\b": [
"O matko. Znowu ta dyskusja? Hammer ma stary słownik gdzie elokwentna i pyskata są praktycznie synonimami. Jedyna różnica że swojej uległej można za bycie pyskatym dać po dupie.",
15.0,
0,
false,
false
],
"same plusy\\b": [ "same plusy\\b": [
"Jak na cmentarzu Szefie. Jak na cmentarzu", "Jak na cmentarzu Szefie. Jak na cmentarzu",
15.0, 15.0,
@@ -253,13 +204,6 @@
false, false,
false false
], ],
"fallain\\b": [
"Kochana Krówka. Skłonność do dramatów i zakrwawiania ścian. Jedna z kilku NAPRAWDE srogich masochistek... Ach ta krew :drool:",
15.0,
0,
false,
false
],
"roar": [ "roar": [
"Kici, kici....", "Kici, kici....",
15.0, 15.0,
@@ -316,13 +260,6 @@
false, false,
true true
], ],
"revalyacyjnie\\b": [
"Zajebisty dowcip szefie. Na pewno się \"Twojej Byłej Dziewczynie\":tm: spodoba.",
15.0,
0,
false,
true
],
"nocna zmiana\\b": [ "nocna zmiana\\b": [
"Nocna Zmiana? No to właściciele tego baru. Taki troche Hammer Harema. Kto to jest Harem>? Łokurwa. Harem Hammera. Ale on tu robi za jedyną hurysę, a reszta to szejkowie. Tak zrobię Ci szejka.", "Nocna Zmiana? No to właściciele tego baru. Taki troche Hammer Harema. Kto to jest Harem>? Łokurwa. Harem Hammera. Ale on tu robi za jedyną hurysę, a reszta to szejkowie. Tak zrobię Ci szejka.",
15.0, 15.0,
+4 -2
View File
@@ -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")
+1 -1
View File
@@ -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
View File
@@ -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)
+1 -1
View File
@@ -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
View File
@@ -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
Regular → Executable
+4 -2
View File
@@ -68,6 +68,8 @@ 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")
await client.load_extension("latex_commands")
logger.info("Sensors: online") logger.info("Sensors: online")
logger.info(client.cogs) logger.info(client.cogs)
@@ -75,8 +77,8 @@ async def on_ready():
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 ---->", client.user) logger.info("Logged in as ----> %s", client.user)
logger.info("ID:", client.user.id) logger.info("ID:%s ", client.user.id)
logger.info("All systems: operational") logger.info("All systems: operational")
+63
View File
@@ -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()