slt/solo-auswertung
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 10 Wiki Activity

Revert "Add UI dialog for unknown path"

Browse Source 
This reverts commit 90f82e677e.
This commit is contained in:
Christian Wolf 2023-10-06 16:20:39 +02:00
parent 5015a4e4e1
commit be5ac238bc
3 changed files with 5 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/main.py
View File

@ -16,7 +16,6 @@ def main():
cli = solo_turnier.cli.Cli(l) cli = solo_turnier.cli.Cli(l)
batchWorker = solo_turnier.batch.BatchWorker(cli) batchWorker = solo_turnier.batch.BatchWorker(cli)
batchWorker.prepare()
if cli.showGUI(): if cli.showGUI():
raise Exception('Not yet implemented') raise Exception('Not yet implemented')

25
src/solo_turnier/batch.py
View File

@ -5,8 +5,6 @@ import os
import pprint import pprint
import tabulate import tabulate
import tkinter.filedialog
import tkinter.simpledialog
class BatchWorker: class BatchWorker:
def __init__( def __init__(
@ -15,33 +13,16 @@ class BatchWorker:
): ):
self.l = logging.getLogger('solo_turnier.batch') self.l = logging.getLogger('solo_turnier.batch')
self.config = config self.config = config
self.importPath = None
def prepare(self):
self.importPath = self.config.importHtmlPath()
if self.importPath is None:
self.l.debug('No HTML import path was provided.')
self.importPath = tkinter.filedialog.askdirectory(mustexist=True, title='HMTL Export auswählen')
if self.importPath is None or len(self.importPath) == 0:
self.l.critical('Import path was not selected. Aborting.')
tkinter.simpledialog.messagebox.showerror(
title='Invalid HTML path selected',
message='You did not select an appropriate folder. Aborting now.'
)
exit(1)
self.l.debug('Using import path %s', self.importPath)
def run(self, removeFilteredParicipants=True): def run(self, removeFilteredParicipants=True):
self.l.debug(self.config.__dict__) self.l.debug(self.config.__dict__)
locator = solo_turnier.html_locator.HtmlLocator() locator = solo_turnier.html_locator.HtmlLocator()
self.l.info('Checking for feasible preview HTML export files in "%s"', self.importPath) self.l.info('Checking for feasible preview HTML export files in "%s"', self.config.importHtmlPath())
htmlCandidatesPreview = locator.findPreviewRoundCandidates(self.importPath) htmlCandidatesPreview = locator.findPreviewRoundCandidates(self.config.importHtmlPath())
self.l.debug('Found HTML file candidates for preview rounds: %s', htmlCandidatesPreview) self.l.debug('Found HTML file candidates for preview rounds: %s', htmlCandidatesPreview)
htmlResultFiles = locator.findCandidates(self.importPath) htmlResultFiles = locator.findCandidates(self.config.importHtmlPath())
self.l.debug('Using HTML result files for result extraction: %s', htmlResultFiles) self.l.debug('Using HTML result files for result extraction: %s', htmlResultFiles)
worker = solo_turnier.worker.Worker() worker = solo_turnier.worker.Worker()

4
src/solo_turnier/cli.py
View File

@ -10,7 +10,7 @@ class Cli:
parser.add_argument('--no-flask', action='store_false', dest='flask', help='Disable the internal flask web server') parser.add_argument('--no-flask', action='store_false', dest='flask', help='Disable the internal flask web server')
parser.add_argument('--port', help='The port to listen for incoming requests', default='8082') parser.add_argument('--port', help='The port to listen for incoming requests', default='8082')
parser.add_argument('html', help='The path from where to look for HTML export files', nargs='?', default=None) parser.add_argument('html', help='The path from where to look for HTML export files', nargs=1, default=['.'])
parser.add_argument('-o', '--output', help='Set the output path of the script', nargs=1, default=[None]) parser.add_argument('-o', '--output', help='Set the output path of the script', nargs=1, default=[None])
parser.add_argument('--all-participants', '-a', action='store_true', help='Show all participants not only finalists') parser.add_argument('--all-participants', '-a', action='store_true', help='Show all participants not only finalists')
@ -40,7 +40,7 @@ class Cli:
return self.__args.flask return self.__args.flask
def importHtmlPath(self): def importHtmlPath(self):
return self.__args.html return self.__args.html[0]
def importCSVPath(self): def importCSVPath(self):
return self.__args.import_from[0] return self.__args.import_from[0]