Skip to content

Commit

Permalink
refactor: Use StandardXlsxParser as default.
Browse files Browse the repository at this point in the history
  • Loading branch information
@dmitry-weirdo
dmitry-weirdo committed Sep 18, 2023
1 parent a0e55ec commit ea36091
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 41 deletions.
4 changes: 2 additions & 2 deletions docs/besk-cup-2023-1-duesseldorf.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<html lang="ru">

<head>
<title>Кубок Бесконечности: первый этап. Камень Реальности (синхрон) &mdash; Дюссельдорф &mdash; графики</title>
<title>Кубок Бесконечности: первый этап. Камень Реальности (синхрон) &mdash; Дюссельдорф &mdash; графики</title>
<script src="https://code.highcharts.com/highcharts.js"></script>
<script src="https://code.highcharts.com/modules/exporting.js"></script>
<script src="https://code.highcharts.com/modules/export-data.js"></script>
Expand All @@ -13,7 +13,7 @@

<body>
<h1>
Кубок Бесконечности: первый этап. Камень Реальности (синхрон) &mdash; Дюссельдорф
Кубок Бесконечности: первый этап. Камень Реальности (синхрон) &mdash; Дюссельдорф
<a href="https://rating.chgk.info/tournament/9416" target="_blank"><img src="./img/old-rating-logo.png" width="30px;" height="30px;" alt="Турнир в старом рейтинге"/></a>
&nbsp;
<a href="https://rating.maii.li/b/tournament/9416/" target="_blank"><img src="./img/new-rating.ico" width="30px;" height="30px;" alt="Турнир в рейтинге МАИИ"/></a>
Expand Down
2 changes: 1 addition & 1 deletion docs/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<h1>Графики турниров ЧГК</h1>

<ul>
<li><a href="./besk-cup-2023-1-duesseldorf.html">Кубок Бесконечности: первый этап. Камень Реальности (синхрон) &mdash; Дюссельдорф</a></li>
<li><a href="./besk-cup-2023-1-duesseldorf.html">Кубок Бесконечности: первый этап. Камень Реальности (синхрон) &mdash; Дюссельдорф</a></li>
<li><a href="./avgustiner-dortmund.html">Международный синхронный турнир "Блаженный Августинер 2023" &mdash; Дортмунд</a></li>
<li><a href="./bojko-okjob-duesseldorf.html">Легкий и бодренький международный фестиваль загадок &mdash; Дюссельдорф</a></li>
<li><a href="./simple-decoration-2023-summer-duesseldorf.html">Международный синхронный турнир "Простое украшенье" 2023. Лето. &mdash; Дюссельдорф</a></li>
Expand Down
43 changes: 5 additions & 38 deletions src/main/kotlin/com/chgk/Main.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ class Main : Logging {
private fun parse_besk_cup_2023_1(): TournamentGenerator {
val tournament = Tournament(
9416,
"Кубок Бесконечности: первый этап. Камень Реальности (синхрон) ",
"Кубок Бесконечности: первый этап. Камень Реальности (синхрон)",
"Дюссельдорф"
)

Expand All @@ -92,7 +92,6 @@ class Main : Logging {
return generateTournamentHtmlToStandardDirectory(
tournament,
visibleTeamNames,
StandardXlsxParser,
"tournament-tours-9416-15-Sep-2023.xlsx",
"besk-cup-2023-1-duesseldorf.html"
)
Expand Down Expand Up @@ -122,7 +121,6 @@ class Main : Logging {
return generateTournamentHtmlToStandardDirectory(
tournament,
visibleTeamNames,
StandardXlsxParser,
"tournament_tours_9374_21_Aug_2023_Блаж_Августинер_2023.xlsx",
"avgustiner-dortmund.html"
)
Expand Down Expand Up @@ -160,7 +158,6 @@ class Main : Logging {
return generateTournamentHtmlToStandardDirectory(
tournament,
visibleTeamNames,
StandardXlsxParser,
"tournament-tours-9612-14-Aug-2023__BOJKOJOB__1.xlsx",
"bojko-okjob-duesseldorf.html"
)
Expand Down Expand Up @@ -197,7 +194,6 @@ class Main : Logging {
return generateTournamentHtmlToStandardDirectory(
tournament,
visibleTeamNames,
StandardXlsxParser,
"tournament_tours_9501_29_Jul_2023_Прост_Украаш_1.xlsx",
"simple-decoration-2023-summer-duesseldorf.html"
)
Expand Down Expand Up @@ -230,7 +226,6 @@ class Main : Logging {
return generateTournamentHtmlToStandardDirectory(
tournament,
visibleTeamNames,
StandardXlsxParser,
"tournament_tours_9487_16_Jul_2023_Ултима_Туле_1_Испр.xlsx",
"ultima-tule-2023-duesseldorf.html"
)
Expand Down Expand Up @@ -265,7 +260,6 @@ class Main : Logging {
return generateTournamentHtmlToStandardDirectory(
tournament,
visibleTeamNames,
StandardXlsxParser,
"tournament_tours_9398_30_Jun_2023_1_Серия_Premier_измен.xlsx",
"premier-sunny-days-2023-duesseldorf.html"
)
Expand Down Expand Up @@ -295,7 +289,6 @@ class Main : Logging {
return generateTournamentHtmlToStandardDirectory(
tournament,
visibleTeamNames,
StandardXlsxParser,
"tournament-tours-9196-31-May-2023.xlsx",
"ekvestria-9-dortmund.html"
)
Expand Down Expand Up @@ -332,7 +325,6 @@ class Main : Logging {
return generateTournamentHtmlToStandardDirectory(
tournament,
visibleTeamNames,
StandardXlsxParser,
"tournament-tours-8917-28-May-2023.xlsx",
"hypercube-3.html",
)
Expand Down Expand Up @@ -361,7 +353,6 @@ class Main : Logging {
return generateTournamentHtmlToStandardDirectory(
tournament,
visibleTeamNames,
StandardXlsxParser,
"tournament-tours-9070-22-May-2023.xlsx",
"ostrovok-besk-may-2023.html"
)
Expand Down Expand Up @@ -394,7 +385,6 @@ class Main : Logging {
return generateTournamentHtmlToStandardDirectory(
tournament,
visibleTeamNames,
StandardXlsxParser,
"tournament-tours-9018-13-May-2023.xlsx",
"spv-spring-2023-duesseldorf.html"
)
Expand Down Expand Up @@ -428,7 +418,6 @@ class Main : Logging {
return generateTournamentHtmlToStandardDirectory(
tournament,
visibleTeamNames,
StandardXlsxParser,
"tournament-tours-9033-01-May-2023.xlsx",
"ekvestria-8-duesseldorf.html"
)
Expand Down Expand Up @@ -459,7 +448,6 @@ class Main : Logging {
return generateTournamentHtmlToStandardDirectory(
tournament,
visibleTeamNames,
StandardXlsxParser,
"tournament-tours-9116-25-Apr-2023.xlsx",
"lm-orange-light-dortmund.html"
)
Expand Down Expand Up @@ -489,7 +477,6 @@ class Main : Logging {
return generateTournamentHtmlToStandardDirectory(
tournament,
visibleTeamNames,
StandardXlsxParser,
"tournament-tours-9014-16-Apr-2023.xlsx",
"premier-cup-of-light-horses-2023-duesseldorf.html"
)
Expand Down Expand Up @@ -519,7 +506,6 @@ class Main : Logging {
return generateTournamentHtmlToStandardDirectory(
tournament,
visibleTeamNames,
StandardXlsxParser,
"tournament-tours-8425-06-Apr-2023__1.xlsx",
"cube-8-dortmund.html"
)
Expand Down Expand Up @@ -552,7 +538,6 @@ class Main : Logging {
return generateTournamentHtmlToStandardDirectory(
tournament,
visibleTeamNames,
StandardXlsxParser,
"tournament-tours-8842-01-Apr-2023_1.xlsx",
"12-graney-1-duesseldorf.html"
)
Expand Down Expand Up @@ -584,7 +569,6 @@ class Main : Logging {
return generateTournamentHtmlToStandardDirectory(
tournament,
visibleTeamNames,
StandardXlsxParser,
"tournament-tours-9013-27-Mar-2023__2.xlsx",
"triz-2023-1-dortmund.html"
)
Expand Down Expand Up @@ -615,7 +599,6 @@ class Main : Logging {
return generateTournamentHtmlToStandardDirectory(
tournament,
visibleTeamNames,
StandardXlsxParser,
"tournament-tours-8740-16-Mar-2023.xlsx",
"premier-march-ydes-duesseldorf.html"
)
Expand Down Expand Up @@ -646,7 +629,6 @@ class Main : Logging {
return generateTournamentHtmlToStandardDirectory(
tournament,
visibleTeamNames,
StandardXlsxParser,
"tournament-tours-8951-13-Mar-2023.xlsx",
"ekvestria-7-dortmund.html"
)
Expand Down Expand Up @@ -679,7 +661,6 @@ class Main : Logging {
return generateTournamentHtmlToStandardDirectory(
tournament,
visibleTeamNames,
StandardXlsxParser,
"tournament-tours-8873-03-Mar-2023.xlsx",
"ekvestria-6-duesseldorf.html"
)
Expand Down Expand Up @@ -712,7 +693,6 @@ class Main : Logging {
return generateTournamentHtmlToStandardDirectory(
tournament,
visibleTeamNames,
StandardXlsxParser,
"tournament-tours-8809-15-Feb-2023.xlsx",
"ostrovok-besk.html"
)
Expand Down Expand Up @@ -742,7 +722,6 @@ class Main : Logging {
return generateTournamentHtmlToStandardDirectory(
tournament,
visibleTeamNames,
StandardXlsxParser,
"tournament-tours-8793-04-Feb-2023-wc.xlsx",
"besk-zemli-35.html"
)
Expand Down Expand Up @@ -773,7 +752,6 @@ class Main : Logging {
return generateTournamentHtmlToStandardDirectory(
tournament,
visibleTeamNames,
StandardXlsxParser,
"tournament-tours-8871-30-Jan-2023.xlsx",
"sbr-5-stage-1-2023.html"
)
Expand Down Expand Up @@ -803,7 +781,6 @@ class Main : Logging {
return generateTournamentHtmlToStandardDirectory(
tournament,
visibleTeamNames,
StandardXlsxParser,
"tournament-tours-8734-30-Jan-2023_ре.xlsx",
"spv-winter-2023-dortmund.html"
)
Expand Down Expand Up @@ -832,7 +809,6 @@ class Main : Logging {
return generateTournamentHtmlToStandardDirectory(
tournament,
visibleTeamNames,
StandardXlsxParser,
"tournament-tours-8802-25-Jan-2023.xlsx",
"simple-decoration-2023-dortmund.html"
)
Expand Down Expand Up @@ -862,7 +838,6 @@ class Main : Logging {
return generateTournamentHtmlToStandardDirectory(
tournament,
visibleTeamNames,
StandardXlsxParser,
"tournament-tours-8803-25-Jan-2023__1.xlsx",
"easy-smolensk-5-2023-dortmund.html"
)
Expand Down Expand Up @@ -895,7 +870,6 @@ class Main : Logging {
return generateTournamentHtmlToStandardDirectory(
tournament,
visibleTeamNames,
StandardXlsxParser,
"tournament-tours-8835-20-Jan-2023.xlsx",
"second-raven-2023-duesseldorf.html"
)
Expand Down Expand Up @@ -929,7 +903,6 @@ class Main : Logging {
return generateTournamentHtmlToStandardDirectory(
tournament,
visibleTeamNames,
StandardXlsxParser,
"tournament-tours-8755-07-Jan-2023.xlsx",
"olivier-cup-2023-duesseldorf.html"
)
Expand Down Expand Up @@ -960,7 +933,6 @@ class Main : Logging {
return generateTournamentHtmlToStandardDirectory(
tournament,
visibleTeamNames,
StandardXlsxParser,
"tournament-tours-8791-29-Dec-2022.xlsx",
"nevmogotu-2022-dortmund.html"
)
Expand Down Expand Up @@ -995,7 +967,6 @@ class Main : Logging {
return generateTournamentHtmlToStandardDirectory(
tournament,
visibleTeamNames,
StandardXlsxParser,
"tournament-tours-8669-28-Dec-2022.xlsx",
"easy-smolensk-20-duesseldorf.html"
)
Expand Down Expand Up @@ -1027,7 +998,6 @@ class Main : Logging {
return generateTournamentHtmlToStandardDirectory(
tournament,
visibleTeamNames,
StandardXlsxParser,
"tournament-tours-8633-13-Dec-2022.xlsx",
"ekvestria-4-duesseldorf.html"
)
Expand Down Expand Up @@ -1059,7 +1029,6 @@ class Main : Logging {
return generateTournamentHtmlToStandardDirectory(
tournament,
visibleTeamNames,
StandardXlsxParser,
"tournament-tours-8561-24-Nov-2022_н.xlsx",
"top-1000-2022-3-duesseldorf.html"
)
Expand Down Expand Up @@ -1091,7 +1060,6 @@ class Main : Logging {
return generateTournamentHtmlToStandardDirectory(
tournament,
visibleTeamNames,
StandardXlsxParser,
"tournament-tours-7700-07-Nov-2022__2.xlsx",
"ovsch-2022-3-dortmund.html"
)
Expand Down Expand Up @@ -1125,7 +1093,6 @@ class Main : Logging {
return generateTournamentHtmlToStandardDirectory(
tournament,
visibleTeamNames,
StandardXlsxParser,
"tournament-tours-8589-11-Nov-2022.xlsx",
"triz-2022-4-duesseldorf.html"
)
Expand Down Expand Up @@ -1160,18 +1127,18 @@ class Main : Logging {
return generateTournamentHtmlToStandardDirectory(
tournament,
visibleTeamNames,
XlsxParser,
"Результаты Большой игры - 4ОЧЧ.xlsx",
"ochh-2022.html"
"ochh-2022.html",
XlsxParser
)
}

private fun generateTournamentHtmlToStandardDirectory(
tournament: Tournament,
visibleTeamNames: List<String>,
excelParser: ExcelParser,
inputExcelFilePath: String,
htmlFileName: String
htmlFileName: String,
excelParser: ExcelParser = StandardXlsxParser
): TournamentGenerator {
val generator = TournamentGenerator(
tournament,
Expand Down

0 comments on commit ea36091

Please sign in to comment.