Better file structure

This commit is contained in:
REDNBLACK 2017-04-18 23:40:40 +03:00
parent 6a58e7514b
commit 87714529b0
15 changed files with 48 additions and 62 deletions

View File

@ -1,31 +1,2 @@
[bot]
token=
name=ImaginaryFriend
anchors=bot
purge_interval=43200.0
default_chance=5
spam_stickers=BQADAgADSAIAAkcGQwU-G-9SZUDTWAI
[logging]
level=INFO
[grammar]
chain_length=2
separator=\x02
stop_word='\x00'
max_words=30
max_messages=5
end_sentence=.....!!?
all=.!?;()\-—"[]{}«»/*&^#$
[media_checker]
lifetime=28800.0
messages=[:||||||||||||:]
[updates]
mode=polling
[redis]
host=redis
port=6379
db=0

View File

@ -1,26 +1,5 @@
[bot]
token=
name=ImaginaryFriend
anchors=bot
purge_interval=43200.0
default_chance=5
spam_stickers=BQADAgADSAIAAkcGQwU-G-9SZUDTWAI
[logging]
level=INFO
[grammar]
chain_length=2
separator=\x02
stop_word='\x00'
max_words=30
max_messages=5
end_sentence=.....!!?
all=.!?;()\-—"[]{}«»/*&^#$
[media_checker]
lifetime=28800.0
messages=[:||||||||||||:]
[updates]
mode=polling
@ -32,5 +11,3 @@ cert=
[redis]
host=localhost
port=6379
db=0

View File

@ -11,5 +11,5 @@ services:
redis:
image: redis:3.2.8-alpine
volumes:
- ./data:/data
- ./storage:/data
restart: unless-stopped

36
resources/main.cfg Normal file
View File

@ -0,0 +1,36 @@
[bot]
token=
name=ImaginaryFriend
anchors=bot,бот,imaginary_friend,ImaginaryFriend,ImaginaryFriendBot,@ImaginaryFriendBot
purge_interval=43200.0
default_chance=5
spam_stickers=BQADAgADSAIAAkcGQwU-G-9SZUDTWAI
[logging]
level=INFO
[grammar]
chain_length=2
separator=\x02
stop_word='\x00'
max_words=30
max_messages=5
end_sentence=.....!!?
all=.!?;()\-—"[]{}«»/*&^#$
[media_checker]
lifetime=28800.0
messages=[:||||||||||||:],🐢,:slow:
[updates]
mode=polling
host=
port=
url=
key=
cert=
[redis]
host=redis
port=6379
db=0

View File

Before

Width:  |  Height:  |  Size: 233 KiB

After

Width:  |  Height:  |  Size: 233 KiB

View File

@ -19,9 +19,11 @@ def getlist(self, section, option, type=str):
configparser.ConfigParser.getlist = getlist
config_path = os.getenv('CONFIG_PATH', 'cfg/main.plain.cfg')
root_config = 'resources/main.cfg'
user_config = os.getenv('CONFIG_PATH', 'cfg/main.plain.cfg')
config = configparser.ConfigParser()
config.read(config_path, encoding=encoding)
config.read(root_config, encoding=encoding)
config.read(user_config, encoding=encoding)
for section, options in sections.items():
if not config.has_section(section):

View File

@ -4,7 +4,7 @@ from src.utils import read_to_string
class Help(Base):
name = 'help'
text = read_to_string('info/help.txt')
text = read_to_string('resources/info/help.txt')
@staticmethod
def execute(bot, command):

View File

@ -10,7 +10,7 @@ class Vzhuh(Base):
text = Vzhuh.format_text('вжух ' + ' '.join(command.args))
Vzhuh.create_image(text)
bot.send_photo(chat_id=command.chat_id, photo=open('data/sample-out.png', 'rb'))
bot.send_photo(chat_id=command.chat_id, photo=open('storage/vzhuh.png', 'rb'))
@staticmethod
def format_text(text):
@ -33,8 +33,8 @@ class Vzhuh(Base):
@staticmethod
def create_image(text):
img = Image.open("data/vzhuh_sample.png")
img = Image.open("resources/vzhuh/sample.png")
draw = ImageDraw.Draw(img)
font = ImageFont.truetype("data/Impact.ttf", 44, index=0)
font = ImageFont.truetype('resources/vzhuh/Impact.ttf', 44, index=0)
draw.text((222, 280), text, (0, 0, 0), font=font)
img.save('data/sample-out.png')
img.save('storage/vzhuh.png')

View File

@ -8,8 +8,8 @@ class Woof(Base):
@staticmethod
def execute(bot, command):
req = Request("http://loremflickr.com/500/410/dog", headers={'User-Agent': "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_12_1) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/53.0.2785.143 Safari/537.36"})
output = open("data/woof-photo.jpg", "wb")
output = open("storage/woof.jpg", "wb")
output.write(urlopen(req).read())
output.close()
bot.send_photo(chat_id=command.chat_id, photo=open('data/woof-photo.jpg', 'rb'))
bot.send_photo(chat_id=command.chat_id, photo=open('storage/woof.jpg', 'rb'))

0
storage/.gitkeep Normal file
View File