parent
0dfb5f3134
commit
d9051ee6c0
bot
@ -70,38 +70,42 @@ class JournalHandler(BaseHandler):
|
|||||||
date = update.message.text
|
date = update.message.text
|
||||||
try:
|
try:
|
||||||
date = datetime.datetime.strptime(date, "%d%m%Y").date()
|
date = datetime.datetime.strptime(date, "%d%m%Y").date()
|
||||||
with self.models.db:
|
|
||||||
self.current_model, new = self.models.JournalEntry.get_or_create(
|
|
||||||
date = date
|
|
||||||
)
|
|
||||||
if not new:
|
|
||||||
await update.message.reply_text("An entry already exists for this date")
|
|
||||||
return ConversationHandler.END
|
|
||||||
except ValueError:
|
except ValueError:
|
||||||
await update.message.reply_text("Please enter the date in the format DDMMYYYY")
|
await update.message.reply_text("Please enter the date in the format DDMMYYYY")
|
||||||
return DATE_ENTRY
|
return DATE_ENTRY
|
||||||
|
self.logger.info(f"Date: {date}")
|
||||||
|
|
||||||
await update.message.reply_text("Please enter the content for the entry")
|
with self.models.db:
|
||||||
return CONTENT
|
self.current_model, new = self.models.JournalEntry.get_or_create(
|
||||||
|
date = date
|
||||||
|
)
|
||||||
|
if not new:
|
||||||
|
await update.message.reply_text("An entry already exists for this date")
|
||||||
|
return ConversationHandler.END
|
||||||
|
else:
|
||||||
|
await update.message.reply_text("Please enter the content for the entry")
|
||||||
|
return CONTENT
|
||||||
|
|
||||||
|
|
||||||
async def content_save(self, update, context):
|
async def content_save(self, update, context):
|
||||||
self.current_model.author_id = update.message.from_user.id
|
with self.models.db:
|
||||||
|
self.current_model.author_id = update.message.from_user.id
|
||||||
|
|
||||||
if update.message.text:
|
if update.message.text:
|
||||||
self.current_model.text = update.message.text
|
self.current_model.text = update.message.text
|
||||||
else:
|
|
||||||
if update.message.photo:
|
|
||||||
file = await update.message.effective_attachment[-1].get_file()
|
|
||||||
else:
|
else:
|
||||||
file = await update.message.effective_attachment.get_file()
|
if update.message.photo:
|
||||||
|
file = await update.message.effective_attachment[-1].get_file()
|
||||||
|
else:
|
||||||
|
file = await update.message.effective_attachment.get_file()
|
||||||
|
|
||||||
file_bytes = await file.download_as_bytearray()
|
file_bytes = await file.download_as_bytearray()
|
||||||
file_path = file.file_path
|
file_path = file.file_path
|
||||||
self.current_model.save_media(file_bytes, file_path)
|
self.current_model.save_media(file_bytes, file_path)
|
||||||
|
|
||||||
self.current_model.text = update.message.caption
|
self.current_model.text = update.message.caption
|
||||||
|
|
||||||
|
self.current_model.save()
|
||||||
|
|
||||||
self.current_model.save()
|
|
||||||
await update.message.reply_text(f"Saved entry for {self.current_model.date.strftime('%A, %-d. %B %Y')}")
|
await update.message.reply_text(f"Saved entry for {self.current_model.date.strftime('%A, %-d. %B %Y')}")
|
||||||
return ConversationHandler.END
|
return ConversationHandler.END
|
||||||
|
@ -25,6 +25,6 @@ class ListModel(BaseModel):
|
|||||||
|
|
||||||
|
|
||||||
def set_db(db_path):
|
def set_db(db_path):
|
||||||
db.initialize(SqliteDatabase(db_path))
|
db.initialize(SqliteDatabase(db_path, pragmas={'journal_mode': 'wal'}))
|
||||||
db.connect()
|
db.connect()
|
||||||
db.create_tables([ListModel], safe=True)
|
db.create_tables([ListModel], safe=True)
|
||||||
|
@ -54,6 +54,6 @@ class JournalEntry(BaseModel):
|
|||||||
|
|
||||||
|
|
||||||
def set_db(db_path):
|
def set_db(db_path):
|
||||||
db.initialize(SqliteDatabase(db_path))
|
db.initialize(SqliteDatabase(db_path, pragmas={'journal_mode': 'wal'}))
|
||||||
db.connect()
|
db.connect()
|
||||||
db.create_tables([JournalEntry], safe=True)
|
db.create_tables([JournalEntry], safe=True)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user