Compare commits
2 commits
2c7fd18651
...
0ecd2159dd
Author | SHA1 | Date | |
---|---|---|---|
0ecd2159dd | |||
b322bcacd3 |
9 changed files with 97 additions and 65 deletions
7
.gitignore
vendored
7
.gitignore
vendored
|
@ -160,3 +160,10 @@ cython_debug/
|
||||||
# option (not recommended) you can uncomment the following to ignore the entire idea folder.
|
# option (not recommended) you can uncomment the following to ignore the entire idea folder.
|
||||||
#.idea/
|
#.idea/
|
||||||
|
|
||||||
|
# replit
|
||||||
|
.replit
|
||||||
|
venv/
|
||||||
|
replit.nix
|
||||||
|
.upm/
|
||||||
|
.cache/
|
||||||
|
.config/
|
||||||
|
|
|
@ -1,7 +1,8 @@
|
||||||
# -*- coding: utf-8 -*-
|
# -*- coding: utf-8 -*-
|
||||||
|
# TODO: clean this up
|
||||||
# from . import config
|
# TODO: load datafiles. if not found, either fail or install files (maybe)?
|
||||||
from . import output
|
from .output.owoOutputClass import owoOutputClass
|
||||||
|
from . import datafiles
|
||||||
import logging
|
import logging
|
||||||
import sys
|
import sys
|
||||||
|
|
||||||
|
@ -14,22 +15,17 @@ __version__ = "0.0.0-alpha0"
|
||||||
|
|
||||||
DEBUG = True
|
DEBUG = True
|
||||||
|
|
||||||
def main() -> dict:
|
|
||||||
try:
|
def main() -> owoOutputClass:
|
||||||
out=output.OutputObject()
|
# PART 1: init
|
||||||
except Exception as exc:
|
try:
|
||||||
return {
|
out = owoOutputClass()
|
||||||
'_err':True,
|
except Exception as exc:
|
||||||
'exception':exc,
|
import traceback
|
||||||
'vars':{
|
traceback.print_exc(exc, file=sys.stderr)
|
||||||
'globals': globals(),
|
sys.exit(1)
|
||||||
'locals': locals(),
|
else:
|
||||||
'dir': dir()
|
pass
|
||||||
}
|
# PART 2: load config/data files
|
||||||
}
|
try:
|
||||||
try:
|
|
||||||
pass
|
|
||||||
# do shit
|
|
||||||
except KeyboardInterrupt:
|
|
||||||
return {'_kbi':True}
|
|
||||||
|
|
||||||
|
|
|
@ -9,11 +9,8 @@ import owo
|
||||||
|
|
||||||
if __name__ == "__main__":
|
if __name__ == "__main__":
|
||||||
output=owo.main()
|
output=owo.main()
|
||||||
del owo
|
if output == None:
|
||||||
if output.__contains__('_err'):
|
print("an error might have occured...",file=sys.stderr)
|
||||||
print("an error occured!", file=sys.stderr)
|
|
||||||
if output.__contains__('_kb'):
|
|
||||||
print("interupted by keyboard")
|
|
||||||
sys.exit()
|
|
||||||
else:
|
else:
|
||||||
pass # output results
|
from yaml import dump
|
||||||
|
print(dump(output))
|
|
@ -1,6 +0,0 @@
|
||||||
confDict = {}
|
|
||||||
|
|
||||||
def loadConfig(confLocation = "$HOME/.config/owo.yaml"):
|
|
||||||
from os import path
|
|
||||||
if not path.exists(confLocation):
|
|
||||||
|
|
|
@ -2,7 +2,8 @@ from pathlib import Path
|
||||||
from sys import platform
|
from sys import platform
|
||||||
from yaml import load, dump
|
from yaml import load, dump
|
||||||
import os
|
import os
|
||||||
from re import search, IGNORECASE
|
import sys
|
||||||
|
import re
|
||||||
import collections.abc
|
import collections.abc
|
||||||
|
|
||||||
_config={}
|
_config={}
|
||||||
|
@ -15,7 +16,7 @@ _LOCATIONS = {
|
||||||
"{}/owo/".format(os.environ["XDG_CONFIG_HOME"]) if "XDG_CONFIG_HOME" in os.environ else str(Path.home())+"/.config/owo/",
|
"{}/owo/".format(os.environ["XDG_CONFIG_HOME"]) if "XDG_CONFIG_HOME" in os.environ else str(Path.home())+"/.config/owo/",
|
||||||
"{}/".format(os.environ["XDG_CONFIG_HOME"]) if "XDG_CONFIG_HOME" in os.environ else str(Path.home())+"/.config/",
|
"{}/".format(os.environ["XDG_CONFIG_HOME"]) if "XDG_CONFIG_HOME" in os.environ else str(Path.home())+"/.config/",
|
||||||
str(Path('~').resolve()),
|
str(Path('~').resolve()),
|
||||||
str(Path().resolve()) if str(Path.cwd()) not in self._DIRS else None
|
str(Path().resolve())
|
||||||
],
|
],
|
||||||
'_FNAME_RE':
|
'_FNAME_RE':
|
||||||
r"([ou^>]w[ou^<]|config)\.(ya?ml|c(on)?fi?g?)$"
|
r"([ou^>]w[ou^<]|config)\.(ya?ml|c(on)?fi?g?)$"
|
||||||
|
@ -23,13 +24,23 @@ _LOCATIONS = {
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
def _updateConf(toAdd: dict):
|
def _mDC_listMatches(inp: str) -> list:
|
||||||
_config = toAdd.update(_config)
|
"\n".join(os.listdir(inp))
|
||||||
|
return re.findall(
|
||||||
|
_LOCATIONS['_YAMLCONFPATH']['_FNAME_RE'],
|
||||||
|
inp
|
||||||
|
)
|
||||||
|
|
||||||
def initConfig(path: str) -> bool:
|
def _makeDefaultConfs() -> list:
|
||||||
if _configloaded:
|
locates=[]
|
||||||
return True# If config already loaded, do not reload.
|
for x in _LOCATIONS['_YAMLCONFPATH']['_DIR']:
|
||||||
else:
|
locates+=_mDC_listMatches(x)
|
||||||
|
return locates
|
||||||
|
|
||||||
|
def _updateConf(toAdd: dict):
|
||||||
|
_config.update(toAdd)
|
||||||
|
|
||||||
|
def _loadConfigFile(path: str):
|
||||||
try:
|
try:
|
||||||
file = Path(path)
|
file = Path(path)
|
||||||
|
|
||||||
|
@ -45,4 +56,16 @@ def initConfig(path: str) -> bool:
|
||||||
_updateConf(conf)
|
_updateConf(conf)
|
||||||
if file not in _files:
|
if file not in _files:
|
||||||
_files+str(file)
|
_files+str(file)
|
||||||
|
except Exception as exc:
|
||||||
|
print(exc)
|
||||||
|
import traceback
|
||||||
|
traceback.print_exc(file=sys.stderr)
|
||||||
|
|
||||||
|
def initConfig(path: str = None) -> bool:
|
||||||
|
if _configloaded:
|
||||||
|
return True# If config already loaded, do not reload.
|
||||||
|
else:
|
||||||
|
_toLookIn=_makeDefaultConfs()+path
|
||||||
|
for loc in _toLookIn:
|
||||||
|
_loadConfigFile(loc)
|
||||||
|
|
||||||
|
|
|
@ -1,3 +1,7 @@
|
||||||
|
# TODO: clean this up
|
||||||
|
# TODO: complete dateFormat()
|
||||||
|
# TODO: complete stringFormat()
|
||||||
|
|
||||||
_DEFAULT = {
|
_DEFAULT = {
|
||||||
'_DATETEMP':'%a, %d %b %Y %H:%M:%S %Z%z',
|
'_DATETEMP':'%a, %d %b %Y %H:%M:%S %Z%z',
|
||||||
'_INCLUDE':[
|
'_INCLUDE':[
|
||||||
|
@ -14,7 +18,7 @@ def dateFormat(input: str = _DEFAULT._DATETEMP,use_local:bool=True) -> str:
|
||||||
from time import gmtime
|
from time import gmtime
|
||||||
return strftime(input,gmtime())
|
return strftime(input,gmtime())
|
||||||
|
|
||||||
def stringformat(
|
def stringFormat(
|
||||||
input: str,
|
input: str,
|
||||||
include: list = _DEFAULT._INCLUDE
|
include: list = _DEFAULT._INCLUDE
|
||||||
) -> str:
|
) -> str:
|
||||||
|
|
|
@ -10,15 +10,14 @@ import logging
|
||||||
# 'errors': []
|
# 'errors': []
|
||||||
# }
|
# }
|
||||||
|
|
||||||
|
|
||||||
class OutputObject:
|
class OutputObject:
|
||||||
|
|
||||||
def __init__(self):
|
def __init__(self, type: int):
|
||||||
self.status = 1
|
self.OOType = [
|
||||||
|
'HeaderTable', 'BasicInfoTable', 'AdvancedInfoTable', 'DebugInfoTable'
|
||||||
|
][type]
|
||||||
|
if type == 0:
|
||||||
import sys
|
import sys
|
||||||
self.input = {
|
self.input = {'argsRaw': sys.argv, 'streamObjects': []}
|
||||||
'argsRaw': sys.argv,
|
|
||||||
'streamObjects': []
|
|
||||||
}
|
|
||||||
del sys
|
del sys
|
||||||
self.output = []
|
|
||||||
self.errors = []
|
|
||||||
|
|
10
owo/output/owoOutputClass.py
Normal file
10
owo/output/owoOutputClass.py
Normal file
|
@ -0,0 +1,10 @@
|
||||||
|
from .OutputObject import OutputObject
|
||||||
|
class owoOutputClass:
|
||||||
|
def newObject(self,type: int):
|
||||||
|
self.objects.push(OutputObject(type))
|
||||||
|
def __init__(self):
|
||||||
|
self.objects=[OutputObject(0)]
|
||||||
|
# def __iter__(self):
|
||||||
|
# yield [
|
||||||
|
# self.header
|
||||||
|
# ]+self.objects
|
2
owo/parseargs.py
Normal file
2
owo/parseargs.py
Normal file
|
@ -0,0 +1,2 @@
|
||||||
|
def parse():
|
||||||
|
|
Loading…
Reference in a new issue