sadorowo/szkolnyplus
1
0
Fork 0
forked from github/szkolny
Code Pull Requests Activity

[API/Mobidziennik] Fix homework attachment downloading.

Browse Source
This commit is contained in:
Kuba Szczodrzyński 2020-04-06 19:28:04 +02:00
parent 041bfc6cc0
commit 238250e8c9
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/pl/szczodrzynski/edziennik/data/api/Regexes.kt
View File

@ -97,7 +97,7 @@ object Regexes {
"""zadanieFormularz\(([0-9]+),""".toRegex(DOT_MATCHES_ALL) """zadanieFormularz\(([0-9]+),""".toRegex(DOT_MATCHES_ALL)
} }
val MOBIDZIENNIK_HOMEWORK_ATTACHMENT by lazy { val MOBIDZIENNIK_HOMEWORK_ATTACHMENT by lazy {
"""zalacznik=([0-9]+)'.+?word-break">(.+?)</td>""".toRegex(DOT_MATCHES_ALL) """zalacznik(_zadania)?=([0-9]+)'.+?word-break">(.+?)</td>""".toRegex(DOT_MATCHES_ALL)
} }

10
app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/mobidziennik/data/web/MobidziennikWebGetAttachment.kt
View File

@ -29,14 +29,14 @@ class MobidziennikWebGetAttachment(override val data: DataMobidziennik,
val typeUrl = when (owner) { val typeUrl = when (owner) {
is Message -> if (owner.type == Message.TYPE_SENT) is Message -> if (owner.type == Message.TYPE_SENT)
"dziennik/wiadwyslana?id=" "dziennik/wiadwyslana/?id="
else else
"dziennik/wiadodebrana?id=" "dziennik/wiadodebrana/?id="
is Event -> if (owner.date >= Date.getToday()) is Event -> if (owner.date >= Date.getToday())
"mobile/zadaniadomowe?id_zadania=" "dziennik/zadaniedomowe/?id_zadania="
else else
"mobile/zadaniadomowearchiwalne?id_zadania=" "dziennik/zadaniedomowe/?id_zadania="
else -> "" else -> ""
} }
@ -47,7 +47,7 @@ class MobidziennikWebGetAttachment(override val data: DataMobidziennik,
else -> -1 else -> -1
} }
webGetFile(TAG, "/$typeUrl${ownerId}&zalacznik=$attachmentId", targetFile, { file -> webGetFile(TAG, "/$typeUrl${ownerId}&uczen=${data.studentId}&zalacznik=$attachmentId", targetFile, { file ->
val event = AttachmentGetEvent( val event = AttachmentGetEvent(
profileId, profileId,