fix(parser): fix sentry error sending

feat(parser): limit names regex to maximum 2 elements
This allows us to not worry about subgroups array index overflows, and we can make better non-standard case solving.
2025-12-06 09:47:50 +03:00 · 2025-10-10 03:00:47 +04:00 · 2025-10-10 01:39:54 +04:00 · 2025-10-10 01:37:52 +04:00 · 2025-10-10 01:31:55 +04:00 · 2025-10-10 01:30:56 +04:00
12 changed files with 461 additions and 510 deletions
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -41,7 +41,7 @@ jobs:

      - name: Test
        run: |
-          cargo test --verbose
+          cargo test
        env:
          DATABASE_URL: ${{ env.TEST_DB }}
          SCHEDULE_DISABLE_AUTO_UPDATE: 1
@@ -68,7 +68,7 @@ jobs:
          toolchain: stable

      - name: Build
-        run: cargo build --release --verbose
+        run: cargo build --release

      - name: Extract debug symbols
        run: |
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -204,9 +204,9 @@ dependencies = [

 [[package]]
 name = "addr2line"
-version = "0.24.2"
+version = "0.25.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dfbe277e56a376000877090da837660b4427aad530e3028d44e0bffe4f89a1c1"
+checksum = "1b5d307320b3181d6d7954e663bd7c774a838b8220fe0593c86d9fb09f498b4b"
 dependencies = [
 "gimli",
 ]
@@ -290,9 +290,9 @@ dependencies = [

 [[package]]
 name = "anstyle"
-version = "1.0.11"
+version = "1.0.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "862ed96ca487e809f1c8e5a8447f6ee2cf102f846893800b20cebdf541fc6bbd"
+checksum = "5192cca8006f1fd4f7237516f40fa183bb07f8fbdfedaa0036de5ea9b0b45e78"

 [[package]]
 name = "anstyle-parse"
@@ -422,7 +422,7 @@ dependencies = [
 "polling",
 "rustix",
 "slab",
- "windows-sys 0.61.0",
+ "windows-sys 0.61.1",
 ]

 [[package]]
@@ -581,9 +581,9 @@ dependencies = [

 [[package]]
 name = "backtrace"
-version = "0.3.75"
+version = "0.3.76"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6806a6321ec58106fea15becdad98371e28d92ccbc7c8f1b3b6dd724fe8f1002"
+checksum = "bb531853791a215d7c62a30daf0dde835f381ab5de4589cfe7c649d2cbe92bd6"
 dependencies = [
 "addr2line",
 "cfg-if",
@@ -591,7 +591,7 @@ dependencies = [
 "miniz_oxide",
 "object",
 "rustc-demangle",
- "windows-targets 0.52.6",
+ "windows-link 0.2.0",
 ]

 [[package]]
@@ -652,6 +652,21 @@ dependencies = [
 "serde",
 ]

+[[package]]
+name = "bit-set"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "08807e080ed7f9d5433fa9b275196cfc35414f66a0c79d864dc51a0d825231a3"
+dependencies = [
+ "bit-vec",
+]
+
+[[package]]
+name = "bit-vec"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5e764a1d40d510daf35e07be9eb06e75770908c27d411ee6c92109c9840eaaf7"
+
 [[package]]
 name = "bitflags"
 version = "2.9.4"
@@ -825,9 +840,9 @@ dependencies = [

 [[package]]
 name = "calamine"
-version = "0.30.1"
+version = "0.31.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b1a9acfeb1555aa8def91fe8ff208aadaea850c109968ec35ac965edbe7d210b"
+checksum = "da56b262e8a827c6b12c3dde4ea4622e0ff542bd2e9ea5855e4cb523481d77b7"
 dependencies = [
 "atoi_simd",
 "byteorder 1.5.0",
@@ -835,16 +850,16 @@ dependencies = [
 "encoding_rs",
 "fast-float2",
 "log",
- "quick-xml 0.37.5",
+ "quick-xml",
 "serde",
 "zip",
 ]

 [[package]]
 name = "cc"
-version = "1.2.38"
+version = "1.2.39"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "80f41ae168f955c12fb8960b057d70d0ca153fb83182b57d86380443527be7e9"
+checksum = "e1354349954c6fc9cb0deab020f27f783cf0b604e8bb754dc4658ecf0d29c35f"
 dependencies = [
 "find-msvc-tools",
 "jobserver",
@@ -1124,7 +1139,7 @@ dependencies = [
 "cfg-if",
 "cpufeatures",
 "curve25519-dalek-derive",
- "digest 0.11.0-rc.2",
+ "digest 0.11.0-rc.3",
 "fiat-crypto",
 "rustc_version",
 "subtle",
@@ -1305,9 +1320,9 @@ dependencies = [

 [[package]]
 name = "digest"
-version = "0.11.0-rc.2"
+version = "0.11.0-rc.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6749b668519cd7149ee3d11286a442a8a8bdc3a9d529605f579777bfccc5a4bc"
+checksum = "dac89f8a64533a9b0eaa73a68e424db0fb1fd6271c74cc0125336a05f090568d"
 dependencies = [
 "block-buffer 0.11.0-rc.5",
 "const-oid 0.10.1",
@@ -1422,7 +1437,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb"
 dependencies = [
 "libc",
- "windows-sys 0.61.0",
+ "windows-sys 0.61.1",
 ]

 [[package]]
@@ -1463,6 +1478,17 @@ dependencies = [
 "pin-project-lite",
 ]

+[[package]]
+name = "fancy-regex"
+version = "0.16.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "998b056554fbe42e03ae0e152895cd1a7e1002aec800fdc6635d20270260c46f"
+dependencies = [
+ "bit-set",
+ "regex-automata",
+ "regex-syntax",
+]
+
 [[package]]
 name = "fast-float2"
 version = "0.2.3"
@@ -1723,9 +1749,9 @@ dependencies = [

 [[package]]
 name = "gimli"
-version = "0.31.1"
+version = "0.32.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "07e28edb80900c19c28f1072f2e8aeca7fa06b23cd4169cefe1af5aa3260783f"
+checksum = "e629b9b98ef3dd8afe6ca2bd0f89306cec16d43d907889945bc5d6687f2f13c7"

 [[package]]
 name = "glob"
@@ -1974,9 +2000,9 @@ checksum = "135b12329e5e3ce057a9f972339ea52bc954fe1e9358ef27f95e89716fbc5424"

 [[package]]
 name = "hybrid-array"
-version = "0.4.4"
+version = "0.4.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2bad028b20a90afcdb5e28a53392562f1db2bdfa238aa1a978b911461bfffb92"
+checksum = "f471e0a81b2f90ffc0cb2f951ae04da57de8baa46fa99112b062a5173a5088d0"
 dependencies = [
 "typenum",
 ]
@@ -2515,9 +2541,9 @@ dependencies = [

 [[package]]
 name = "memchr"
-version = "2.7.5"
+version = "2.7.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "32a282da65faaf38286cf3be983213fcf1d2e2a58700e808f83f4ea9a4804bc0"
+checksum = "f52b00d39961fc5b2736ea853c9cc86238e165017a493d1d5c8eac6bdc4cc273"

 [[package]]
 name = "migration"
@@ -2652,9 +2678,9 @@ dependencies = [

 [[package]]
 name = "object"
-version = "0.36.7"
+version = "0.37.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "62948e14d923ea95ea2c7c86c71013138b66525b86bdc08d2dcc262bdb497b87"
+checksum = "ff76201f031d8863c38aa7f905eca4f53abbfa15f609db4277d44cd8938f33fe"
 dependencies = [
 "memchr",
 ]
@@ -2923,7 +2949,7 @@ checksum = "740ebea15c5d1428f910cd1a5f52cebf8d25006245ed8ade92702f4943d91e07"
 dependencies = [
 "base64 0.22.1",
 "indexmap 2.11.4",
- "quick-xml 0.38.3",
+ "quick-xml",
 "serde",
 "time 0.3.44",
 ]
@@ -2939,7 +2965,7 @@ dependencies = [
 "hermit-abi",
 "pin-project-lite",
 "rustix",
- "windows-sys 0.61.0",
+ "windows-sys 0.61.1",
 ]

 [[package]]
@@ -3068,18 +3094,18 @@ dependencies = [

 [[package]]
 name = "provider-engels-polytechnic"
-version = "0.2.0"
+version = "0.2.3"
 dependencies = [
 "async-trait",
 "base",
 "calamine",
 "chrono",
 "derive_more",
+ "fancy-regex",
 "log",
 "regex",
 "reqwest",
 "sentry",
- "serde",
 "strsim",
 "tokio",
 "tokio-util",
@@ -3123,28 +3149,19 @@ checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0"

 [[package]]
 name = "quick-xml"
-version = "0.37.5"
+version = "0.38.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "331e97a1af0bf59823e6eadffe373d7b27f485be8748f71471c662c1f269b7fb"
+checksum = "42a232e7487fc2ef313d96dde7948e7a3c05101870d8985e4fd8d26aedd27b89"
 dependencies = [
 "encoding_rs",
 "memchr",
 ]

-[[package]]
-name = "quick-xml"
-version = "0.38.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "42a232e7487fc2ef313d96dde7948e7a3c05101870d8985e4fd8d26aedd27b89"
-dependencies = [
- "memchr",
-]
-
 [[package]]
 name = "quote"
-version = "1.0.40"
+version = "1.0.41"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1885c039570dc00dcb4ff087a89e185fd56bae234ddc7f056a945bf36467248d"
+checksum = "ce25767e7b499d1b604768e7cde645d14cc8584231ea6b295e9c9eb22c02e1d1"
 dependencies = [
 "proc-macro2",
 ]
@@ -3278,18 +3295,18 @@ dependencies = [

 [[package]]
 name = "ref-cast"
-version = "1.0.24"
+version = "1.0.25"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4a0ae411dbe946a674d89546582cea4ba2bb8defac896622d6496f14c23ba5cf"
+checksum = "f354300ae66f76f1c85c5f84693f0ce81d747e2c3f21a45fef496d89c960bf7d"
 dependencies = [
 "ref-cast-impl",
 ]

 [[package]]
 name = "ref-cast-impl"
-version = "1.0.24"
+version = "1.0.25"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1165225c21bff1f3bbce98f5a1f889949bc902d3575308cc7b0de30b4f6d27c7"
+checksum = "b7186006dcb21920990093f30e3dea63b7d6e977bf1256be20c3563a5db070da"
 dependencies = [
 "proc-macro2",
 "quote",
@@ -3298,9 +3315,9 @@ dependencies = [

 [[package]]
 name = "regex"
-version = "1.11.2"
+version = "1.11.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23d7fd106d8c02486a8d64e778353d1cffe08ce79ac2e82f540c86d0facf6912"
+checksum = "8b5288124840bee7b386bc413c487869b360b2b4ec421ea56425128692f2a82c"
 dependencies = [
 "aho-corasick",
 "memchr",
@@ -3310,9 +3327,9 @@ dependencies = [

 [[package]]
 name = "regex-automata"
-version = "0.4.10"
+version = "0.4.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6b9458fa0bfeeac22b5ca447c63aaf45f28439a709ccd244698632f9aa6394d6"
+checksum = "833eb9ce86d40ef33cb1306d8accf7bc8ec2bfea4355cbdebb3df68b40925cad"
 dependencies = [
 "aho-corasick",
 "memchr",
@@ -3505,7 +3522,7 @@ dependencies = [
 "errno",
 "libc",
 "linux-raw-sys",
- "windows-sys 0.61.0",
+ "windows-sys 0.61.1",
 ]

 [[package]]
@@ -3543,9 +3560,9 @@ dependencies = [

 [[package]]
 name = "rustls-webpki"
-version = "0.103.6"
+version = "0.103.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8572f3c2cb9934231157b45499fc41e1f58c589fdfb81a844ba873265e80f8eb"
+checksum = "e10b3f4191e8a80e6b43eebabfac91e5dcecebb27a71f04e820c47ec41d314bf"
 dependencies = [
 "ring",
 "rustls-pki-types",
@@ -3570,12 +3587,12 @@ version = "0.1.28"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "891d81b926048e76efe18581bf793546b4c0eaf8448d72be8de2bbee5fd166e1"
 dependencies = [
- "windows-sys 0.61.0",
+ "windows-sys 0.61.1",
 ]

 [[package]]
 name = "schedule-parser-rusted"
-version = "1.3.0"
+version = "1.3.1"
 dependencies = [
 "actix-macros 0.1.0",
 "actix-test",
@@ -3658,9 +3675,9 @@ dependencies = [

 [[package]]
 name = "sea-orm"
-version = "2.0.0-rc.8"
+version = "2.0.0-rc.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aec356c934999cd8ec80f7e5465387cdc343a6b9baf007e019825ef12ea9f8a9"
+checksum = "a5f6630c76b8485b923b13dfce133ce6f8158d9a1dcbc8443b6f5de4952962e5"
 dependencies = [
 "async-stream",
 "async-trait",
@@ -3688,9 +3705,9 @@ dependencies = [

 [[package]]
 name = "sea-orm-cli"
-version = "2.0.0-rc.8"
+version = "2.0.0-rc.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6c80ca87e70522c917fcde3cd4320c435f738dd945e8eaf8fc04dea104efc991"
+checksum = "5b530382bd0183fc89e132d3173fa6c49693a4804287e1ca1be45fdfe598522a"
 dependencies = [
 "chrono",
 "clap",
@@ -3707,9 +3724,9 @@ dependencies = [

 [[package]]
 name = "sea-orm-macros"
-version = "2.0.0-rc.8"
+version = "2.0.0-rc.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a4e75594b9a9d3c41811bc3677f5350a08ba56c22418e6e4ad766511e20fa2ea"
+checksum = "7bbde8c00319d452714377c1842b4ee3ec7d2eb2b3bd022f7515f6637598c135"
 dependencies = [
 "heck 0.5.0",
 "proc-macro2",
@@ -3721,9 +3738,9 @@ dependencies = [

 [[package]]
 name = "sea-orm-migration"
-version = "2.0.0-rc.8"
+version = "2.0.0-rc.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f5efc90c27eca7db947c410d17c185667cc06ba18ca0206261d9c22b955c78c5"
+checksum = "66a64bbe9d65d3a22d8f6019b9519bed1a9fcb522d062b2a442f6537996b3fff"
 dependencies = [
 "async-trait",
 "clap",
@@ -3965,9 +3982,9 @@ dependencies = [

 [[package]]
 name = "serde"
-version = "1.0.226"
+version = "1.0.228"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0dca6411025b24b60bfa7ec1fe1f8e710ac09782dca409ee8237ba74b51295fd"
+checksum = "9a8e94ea7f378bd32cbbd37198a4a91436180c5bb472411e48b5ec2e2124ae9e"
 dependencies = [
 "serde_core",
 "serde_derive",
@@ -3975,18 +3992,18 @@ dependencies = [

 [[package]]
 name = "serde_core"
-version = "1.0.226"
+version = "1.0.228"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ba2ba63999edb9dac981fb34b3e5c0d111a69b0924e253ed29d83f7c99e966a4"
+checksum = "41d385c7d4ca58e59fc732af25c3983b67ac852c1a25000afe1175de458b67ad"
 dependencies = [
 "serde_derive",
 ]

 [[package]]
 name = "serde_derive"
-version = "1.0.226"
+version = "1.0.228"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8db53ae22f34573731bafa1db20f04027b2d25e02d8205921b569171699cdb33"
+checksum = "d540f220d3187173da220f885ab66608367b6574e925011a9353e4badda91d79"
 dependencies = [
 "proc-macro2",
 "quote",
@@ -4089,7 +4106,7 @@ checksum = "c5e046edf639aa2e7afb285589e5405de2ef7e61d4b0ac1e30256e3eab911af9"
 dependencies = [
 "cfg-if",
 "cpufeatures",
- "digest 0.11.0-rc.2",
+ "digest 0.11.0-rc.3",
 ]

 [[package]]
@@ -4111,7 +4128,7 @@ checksum = "d1e3878ab0f98e35b2df35fe53201d088299b41a6bb63e3e34dada2ac4abd924"
 dependencies = [
 "cfg-if",
 "cpufeatures",
- "digest 0.11.0-rc.2",
+ "digest 0.11.0-rc.3",
 ]

 [[package]]
@@ -4559,23 +4576,23 @@ dependencies = [
 "getrandom 0.3.3",
 "once_cell",
 "rustix",
- "windows-sys 0.61.0",
+ "windows-sys 0.61.1",
 ]

 [[package]]
 name = "thiserror"
-version = "2.0.16"
+version = "2.0.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3467d614147380f2e4e374161426ff399c91084acd2363eaf549172b3d5e60c0"
+checksum = "f63587ca0f12b72a0600bcba1d40081f830876000bb46dd2337a3051618f4fc8"
 dependencies = [
 "thiserror-impl",
 ]

 [[package]]
 name = "thiserror-impl"
-version = "2.0.16"
+version = "2.0.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6c5e1be1c48b9172ee610da68fd9cd2770e7a4056cb3fc98710ee6906f0c7960"
+checksum = "3ff15c8ecd7de3849db632e14d18d2571fa09dfc5ed93479bc4485c7a517c913"
 dependencies = [
 "proc-macro2",
 "quote",
@@ -4702,9 +4719,9 @@ dependencies = [

 [[package]]
 name = "tokio-rustls"
-version = "0.26.3"
+version = "0.26.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "05f63835928ca123f1bef57abbcd23bb2ba0ac9ae1235f1e65bda0d06e7786bd"
+checksum = "1729aa945f29d91ba541258c8df89027d5792d85a8841fb65e8bf0f4ede4ef61"
 dependencies = [
 "rustls",
 "tokio",
@@ -4942,9 +4959,9 @@ checksum = "1dccffe3ce07af9386bfd29e80c0ab1a8205a2fc34e4bcd40364df902cfa8f3f"

 [[package]]
 name = "ua_generator"
-version = "0.5.23"
+version = "0.5.24"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a76605c1df5d0b97b7f2f200c2d8bd1a44097e48e6601901aa0afe1047c37f08"
+checksum = "742d74c98cf4d0623ecdd77ef7bbb22d6915793ae2364e364b6d32bf380f5fe4"
 dependencies = [
 "dotenvy",
 "fastrand",
@@ -5359,9 +5376,9 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"

 [[package]]
 name = "windows-core"
-version = "0.62.0"
+version = "0.62.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "57fe7168f7de578d2d8a05b07fd61870d2e73b4020e9f49aa00da8471723497c"
+checksum = "6844ee5416b285084d3d3fffd743b925a6c9385455f64f6d4fa3031c4c2749a9"
 dependencies = [
 "windows-implement",
 "windows-interface",
@@ -5372,9 +5389,9 @@ dependencies = [

 [[package]]
 name = "windows-implement"
-version = "0.60.0"
+version = "0.60.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a47fddd13af08290e67f4acabf4b459f647552718f683a7b415d290ac744a836"
+checksum = "edb307e42a74fb6de9bf3a02d9712678b22399c87e6fa869d6dfcd8c1b7754e0"
 dependencies = [
 "proc-macro2",
 "quote",
@@ -5383,9 +5400,9 @@ dependencies = [

 [[package]]
 name = "windows-interface"
-version = "0.59.1"
+version = "0.59.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bd9211b69f8dcdfa817bfd14bf1c97c9188afa36f4750130fcdf3f400eca9fa8"
+checksum = "c0abd1ddbc6964ac14db11c7213d6532ef34bd9aa042c2e5935f59d7908b46a5"
 dependencies = [
 "proc-macro2",
 "quote",
@@ -5484,14 +5501,14 @@ version = "0.60.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f2f500e4d28234f72040990ec9d39e3a6b950f9f22d3dba18416c35882612bcb"
 dependencies = [
- "windows-targets 0.53.3",
+ "windows-targets 0.53.4",
 ]

 [[package]]
 name = "windows-sys"
-version = "0.61.0"
+version = "0.61.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e201184e40b2ede64bc2ea34968b28e33622acdbbf37104f0e4a33f7abe657aa"
+checksum = "6f109e41dd4a3c848907eb83d5a42ea98b3769495597450cf6d153507b166f0f"
 dependencies = [
 "windows-link 0.2.0",
 ]
@@ -5529,11 +5546,11 @@ dependencies = [

 [[package]]
 name = "windows-targets"
-version = "0.53.3"
+version = "0.53.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d5fe6031c4041849d7c496a8ded650796e7b6ecc19df1a431c1a363342e5dc91"
+checksum = "2d42b7b7f66d2a06854650af09cfdf8713e427a439c97ad65a6375318033ac4b"
 dependencies = [
- "windows-link 0.1.3",
+ "windows-link 0.2.0",
 "windows_aarch64_gnullvm 0.53.0",
 "windows_aarch64_msvc 0.53.0",
 "windows_i686_gnu 0.53.0",
@@ -5794,9 +5811,9 @@ dependencies = [

 [[package]]
 name = "zeroize"
-version = "1.8.1"
+version = "1.8.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde"
+checksum = "b97154e67e32c85465826e8bcc1c59429aaaf107c1e4a9e53c8d8ccd5eff88d0"

 [[package]]
 name = "zerotrie"
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -3,7 +3,7 @@ members = ["actix-macros", "actix-test", "providers"]

 [package]
 name = "schedule-parser-rusted"
-version = "1.3.0"
+version = "1.3.1"
 edition = "2024"
 publish = false

--- a/providers/base/src/lib.rs
+++ b/providers/base/src/lib.rs
@@ -102,7 +102,7 @@ pub enum LessonType {
    CourseProjectDefense,

    /// Практическое занятие.
-    Practice
+    Practice,
 }

 #[derive(Clone, Hash, Debug, Serialize, Deserialize, ToSchema)]
@@ -212,70 +212,6 @@ impl ScheduleSnapshot {
    }
 }

-// #[derive(Clone, Debug, Display, Error, ToSchema)]
-// #[display("row {row}, column {column}")]
-// pub struct ErrorCellPos {
-//     pub row: u32,
-//     pub column: u32,
-// }
-//
-// #[derive(Clone, Debug, Display, Error, ToSchema)]
-// #[display("'{data}' at {pos}")]
-// pub struct ErrorCell {
-//     pub pos: ErrorCellPos,
-//     pub data: String,
-// }
-//
-// impl ErrorCell {
-//     pub fn new(row: u32, column: u32, data: String) -> Self {
-//         Self {
-//             pos: ErrorCellPos { row, column },
-//             data,
-//         }
-//     }
-// }
-
-// #[derive(Clone, Debug, Display, Error, ToSchema)]
-// pub enum ParseError {
-//     /// Errors related to reading XLS file.
-//     #[display("{_0:?}: Failed to read XLS file.")]
-//     #[schema(value_type = String)]
-//     BadXLS(Arc<calamine::XlsError>),
-//
-//     /// Not a single sheet was found.
-//     #[display("No work sheets found.")]
-//     NoWorkSheets,
-//
-//     /// There are no data on the boundaries of the sheet.
-//     #[display("There is no data on work sheet boundaries.")]
-//     UnknownWorkSheetRange,
-//
-//     /// Failed to read the beginning and end of the lesson from the cell
-//     #[display("Failed to read lesson start and end from {_0}.")]
-//     LessonBoundaries(ErrorCell),
-//
-//     /// Not found the beginning and the end corresponding to the lesson.
-//     #[display("No start and end times matching the lesson (at {_0}) was found.")]
-//     LessonTimeNotFound(ErrorCellPos),
-// }
-//
-// impl Serialize for ParseError {
-//     fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
-//     where
-//         S: Serializer,
-//     {
-//         match self {
-//             ParseError::BadXLS(_) => serializer.serialize_str("BAD_XLS"),
-//             ParseError::NoWorkSheets => serializer.serialize_str("NO_WORK_SHEETS"),
-//             ParseError::UnknownWorkSheetRange => {
-//                 serializer.serialize_str("UNKNOWN_WORK_SHEET_RANGE")
-//             }
-//             ParseError::LessonBoundaries(_) => serializer.serialize_str("GLOBAL_TIME"),
-//             ParseError::LessonTimeNotFound(_) => serializer.serialize_str("LESSON_TIME_NOT_FOUND"),
-//         }
-//     }
-// }
-
 #[async_trait]
 pub trait ScheduleProvider
 where
--- a/providers/provider-engels-polytechnic/Cargo.toml
+++ b/providers/provider-engels-polytechnic/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "provider-engels-polytechnic"
-version = "0.2.0"
+version = "0.2.3"
 edition = "2024"

 [features]
@@ -14,13 +14,11 @@ tokio-util = "0.7.16"

 chrono = { version = "0.4.41", features = ["serde"] }

-serde = { version = "1.0.219", features = ["derive"] }
-
-derive_more = { version = "2.0.1", features = ["error", "display"] }
+derive_more = { version = "2.0.1", features = ["error", "display", "from"] }

 utoipa = { version = "5.4.0", features = ["macros", "chrono"] }

-calamine = "0.30"
+calamine = "0.31"
 async-trait = "0.1.89"

 reqwest = "0.12.23"
@@ -29,4 +27,5 @@ regex = "1.11.2"
 strsim = "0.11.1"
 log = "0.4.27"
 sentry = "0.43.0"
+fancy-regex = "0.16.2"

--- a/providers/provider-engels-polytechnic/src/lib.rs
+++ b/providers/provider-engels-polytechnic/src/lib.rs
@@ -1,4 +1,4 @@
-use crate::updater::Updater;
+pub use crate::updater::{UpdateSource, Updater};
 use async_trait::async_trait;
 use base::{ScheduleProvider, ScheduleSnapshot};
 use std::ops::DerefMut;
@@ -8,8 +8,6 @@ use tokio::sync::RwLock;
 use tokio::time::interval;
 use tokio_util::sync::CancellationToken;

-pub use crate::updater::UpdateSource;
-
 mod parser;
 mod updater;
 mod xls_downloader;
@@ -27,7 +25,7 @@ pub struct EngelsPolytechnicProvider {
 impl EngelsPolytechnicProvider {
    pub async fn get(
        update_source: UpdateSource,
-    ) -> Result<Arc<dyn ScheduleProvider>, crate::updater::error::Error> {
+    ) -> Result<Arc<dyn ScheduleProvider>, crate::updater::Error> {
        let (updater, snapshot) = Updater::new(update_source).await?;

        Ok(Arc::new(Wrapper {
@@ -65,9 +63,10 @@ impl ScheduleProvider for Wrapper {
                            this.snapshot = Arc::new(snapshot);
                        },

+                        Err(updater::Error::EmptyUri) => {},
+
                        Err(err) => {
-                            cancellation_token.cancel();
-                            return Err(err.into());
+                            sentry::capture_error(&err);
                        }
                    }
                }
--- a/providers/provider-engels-polytechnic/src/parser/error.rs
+++ b/providers/provider-engels-polytechnic/src/parser/error.rs
@@ -0,0 +1,25 @@
+use crate::parser::worksheet::CellPos;
+use derive_more::{Display, Error, From};
+
+#[derive(Debug, Display, Error, From)]
+pub enum Error {
+    #[from]
+    BadXls(calamine::XlsError),
+
+    #[display("No work sheets found.")]
+    NoWorkSheets,
+
+    #[display("There is no data on work sheet boundaries.")]
+    UnknownWorkSheetRange,
+
+    #[display("Failed to read lesson start and end of lesson at {_0}.")]
+    NoLessonBoundaries(CellPos),
+
+    #[display("No start and end times matching the lesson (at {_0}) was found.")]
+    LessonTimeNotFound(CellPos),
+
+    #[display("Unknown lesson type `{type}` at {pos}")]
+    UnknownLessonType { pos: CellPos, r#type: String },
+}
+
+pub type Result<T> = core::result::Result<T, Error>;
--- a/providers/provider-engels-polytechnic/src/parser/mod.rs
+++ b/providers/provider-engels-polytechnic/src/parser/mod.rs
@@ -1,6 +1,6 @@
+pub use self::error::{Error, Result};
 use crate::or_continue;
-use crate::parser::error::{Error, ErrorCell, ErrorCellPos};
-use crate::parser::worksheet::WorkSheet;
+use crate::parser::worksheet::{CellPos, CellRange, WorkSheet};
 use crate::parser::LessonParseResult::{Lessons, Street};
 use base::LessonType::Break;
 use base::{
@@ -13,82 +13,12 @@ use std::collections::HashMap;
 use std::io::Cursor;
 use std::sync::LazyLock;

+mod error;
 mod macros;
 mod worksheet;

-pub mod error {
-    use derive_more::{Display, Error};
-    use serde::{Serialize, Serializer};
-    use std::sync::Arc;
-    use utoipa::ToSchema;
-
-    #[derive(Clone, Debug, Display, Error, ToSchema)]
-    #[display("row {row}, column {column}")]
-    pub struct ErrorCellPos {
-        pub row: u32,
-        pub column: u32,
-    }
-
-    #[derive(Clone, Debug, Display, Error, ToSchema)]
-    #[display("'{data}' at {pos}")]
-    pub struct ErrorCell {
-        pub pos: ErrorCellPos,
-        pub data: String,
-    }
-
-    impl ErrorCell {
-        pub fn new(row: u32, column: u32, data: String) -> Self {
-            Self {
-                pos: ErrorCellPos { row, column },
-                data,
-            }
-        }
-    }
-
-    #[derive(Clone, Debug, Display, Error, ToSchema)]
-    pub enum Error {
-        /// Errors related to reading XLS file.
-        #[display("{_0:?}: Failed to read XLS file.")]
-        #[schema(value_type = String)]
-        BadXLS(Arc<calamine::XlsError>),
-
-        /// Not a single sheet was found.
-        #[display("No work sheets found.")]
-        NoWorkSheets,
-
-        /// There are no data on the boundaries of the sheet.
-        #[display("There is no data on work sheet boundaries.")]
-        UnknownWorkSheetRange,
-
-        /// Failed to read the beginning and end of the lesson from the cell
-        #[display("Failed to read lesson start and end from {_0}.")]
-        LessonBoundaries(ErrorCell),
-
-        /// Not found the beginning and the end corresponding to the lesson.
-        #[display("No start and end times matching the lesson (at {_0}) was found.")]
-        LessonTimeNotFound(ErrorCellPos),
-    }
-
-    impl Serialize for Error {
-        fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
-        where
-            S: Serializer,
-        {
-            match self {
-                Error::BadXLS(_) => serializer.serialize_str("BAD_XLS"),
-                Error::NoWorkSheets => serializer.serialize_str("NO_WORK_SHEETS"),
-                Error::UnknownWorkSheetRange => {
-                    serializer.serialize_str("UNKNOWN_WORK_SHEET_RANGE")
-                }
-                Error::LessonBoundaries(_) => serializer.serialize_str("GLOBAL_TIME"),
-                Error::LessonTimeNotFound(_) => serializer.serialize_str("LESSON_TIME_NOT_FOUND"),
-            }
-        }
-    }
-}
-
 /// Data cell storing the group name.
-pub struct GroupCellInfo {
+pub struct GroupMarkup {
    /// Column index.
    pub column: u32,

@@ -97,7 +27,7 @@ pub struct GroupCellInfo {
 }

 /// Data cell storing the line.
-pub struct DayCellInfo {
+pub struct DayMarkup {
    /// Line index.
    pub row: u32,

@@ -111,8 +41,13 @@ pub struct DayCellInfo {
    pub date: DateTime<Utc>,
 }

+pub struct WorkSheetMarkup {
+    days: Box<[DayMarkup]>,
+    groups: Box<[GroupMarkup]>,
+}
+
 /// Data on the time of lessons from the second column of the schedule.
-pub struct BoundariesCellInfo {
+pub struct BoundariesData {
    /// Temporary segment of the lesson.
    pub time_range: LessonBoundaries,

@@ -123,23 +58,26 @@ pub struct BoundariesCellInfo {
    pub default_index: Option<u32>,

    /// The frame of the cell.
-    pub xls_range: ((u32, u32), (u32, u32)),
+    pub range: CellRange,
 }
+
 /// Obtaining a "skeleton" schedule from the working sheet.
-fn parse_skeleton(
-    worksheet: &WorkSheet,
-) -> Result<(Vec<DayCellInfo>, Vec<GroupCellInfo>), crate::parser::error::Error> {
-    let mut groups: Vec<GroupCellInfo> = Vec::new();
-    let mut days: Vec<(u32, String, Option<DateTime<Utc>>)> = Vec::new();
+fn parse_markup(worksheet: &WorkSheet) -> Result<WorkSheetMarkup> {
+    struct PartialDayMarkup {
+        row: u32,
+        name: String,
+        date: Option<DateTime<Utc>>,
+    }

-    let worksheet_start = worksheet
-        .start()
-        .ok_or(error::Error::UnknownWorkSheetRange)?;
-    let worksheet_end = worksheet.end().ok_or(error::Error::UnknownWorkSheetRange)?;
+    let mut groups: Vec<GroupMarkup> = Vec::new();
+    let mut days: Vec<PartialDayMarkup> = Vec::new();

-    let mut row = worksheet_start.0;
+    let (start_row, start_col) = worksheet.start().ok_or(Error::UnknownWorkSheetRange)?;
+    let (end_row, end_col) = worksheet.end().ok_or(Error::UnknownWorkSheetRange)?;

-    while row < worksheet_end.0 {
+    let mut row = start_row;
+
+    while row < end_row {
        row += 1;

        let day_full_name = or_continue!(worksheet.get_string_from_cell(row, 0));
@@ -149,8 +87,8 @@ fn parse_skeleton(
            // переход на предыдущую строку
            row -= 1;

-            for column in (worksheet_start.1 + 2)..=worksheet_end.1 {
-                groups.push(GroupCellInfo {
+            for column in (start_col + 2)..=end_col {
+                groups.push(GroupMarkup {
                    column,
                    name: or_continue!(worksheet.get_string_from_cell(row, column))
                        .replace(" ", ""),
@@ -183,37 +121,44 @@ fn parse_skeleton(
            (name, date)
        };

-        days.push((row, day_name, day_date));
+        days.push(PartialDayMarkup {
+            row,
+            name: day_name,
+            date: day_date,
+        });
    }

    // fix unparsable day dates
    let days_max = days.len().min(5);

    for i in 0..days_max {
-        if days[i].2.is_none() && days[i + 1].2.is_some() {
-            days[i].2 = Some(days[i + 1].2.unwrap() - Duration::days(1));
+        if days[i].date.is_none() && days[i + 1].date.is_some() {
+            days[i].date = Some(days[i + 1].date.unwrap() - Duration::days(1));
        }
    }

    for i in 0..days_max {
        let i = days_max - i;

-        if days[i - 1].2.is_none() && days[i].2.is_some() {
-            days[i - 1].2 = Some(days[i].2.unwrap() - Duration::days(1));
+        if days[i - 1].date.is_none() && days[i].date.is_some() {
+            days[i - 1].date = Some(days[i].date.unwrap() - Duration::days(1));
        }
    }

    let days = days
        .into_iter()
-        .map(|day| DayCellInfo {
-            row: day.0,
+        .map(|day| DayMarkup {
+            row: day.row,
            column: 0,
-            name: day.1,
-            date: day.2.unwrap(),
+            name: day.name,
+            date: day.date.unwrap(),
        })
        .collect();

-    Ok((days, groups))
+    Ok(WorkSheetMarkup {
+        days,
+        groups: groups.into_boxed_slice(),
+    })
 }

 /// The result of obtaining a lesson from the cell.
@@ -233,6 +178,7 @@ enum LessonParseResult {
 fn guess_lesson_type(text: &str) -> Option<LessonType> {
    static MAP: LazyLock<HashMap<&str, LessonType>> = LazyLock::new(|| {
        HashMap::from([
+            ("о важном", LessonType::Additional),
            ("консультация", LessonType::Consultation),
            ("самостоятельная работа", LessonType::IndependentWork),
            ("зачет", LessonType::Exam),
@@ -257,11 +203,11 @@ fn guess_lesson_type(text: &str) -> Option<LessonType> {
 fn parse_lesson(
    worksheet: &WorkSheet,
    day: &Day,
-    day_boundaries: &[BoundariesCellInfo],
-    lesson_boundaries: &BoundariesCellInfo,
+    day_boundaries: &[BoundariesData],
+    lesson_boundaries: &BoundariesData,
    group_column: u32,
-) -> Result<LessonParseResult, crate::parser::error::Error> {
-    let row = lesson_boundaries.xls_range.0.0;
+) -> Result<LessonParseResult> {
+    let row = lesson_boundaries.range.start.row;

    let name = {
        let cell_data = match worksheet.get_string_from_cell(row, group_column) {
@@ -270,7 +216,7 @@ fn parse_lesson(
        };

        static OTHER_STREET_RE: LazyLock<Regex> =
-            LazyLock::new(|| Regex::new(r"^[А-Я][а-я]+[,\s]\d+$").unwrap());
+            LazyLock::new(|| Regex::new(r"^[А-Я][а-я]+[,\s]+д\.\s\d+$").unwrap());

        if OTHER_STREET_RE.is_match(&cell_data) {
            return Ok(Street(cell_data));
@@ -279,20 +225,22 @@ fn parse_lesson(
        cell_data
    };

-    let cell_range = worksheet.get_merge_from_start(row, group_column);
+    let lesson_cell_range = worksheet.get_merge_from_start(row, group_column);

    let (default_range, lesson_time) = {
        let end_time_arr = day_boundaries
            .iter()
-            .filter(|time| time.xls_range.1.0 == cell_range.1.0)
-            .collect::<Vec<&BoundariesCellInfo>>();
+            .filter(
+                |BoundariesData {
+                     range: CellRange { end, .. },
+                     ..
+                 }| { lesson_cell_range.end.row <= end.row },
+            )
+            .collect::<Vec<&BoundariesData>>();

        let end_time = end_time_arr
            .first()
-            .ok_or(error::Error::LessonTimeNotFound(ErrorCellPos {
-                row,
-                column: group_column,
-            }))?;
+            .ok_or(Error::LessonTimeNotFound(CellPos::new(row, group_column)))?;

        let range: Option<[u8; 2]> = if lesson_boundaries.default_index.is_some() {
            let default = lesson_boundaries.default_index.unwrap() as u8;
@@ -306,19 +254,19 @@ fn parse_lesson(
            end: end_time.time_range.end,
        };

-        Ok((range, time))
-    }?;
+        (range, time)
+    };

    let ParsedLessonName {
        name,
        mut subgroups,
        r#type: lesson_type,
-    } = parse_name_and_subgroups(&name)?;
+    } = parse_name_and_subgroups(&name, row, group_column)?;

    {
        let cabinets: Vec<String> = parse_cabinets(
            worksheet,
-            (cell_range.0.0, cell_range.1.0),
+            (lesson_cell_range.start.row, lesson_cell_range.end.row),
            group_column + 1,
        );

@@ -420,134 +368,145 @@ struct ParsedLessonName {

 //noinspection GrazieInspection
 /// Getting the "pure" name of the lesson and list of teachers from the text of the lesson cell.
-fn parse_name_and_subgroups(text: &str) -> Result<ParsedLessonName, Error> {
+fn parse_name_and_subgroups(text: &str, row: u32, column: u32) -> Result<ParsedLessonName> {
    // Части названия пары:
    // 1. Само название.
    // 2. Список преподавателей и подгрупп.
    // 3. "Модификатор" (чаще всего).
    //
    // Регулярное выражение для получения ФИО преподавателей и номеров подгрупп (aka. второй части).
-    // (?:[А-Я][а-я]+\s?(?:[А-Я][\s.]*){2}(?:\(\d\s?[а-я]+\))?(?:, )?)+[\s.]*
-    //
-    // Подробнее:
-    // (?:
-    //     [А-Я][а-я]+         - Фамилия.
-    //     \s?                 - Кто знает, будет ли там пробел.
-    //     (?:[А-Я][\s.]*){2}  - Имя и отчество с учётом случайных пробелов и точек.
-    //     (?:
-    //         \(              - Открытие подгруппы.
-    //         \s?             - Кто знает, будет ли там пробел.
-    //         \d              - Номер подгруппы.
-    //         \s?             - Кто знает, будет ли там пробел.
-    //         [а-я\s]+        - Слово "подгруппа" с учётов ошибок.
-    //         \)              - Закрытие подгруппы.
-    //     )?                  - Явное указание подгруппы может отсутствовать по понятным причинам.
-    //     (?:, )?             - Разделители между отдельными частями.
-    // )+
-    // [\s.]*                  - Забираем с собой всякий мусор, что бы не передать его в третью часть.
-
-    static NAMES_REGEX: LazyLock<Regex> = LazyLock::new(|| {
-        Regex::new(
-            r"(?:[А-Я][а-я]+\s?(?:[А-Я][\s.]*){2}(?:\(?\s*\d\s*[а-я\s]+\)?)?(?:[\s,.]+)?){1,2}+[\s.,]*",
+    static NAME_RE: LazyLock<fancy_regex::Regex> = LazyLock::new(|| {
+        fancy_regex::Regex::new(
+            r"([А-Я][а-я]+(?:[\s.]*[А-Я]){1,2})(?=[^А-Яа-я])[.\s]*(?:\(?(\d)[\sа-я]*\)?)?",
        )
-            .unwrap()
+        .unwrap()
    });

-    // Отчистка
-    static CLEAN_RE: LazyLock<Regex> = LazyLock::new(|| Regex::new(r"[\s\n\t]+").unwrap());
+    let text = text
+        .chars()
+        .filter(|c: &char| {
+            c.is_whitespace()
+                || c.is_ascii_digit()
+                || (*c >= 'а' && *c <= 'я')
+                || (*c >= 'А' && *c <= 'Я')
+                || *c == '.'
+                || *c == '-'
+        })
+        .collect::<String>()
+        .replace(r"\s+", " ");

-    let text = CLEAN_RE
-        .replace(&text.replace([' ', '\t', '\n'], " ").replace(",", ""), " ")
-        .to_string();
+    let mut lesson_name: Option<&str> = None;
+    let mut extra: Option<&str> = None;

-    let (lesson_name, subgroups, lesson_type) = match NAMES_REGEX.captures(&text) {
-        Some(captures) => {
-            let capture = captures.get(0).unwrap();
+    let mut shared_subgroup = true;
+    let mut subgroups: [Option<LessonSubGroup>; 2] = [None, None];

-            let subgroups: Vec<Option<LessonSubGroup>> = {
-                let src = capture.as_str().replace([' ', '.'], "");
+    for capture in NAME_RE.captures_iter(&text).take(2) {
+        let capture = capture.unwrap();

-                let mut shared_subgroup = false;
-                let mut subgroups: [Option<LessonSubGroup>; 2] = [None, None];
-
-                for name in src.split(',') {
-                    let digit_index = name.find(|c: char| c.is_ascii_digit());
-
-                    let number: u8 =
-                        digit_index.map_or(0, |index| name[(index)..(index + 1)].parse().unwrap());
-
-                    let teacher_name = {
-                        let name_end = name
-                            .find(|c: char| !c.is_alphabetic())
-                            .unwrap_or(name.len());
-
-                        // Я ебал. Как же я долго до этого доходил.
-                        format!(
-                            "{} {}.{}.",
-                            name.get(..name_end - 4).unwrap(),
-                            name.get(name_end - 4..name_end - 2).unwrap(),
-                            name.get(name_end - 2..name_end).unwrap(),
-                        )
-                    };
-
-                    let lesson = Some(LessonSubGroup {
-                        cabinet: None,
-                        teacher: Some(teacher_name),
-                    });
-
-                    match number {
-                        0 => {
-                            subgroups[0] = lesson;
-                            subgroups[1] = None;
-                            shared_subgroup = true;
-                            break;
-                        }
-                        num => {
-                            // 1 - 1 = 0 | 2 - 1 = 1 | 3 - 1 = 2 (schedule index to array index)
-                            // 0 % 2 = 0 | 1 % 2 = 1 | 2 % 2 = 0 (clamp)
-                            let normalised = (num - 1) % 2;
-
-                            subgroups[normalised as usize] = lesson;
-                        }
-                    }
-                }
-
-                if shared_subgroup {
-                    Vec::from([subgroups[0].take()])
-                } else {
-                    Vec::from(subgroups)
-                }
-            };
-
-            let name = text[..capture.start()].trim().to_string();
-            let extra = text[capture.end()..].trim().to_string();
-
-            let lesson_type = if extra.len() > 4 {
-                let result = guess_lesson_type(&extra);
-
-                if result.is_none() {
-                    #[cfg(not(debug_assertions))]
-                    sentry::capture_message(
-                        &format!("Не удалось угадать тип пары '{}'!", extra),
-                        sentry::Level::Warning,
-                    );
-
-                    #[cfg(debug_assertions)]
-                    log::warn!("Не удалось угадать тип пары '{}'!", extra);
-                }
-
-                result
-            } else {
-                None
-            };
-
-            (name, subgroups, lesson_type)
+        if lesson_name.is_none() {
+            lesson_name = Some(&text[..capture.get(0).unwrap().start()]);
        }
-        None => (text, Vec::new(), None),
+
+        extra = Some(&text[capture.get(0).unwrap().end()..]);
+
+        let teacher_name = {
+            let clean = capture
+                .get(1)
+                .unwrap()
+                .as_str()
+                .chars()
+                .filter(|c| c.is_alphabetic())
+                .collect::<Vec<char>>();
+
+            if clean.get(clean.len() - 2).is_some_and(|c| c.is_uppercase()) {
+                let (name, remaining) = clean.split_at(clean.len() - 2);
+                format!(
+                    "{} {}.{}.",
+                    name.iter().collect::<String>(),
+                    remaining[0],
+                    remaining[1]
+                )
+            } else {
+                let (remaining, name) = clean.split_last().unwrap();
+                format!("{} {}.", name.iter().collect::<String>(), remaining)
+            }
+        };
+
+        let subgroup_index = capture.get(2).map(|m| m.as_str().parse::<u32>().unwrap());
+
+        let subgroup = Some(LessonSubGroup {
+            cabinet: None,
+            teacher: Some(teacher_name),
+        });
+
+        match subgroup_index {
+            None => {
+                // we have only 2 matches max so more than 2 subgroups we cant have 100%
+                *subgroups.iter_mut().find(|x| x.is_none()).unwrap() = subgroup;
+            }
+            Some(num) => {
+                // bc we have indexed subgroup
+                shared_subgroup = false;
+
+                // 1 - 1 = 0 | 2 - 1 = 1 | 3 - 1 = 2 (schedule index to array index)
+                // 0 % 2 = 0 | 1 % 2 = 1 | 2 % 2 = 0 (clamp)
+                let subgroup_index = ((num - 1) % 2) as usize;
+
+                // if we have subgroup in that index (probably non-indexed, we change it index to free)
+                if subgroups[subgroup_index].is_some() {
+                    subgroups.swap(0, 1);
+                }
+
+                subgroups[subgroup_index] = subgroup;
+            }
+        }
+    }
+
+    let subgroups = if lesson_name.is_none() {
+        Vec::new()
+    } else if shared_subgroup {
+        Vec::from([subgroups.into_iter().next().unwrap()])
+    } else {
+        Vec::from(subgroups)
+    };
+
+    if extra.is_none() {
+        extra = text
+            .rfind(" ")
+            .and_then(|i| text[..i].rfind(" "))
+            .map(|i| &text[i + 1..]);
+    }
+
+    let lesson_type = if let Some(extra) = extra
+        && extra.len() > 4
+    {
+        let result = guess_lesson_type(extra);
+
+        if result.is_none() {
+            #[cfg(not(debug_assertions))]
+            sentry::capture_error(&Error::UnknownLessonType {
+                r#type: extra.to_string(),
+                pos: CellPos::new(row, column),
+            });
+
+            #[cfg(debug_assertions)]
+            log::warn!(
+                "{}",
+                Error::UnknownLessonType {
+                    r#type: extra.to_string(),
+                    pos: CellPos::new(row, column),
+                }
+            );
+        }
+
+        result
+    } else {
+        None
    };

    Ok(ParsedLessonName {
-        name: lesson_name,
+        name: lesson_name.unwrap_or(&text).to_string(),
        subgroups,
        r#type: lesson_type,
    })
@@ -595,8 +554,8 @@ fn parse_day_boundaries(
    date: DateTime<Utc>,
    row_range: (u32, u32),
    column: u32,
-) -> Result<Vec<BoundariesCellInfo>, crate::parser::error::Error> {
-    let mut day_times: Vec<BoundariesCellInfo> = Vec::new();
+) -> Result<Vec<BoundariesData>> {
+    let mut day_times: Vec<BoundariesData> = Vec::new();

    for row in row_range.0..row_range.1 {
        let time_cell = if let Some(str) = worksheet.get_string_from_cell(row, column) {
@@ -605,9 +564,8 @@ fn parse_day_boundaries(
            continue;
        };

-        let lesson_time = parse_lesson_boundaries_cell(&time_cell, date).ok_or(
-            error::Error::LessonBoundaries(ErrorCell::new(row, column, time_cell.clone())),
-        )?;
+        let lesson_time = parse_lesson_boundaries_cell(&time_cell, date)
+            .ok_or(Error::NoLessonBoundaries(CellPos::new(row, column)))?;

        // type
        let lesson_type = if time_cell.contains("пара") {
@@ -631,11 +589,11 @@ fn parse_day_boundaries(
            None
        };

-        day_times.push(BoundariesCellInfo {
+        day_times.push(BoundariesData {
            time_range: lesson_time,
            lesson_type,
            default_index,
-            xls_range: worksheet.get_merge_from_start(row, column),
+            range: worksheet.get_merge_from_start(row, column),
        });
    }

@@ -650,9 +608,9 @@ fn parse_day_boundaries(
 /// * `week_markup`: markup of the current week.
 fn parse_week_boundaries(
    worksheet: &WorkSheet,
-    week_markup: &[DayCellInfo],
-) -> Result<Vec<Vec<BoundariesCellInfo>>, crate::parser::error::Error> {
-    let mut result: Vec<Vec<BoundariesCellInfo>> = Vec::new();
+    week_markup: &[DayMarkup],
+) -> Result<Vec<Vec<BoundariesData>>> {
+    let mut result: Vec<Vec<BoundariesData>> = Vec::new();

    let worksheet_end_row = worksheet.end().unwrap().0;
    let lesson_time_column = week_markup[0].column + 1;
@@ -771,22 +729,21 @@ fn convert_groups_to_teachers(
 ///
 /// * `buffer`: XLS data containing schedule.
 ///
-/// returns: Result<ParseResult, crate::parser::error::Error>
-pub fn parse_xls(buffer: &Vec<u8>) -> Result<ParsedSchedule, crate::parser::error::Error> {
+/// returns: Result<ParseResult, Error>
+pub fn parse_xls(buffer: &Vec<u8>) -> Result<ParsedSchedule> {
    let cursor = Cursor::new(&buffer);
-    let mut workbook: Xls<_> =
-        open_workbook_from_rs(cursor).map_err(|e| error::Error::BadXLS(std::sync::Arc::new(e)))?;
+    let mut workbook: Xls<_> = open_workbook_from_rs(cursor)?;

    let worksheet = {
        let (worksheet_name, worksheet) = workbook
            .worksheets()
            .first()
-            .ok_or(error::Error::NoWorkSheets)?
+            .ok_or(Error::NoWorkSheets)?
            .clone();

        let worksheet_merges = workbook
            .worksheet_merge_cells(&worksheet_name)
-            .ok_or(error::Error::NoWorkSheets)?;
+            .ok_or(Error::NoWorkSheets)?;

        WorkSheet {
            data: worksheet,
@@ -794,7 +751,11 @@ pub fn parse_xls(buffer: &Vec<u8>) -> Result<ParsedSchedule, crate::parser::erro
        }
    };

-    let (week_markup, groups_markup) = parse_skeleton(&worksheet)?;
+    let WorkSheetMarkup {
+        days: week_markup,
+        groups: groups_markup,
+    } = parse_markup(&worksheet)?;
+
    let week_boundaries = parse_week_boundaries(&worksheet, &week_markup)?;

    let mut groups: HashMap<String, ScheduleEntry> = HashMap::new();
@@ -847,7 +808,7 @@ pub mod test_utils {
    use super::*;
    use base::ParsedSchedule;

-    pub fn test_result() -> Result<ParsedSchedule, crate::parser::error::Error> {
+    pub fn test_result() -> Result<ParsedSchedule> {
        parse_xls(&include_bytes!("../../../../test-data/engels-polytechnic.xls").to_vec())
    }
 }
--- a/providers/provider-engels-polytechnic/src/parser/worksheet.rs
+++ b/providers/provider-engels-polytechnic/src/parser/worksheet.rs
@@ -1,4 +1,5 @@
 use regex::Regex;
+use std::fmt::{Display, Formatter};
 use std::ops::Deref;
 use std::sync::LazyLock;

@@ -8,6 +9,40 @@ pub struct WorkSheet {
    pub merges: Vec<calamine::Dimensions>,
 }

+#[derive(Clone, Debug, derive_more::Error)]
+pub struct CellPos {
+    pub row: u32,
+    pub column: u32,
+}
+
+fn format_column_index(index: u32) -> String {
+    // https://stackoverflow.com/a/297214
+    let quotient = index / 26;
+
+    let char = char::from((65 + (index % 26)) as u8);
+
+    if quotient > 0 {
+        return format!("{}{}", format_column_index(quotient - 1), char);
+    }
+
+    return char.to_string();
+}
+
+impl Display for CellPos {
+    fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
+        f.write_fmt(format_args!(
+            "column {}, row {}",
+            format_column_index(self.column),
+            self.row + 1,
+        ))
+    }
+}
+
+pub struct CellRange {
+    pub start: CellPos,
+    pub end: CellPos,
+}
+
 impl Deref for WorkSheet {
    type Target = calamine::Range<calamine::Data>;

@@ -45,14 +80,26 @@ impl WorkSheet {
    }

    /// Obtaining the boundaries of the cell along its upper left coordinate.
-    pub fn get_merge_from_start(&self, row: u32, column: u32) -> ((u32, u32), (u32, u32)) {
+    pub fn get_merge_from_start(&self, row: u32, column: u32) -> CellRange {
        match self
            .merges
            .iter()
            .find(|merge| merge.start.0 == row && merge.start.1 == column)
        {
-            Some(merge) => (merge.start, (merge.end.0 + 1, merge.end.1 + 1)),
-            None => ((row, column), (row + 1, column + 1)),
+            Some(merge) => CellRange {
+                start: CellPos::new(merge.start.0, merge.start.1),
+                end: CellPos::new(merge.end.0 + 1, merge.end.1 + 1),
+            },
+            None => CellRange {
+                start: CellPos::new(row, column),
+                end: CellPos::new(row + 1, column + 1),
+            },
        }
    }
 }
+
+impl CellPos {
+    pub fn new(row: u32, column: u32) -> Self {
+        Self { row, column }
+    }
+}
--- a/providers/provider-engels-polytechnic/src/updater/error.rs
+++ b/providers/provider-engels-polytechnic/src/updater/error.rs
@@ -0,0 +1,33 @@
+use crate::xls_downloader::FetchError;
+use derive_more::{Display, Error, From};
+
+#[derive(Debug, Display, Error, From)]
+pub enum Error {
+    /// Occurs when the request to the Yandex Cloud API fails.
+    ///
+    /// This may be due to network issues, invalid API key, incorrect function ID, or other
+    /// problems with the Yandex Cloud Function invocation.
+    #[display("An error occurred during the request to the Yandex Cloud API: {_0}")]
+    Reqwest(reqwest::Error),
+
+    #[display("Unable to get URI in 3 retries")]
+    EmptyUri,
+
+    /// The ETag is the same (no update needed).
+    #[display("The ETag is the same.")]
+    SameETag,
+
+    /// The URL query for the XLS file failed to execute, either due to network issues or invalid API parameters.
+    #[display("Failed to fetch URL: {_0}")]
+    ScheduleFetchFailed(FetchError),
+
+    /// Downloading the XLS file content failed after successfully obtaining the URL.
+    #[display("Download failed: {_0}")]
+    ScheduleDownloadFailed(FetchError),
+
+    /// The XLS file could not be parsed into a valid schedule format.
+    #[from]
+    InvalidSchedule(crate::parser::Error),
+}
+
+pub type Result<T> = core::result::Result<T, Error>;
--- a/providers/provider-engels-polytechnic/src/updater/mod.rs
+++ b/providers/provider-engels-polytechnic/src/updater/mod.rs
@@ -1,7 +1,8 @@
+pub use self::error::{Error, Result};
 use crate::parser::parse_xls;
-use crate::updater::error::{Error, QueryUrlError, SnapshotCreationError};
 use crate::xls_downloader::{FetchError, XlsDownloader};
 use base::ScheduleSnapshot;
+mod error;

 pub enum UpdateSource {
    Prepared(ScheduleSnapshot),
@@ -19,59 +20,6 @@ pub struct Updater {
    update_source: UpdateSource,
 }

-pub mod error {
-    use crate::xls_downloader::FetchError;
-    use derive_more::{Display, Error};
-
-    #[derive(Debug, Display, Error)]
-    pub enum Error {
-        /// An error occurred while querying the Yandex Cloud API for a URL.
-        ///
-        /// This may result from network failures, invalid API credentials, or issues with the Yandex Cloud Function invocation.
-        /// See [`QueryUrlError`] for more details about specific causes.
-        QueryUrlFailed(QueryUrlError),
-
-        /// The schedule snapshot creation process failed.
-        ///
-        /// This can happen due to URL conflicts (same URL already in use), failed network requests,
-        /// download errors, or invalid XLS file content. See [`SnapshotCreationError`] for details.
-        SnapshotCreationFailed(SnapshotCreationError),
-    }
-    /// Errors that may occur when querying the Yandex Cloud API to retrieve a URL.
-    #[derive(Debug, Display, Error)]
-    pub enum QueryUrlError {
-        /// Occurs when the request to the Yandex Cloud API fails.
-        ///
-        /// This may be due to network issues, invalid API key, incorrect function ID, or other
-        /// problems with the Yandex Cloud Function invocation.
-        #[display("An error occurred during the request to the Yandex Cloud API: {_0}")]
-        RequestFailed(reqwest::Error),
-
-        #[display("Unable to fetch Uri in 3 retries")]
-        UriFetchFailed,
-    }
-
-    /// Errors that may occur during the creation of a schedule snapshot.
-    #[derive(Debug, Display, Error)]
-    pub enum SnapshotCreationError {
-        /// The ETag is the same (no update needed).
-        #[display("The ETag is the same.")]
-        Same,
-
-        /// The URL query for the XLS file failed to execute, either due to network issues or invalid API parameters.
-        #[display("Failed to fetch URL: {_0}")]
-        FetchFailed(FetchError),
-
-        /// Downloading the XLS file content failed after successfully obtaining the URL.
-        #[display("Download failed: {_0}")]
-        DownloadFailed(FetchError),
-
-        /// The XLS file could not be parsed into a valid schedule format.
-        #[display("Schedule data is invalid: {_0}")]
-        InvalidSchedule(crate::parser::error::Error),
-    }
-}
-
 impl Updater {
    /// Constructs a new `ScheduleSnapshot` by downloading and parsing schedule data from the specified URL.
    ///
@@ -85,40 +33,33 @@ impl Updater {
    /// * `url`: The source URL pointing to the XLS file containing schedule data.
    ///
    /// returns: Result<ScheduleSnapshot, SnapshotCreationError>
-    pub async fn new_snapshot(
-        downloader: &mut XlsDownloader,
-        url: String,
-    ) -> Result<ScheduleSnapshot, SnapshotCreationError> {
+    async fn new_snapshot(downloader: &mut XlsDownloader, url: String) -> Result<ScheduleSnapshot> {
        let head_result = downloader.set_url(&url).await.map_err(|error| {
-            if let FetchError::Unknown(error) = &error {
+            if let FetchError::Reqwest(error) = &error {
                sentry::capture_error(&error);
            }

-            SnapshotCreationError::FetchFailed(error)
+            Error::ScheduleFetchFailed(error)
        })?;

        if downloader.etag == Some(head_result.etag) {
-            return Err(SnapshotCreationError::Same);
+            return Err(Error::SameETag);
        }

        let xls_data = downloader
            .fetch(false)
            .await
            .map_err(|error| {
-                if let FetchError::Unknown(error) = &error {
+                if let FetchError::Reqwest(error) = &error {
                    sentry::capture_error(&error);
                }

-                SnapshotCreationError::DownloadFailed(error)
+                Error::ScheduleDownloadFailed(error)
            })?
            .data
            .unwrap();

-        let parse_result = parse_xls(&xls_data).map_err(|error| {
-            sentry::capture_error(&error);
-
-            SnapshotCreationError::InvalidSchedule(error)
-        })?;
+        let parse_result = parse_xls(&xls_data)?;

        Ok(ScheduleSnapshot {
            fetched_at: head_result.requested_at,
@@ -144,7 +85,7 @@ impl Updater {
    /// Result containing:
    /// - `Ok(String)` - Complete URL constructed from the Function's response
    /// - `Err(QueryUrlError)` - If the request or response processing fails
-    async fn query_url(api_key: &str, func_id: &str) -> Result<String, QueryUrlError> {
+    async fn query_url(api_key: &str, func_id: &str) -> Result<String> {
        let client = reqwest::Client::new();

        let uri = {
@@ -156,7 +97,7 @@ impl Updater {

            loop {
                if counter == 3 {
-                    return Err(QueryUrlError::UriFetchFailed);
+                    return Err(Error::EmptyUri);
                }

                counter += 1;
@@ -169,10 +110,10 @@ impl Updater {
                    .header("Authorization", format!("Api-Key {}", api_key))
                    .send()
                    .await
-                    .map_err(QueryUrlError::RequestFailed)?
+                    .map_err(Error::Reqwest)?
                    .text()
                    .await
-                    .map_err(QueryUrlError::RequestFailed)?;
+                    .map_err(Error::Reqwest)?;

                if uri.is_empty() {
                    log::warn!("[{}] Unable to get uri! Retrying in 5 seconds...", counter);
@@ -201,7 +142,7 @@ impl Updater {
    /// Returns `Ok(())` if the snapshot was successfully initialized, or an `Error` if:
    /// - URL query to Yandex Cloud failed ([`QueryUrlError`])
    /// - Schedule snapshot creation failed ([`SnapshotCreationError`])
-    pub async fn new(update_source: UpdateSource) -> Result<(Self, ScheduleSnapshot), Error> {
+    pub async fn new(update_source: UpdateSource) -> Result<(Self, ScheduleSnapshot)> {
        let mut this = Updater {
            downloader: XlsDownloader::new(),
            update_source,
@@ -222,19 +163,14 @@ impl Updater {
                yandex_func_id,
            } => {
                log::info!("Obtaining a link using FaaS...");
-                Self::query_url(yandex_api_key, yandex_func_id)
-                    .await
-                    .map_err(Error::QueryUrlFailed)?
+                Self::query_url(yandex_api_key, yandex_func_id).await?
            }
            _ => unreachable!(),
        };

        log::info!("For the initial setup, a link {} will be used", url);

-        let snapshot = Self::new_snapshot(&mut this.downloader, url)
-            .await
-            .map_err(Error::SnapshotCreationFailed)?;
-
+        let snapshot = Self::new_snapshot(&mut this.downloader, url).await?;
        log::info!("Schedule snapshot successfully created!");

        Ok((this, snapshot))
@@ -257,7 +193,7 @@ impl Updater {
    pub async fn update(
        &mut self,
        current_snapshot: &ScheduleSnapshot,
-    ) -> Result<ScheduleSnapshot, Error> {
+    ) -> Result<ScheduleSnapshot> {
        if let UpdateSource::Prepared(snapshot) = &self.update_source {
            let mut snapshot = snapshot.clone();
            snapshot.update();
@@ -269,21 +205,19 @@ impl Updater {
            UpdateSource::GrabFromSite {
                yandex_api_key,
                yandex_func_id,
-            } => Self::query_url(yandex_api_key.as_str(), yandex_func_id.as_str())
-                .await
-                .map_err(Error::QueryUrlFailed)?,
+            } => Self::query_url(yandex_api_key.as_str(), yandex_func_id.as_str()).await?,
            _ => unreachable!(),
        };

        let snapshot = match Self::new_snapshot(&mut self.downloader, url).await {
            Ok(snapshot) => snapshot,
-            Err(SnapshotCreationError::Same) => {
+            Err(Error::SameETag) => {
                let mut clone = current_snapshot.clone();
                clone.update();

                clone
            }
-            Err(error) => return Err(Error::SnapshotCreationFailed(error)),
+            Err(error) => return Err(error),
        };

        Ok(snapshot)
--- a/providers/provider-engels-polytechnic/src/xls_downloader.rs
+++ b/providers/provider-engels-polytechnic/src/xls_downloader.rs
@@ -14,7 +14,7 @@ pub enum FetchError {
    /// Unknown error.
    #[display("An unknown error occurred while downloading the file.")]
    #[schema(value_type = String)]
-    Unknown(Arc<reqwest::Error>),
+    Reqwest(Arc<reqwest::Error>),

    /// Server returned a status code different from 200.
    #[display("Server returned a status code {status_code}.")]
@@ -31,7 +31,7 @@ pub enum FetchError {

 impl FetchError {
    pub fn unknown(error: Arc<reqwest::Error>) -> Self {
-        Self::Unknown(error)
+        Self::Reqwest(error)
    }

    pub fn bad_status_code(status_code: u16) -> Self {
Author	SHA1	Message	Date
n08i40k	cdc89b5bcd	fix(parser): fix sentry error sending	2025-10-10 03:00:47 +04:00
n08i40k	ad86f6cd64	feat(parser): limit names regex to maximum 2 elements This allows us to not worry about subgroups array index overflows, and we can make better non-standard case solving.	2025-10-10 01:39:54 +04:00
n08i40k	a3b4a501db	feat(parser): improve names regex to exclude some non-standard cases Like "Название ФАмилия. И.О.". In that case regex will grab "Название ФА", instead of "Амилия. И. О." (we can't add 'Ф', bc it will make regex checks way more complex). Now it will ignore "Название ФА" if after that lower or upper char is placed. Previously only lower chars are excluded and check won't exclude "Название ФА" and grabs "Название Ф" bc after 'Ф' uppercase char is present.	2025-10-10 01:37:52 +04:00
n08i40k	df0e99a4d0	feat(parser): make lesson cell range less strict to support upcoming split-lessons	2025-10-10 01:31:55 +04:00
n08i40k	a8cf8fb0f5	feat(parser): improve street regex	2025-10-10 01:30:56 +04:00
n08i40k	7ed866138e	feat(error): add error for unknown lesson type	2025-10-10 01:30:30 +04:00
n08i40k	7bac48f8fc	feat(error): add more intuitive CellPos formatting and get rid of ErrorCell	2025-10-10 01:27:05 +04:00
n08i40k	191ec36fef	chore: remove useless commented code	2025-10-10 01:25:12 +04:00
n08i40k	f121a04f1b	refactor: refactor providers code	2025-10-02 07:55:07 +04:00
n08i40k	df74ab03a1	chore(ci): make building non-verbose	2025-10-02 07:54:09 +04:00
n08i40k	1b79d1cf1e	chore: bump provider version to 0.2.2	2025-10-02 07:44:35 +04:00
n08i40k	2b9b1ea66b	chore(deps): update dependencies	2025-10-02 07:43:37 +04:00
n08i40k	ca713d8d51	refactor: prevent updater stop because of errors	2025-10-02 07:40:44 +04:00
n08i40k	69df538467	refactor(updater): don't cancel token when uri fetch error occurred	2025-09-29 08:27:25 +04:00
n08i40k	aa019f8fcf	fix(parser): rework teacher name parsing	2025-09-29 08:27:24 +04:00