From 6cd211f74497c3aa0480fd545592ebe195eb5a94 Mon Sep 17 00:00:00 2001 From: Agzamus Date: Fri, 11 Sep 2026 02:34:30 +0300 Subject: [PATCH] fix: no more group prefix --- .../java/agzam/vyatsu/data/remote/pdf/PdfScheduleParser.kt | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/agzam/vyatsu/data/remote/pdf/PdfScheduleParser.kt b/app/src/main/java/agzam/vyatsu/data/remote/pdf/PdfScheduleParser.kt index a73455d..b1fc563 100644 --- a/app/src/main/java/agzam/vyatsu/data/remote/pdf/PdfScheduleParser.kt +++ b/app/src/main/java/agzam/vyatsu/data/remote/pdf/PdfScheduleParser.kt @@ -108,9 +108,13 @@ object PdfScheduleParser { for (dayCell in daysColumn.cells) { val day = content(dayCell).split(' ') + if(day.size == 1) { + Log.v(TAG, "day.first(): ${day.first()}") + } if(day.size == 1 && day.first() == "День") { val groupCell = select(lessonsColumn, dayCell).firstOrNull() ?: continue group = content(groupCell) + Log.v(TAG, "Group: $group") continue } if(day.size != 2) { @@ -164,7 +168,7 @@ object PdfScheduleParser { val teacher = raw.substring(typeMatch.last().range.last+1, raw.length - room.length).trim() var subgroup: String? = null Log.d(TAG, "$subject $group") - if(group != null && subject.startsWith("$group,")) { + if(group != null && (subject.startsWith("$group,") || subject.startsWith("$group "))) { subject = subject.substring(group.length + 1).trim() val subgroupMatch = SUBGROUP_REGEX.find(subject) if(subgroupMatch != null) { @@ -197,6 +201,7 @@ object PdfScheduleParser { /** Вывод таблички из PDF в SVG формате + отладочные жлементы из [Pdf2Table.asTable] **/ Log.v(SVG_TAG, "====") + Log.v(SVG_TAG+ "-" + (pageIndex+1), "====") for(line in svg.asSvg().split("\n")) { if(line.length > 250) { Log.v(SVG_TAG, "length: " + line.length)