From e0ddda92c330f9d2927d93788a49ac7309c1d7b4 Mon Sep 17 00:00:00 2001
From: oloturia <oloturia@gmail.com>
Date: Sat, 13 Mar 2021 18:57:12 +0100
Subject: [PATCH] added font size in config file

---
 .gitignore   | 14 ++++++++++++++
 config.json  |  1 +
 randstrip.py | 15 ++++++++-------
 3 files changed, 23 insertions(+), 7 deletions(-)
 create mode 100644 .gitignore

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..3aa872b
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,14 @@
+telegram_token
+twitter_token
+mastodon_token
+telegram.png
+mastodon.png
+twitter.png
+android.png
+__pycache__/*
+oloturia_credentials.secret
+history/*
+bin/*
+temp/*
+show.html
+*.pyc
diff --git a/config.json b/config.json
index b5c38f5..a5ffa33 100644
--- a/config.json
+++ b/config.json
@@ -11,6 +11,7 @@
 		"csvSubs": "subs.csv",
 		"csvObj": "obj.csv",
 		"font": "./ubuntu.ttf",
+		"fontSize": 22,
 		"xSize":2400,
 		"ySize":500,
 		"panelLength":600,
diff --git a/randstrip.py b/randstrip.py
index 0ac8e72..17ef513 100755
--- a/randstrip.py
+++ b/randstrip.py
@@ -83,7 +83,7 @@ def addThing(indVign,config):
 				return row[random.randint(3,len(row)-1)],row[1],row[2]
 		return 0
 
-def writeStrip(story,fontSize,config):
+def writeStrip(story,config):
 	"""This function creates the strip returning an image object that could be saved or viewed. It takes an array with filenames as parameter
 	The first image is always 000, then appends to strip the files, then decorates it fetching text and adding objects. If the object is an R, then
 	repeats the last object."""
@@ -92,7 +92,7 @@ def writeStrip(story,fontSize,config):
 		try:
 			vign = Image.open(config["imagesLocation"]+"/"+indVign).convert('RGBA')
 			addtext = ImageDraw.Draw(vign)
-			fnt = ImageFont.truetype(config["font"],fontSize)
+			fnt = ImageFont.truetype(config["font"],config["fontSize"])
 			textVign = fetchText(indVign,config)
 			
 			if textVign!=0:
@@ -132,13 +132,13 @@ def writeStrip(story,fontSize,config):
 		xshift += config["panelLength"]
 	return image
 
-def createStrip(config,specialPlatform="",fontSize=22):
+def createStrip(config,specialPlatform=""):
 	"""Create strip and save it
 	createStrip(str path/filename)"""
 
 	try:
 		story = fetchVign(config)
-		finalStrip = writeStrip(story,fontSize,config)
+		finalStrip = writeStrip(story,config)
 		if specialPlatform == "android":
 			return finalStrip
 		else:
@@ -172,6 +172,7 @@ def readConfig(profile=False,platform=False):
 	csvSubs = config[profile]["csvSubs"]
 	csvObj = config[profile]["csvObj"]
 	font = checkLocal(config[profile]["font"])
+	fontSize = int((config[profile]["fontSize"]))
 	xSize = config[profile]["xSize"]
 	ySize = config[profile]["ySize"]
 	panelLength = config[profile]["panelLength"]
@@ -183,9 +184,9 @@ def readConfig(profile=False,platform=False):
 		except KeyError:
 			text = False
 		
-		return {"saveLocation":saveLocation,"imagesLocation":imagesLocation,"csvLocation":csvLocation,"font":font,"token":token,"filename":filename,"xSize":xSize,"ySize":ySize,"panelLength":panelLength,"csvTree":csvTree,"csvSpeech":csvSpeech,"csvSubs":csvSubs,"csvObj":csvObj,"text":text}
+		return {"saveLocation":saveLocation,"imagesLocation":imagesLocation,"csvLocation":csvLocation,"fontSize":fontSize,"font":font,"token":token,"filename":filename,"xSize":xSize,"ySize":ySize,"panelLength":panelLength,"csvTree":csvTree,"csvSpeech":csvSpeech,"csvSubs":csvSubs,"csvObj":csvObj,"text":text}
 	filename = config[profile]["filename"]
-	return {"saveLocation":saveLocation,"imagesLocation":imagesLocation,"csvLocation":csvLocation,"font":font,"filename":filename,"xSize":xSize,"ySize":ySize,"panelLength":panelLength,"csvTree":csvTree,"csvSpeech":csvSpeech,"csvSubs":csvSubs,"csvObj":csvObj}
+	return {"saveLocation":saveLocation,"imagesLocation":imagesLocation,"csvLocation":csvLocation,"fontSize":fontSize,"font":font,"filename":filename,"xSize":xSize,"ySize":ySize,"panelLength":panelLength,"csvTree":csvTree,"csvSpeech":csvSpeech,"csvSubs":csvSubs,"csvObj":csvObj}
 		
 def checkLocal(directory):
 	"""Checks if it's a relative or absolute path"""
@@ -223,7 +224,7 @@ if __name__ == "__main__":
 			story = []					#Story specified
 			for x in args.story:
 				story.append(x)
-		finalStrip = writeStrip(story,22,config)
+		finalStrip = writeStrip(story,config)
 		
 		if args.xsize != 0:				#Resize specified
 			finalStrip = finalStrip.resize((args.xsize[0],int(args.xsize[0]/2400*500)))