mirror of
https://github.com/krislamo/Flea
synced 2024-12-16 11:10:34 +00:00
Slight improvement to cfgParser()
Convert text values in the settings dictionary to corresponding data types; Fixed spelling errors
This commit is contained in:
parent
ce92347cc0
commit
00db7f073e
@ -14,6 +14,8 @@
|
|||||||
# You should have received a copy of the GNU Affero General Public License
|
# You should have received a copy of the GNU Affero General Public License
|
||||||
# along with this program. If not, see <http://www.gnu.org/licenses/>
|
# along with this program. If not, see <http://www.gnu.org/licenses/>
|
||||||
|
|
||||||
|
import re
|
||||||
|
|
||||||
def cfgParser(cfgFile):
|
def cfgParser(cfgFile):
|
||||||
|
|
||||||
# Dictionary to hold final data
|
# Dictionary to hold final data
|
||||||
@ -62,7 +64,7 @@ def cfgParser(cfgFile):
|
|||||||
|
|
||||||
# Remove the first character
|
# Remove the first character
|
||||||
part = part[points[0]+1:]
|
part = part[points[0]+1:]
|
||||||
# Calcuate end of str for length change
|
# Calculate end of str for length change
|
||||||
points[1] -= 1
|
points[1] -= 1
|
||||||
|
|
||||||
else:
|
else:
|
||||||
@ -85,7 +87,7 @@ def cfgParser(cfgFile):
|
|||||||
else:
|
else:
|
||||||
break
|
break
|
||||||
|
|
||||||
# Calcuate where this part goes in settings
|
# Calculate where this part goes in settings
|
||||||
if counter == 0:
|
if counter == 0:
|
||||||
counter += 1
|
counter += 1
|
||||||
settings[part] = None
|
settings[part] = None
|
||||||
@ -97,5 +99,19 @@ def cfgParser(cfgFile):
|
|||||||
counter -= 1
|
counter -= 1
|
||||||
settings[pieces[0]] = part
|
settings[pieces[0]] = part
|
||||||
|
|
||||||
|
# Convert text to appropriate types in the settings[] dictionary
|
||||||
|
# e.g. "6667" to int("6667"); "true" to bool("true"), etc.
|
||||||
|
for x in settings:
|
||||||
|
|
||||||
|
# Conversion for booleans
|
||||||
|
if settings[x].lower() == "true":
|
||||||
|
settings[x] = True
|
||||||
|
elif settings[x].lower() == "false":
|
||||||
|
settings[x] == False
|
||||||
|
|
||||||
|
# Conversion for positive integers
|
||||||
|
elif re.search("^[0-9]+$", settings[x]) != None:
|
||||||
|
settings[x] = int(settings[x])
|
||||||
|
|
||||||
return settings
|
return settings
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user