From a8c81a90c3545f9a7a545d0df428aafb7321ffd4 Mon Sep 17 00:00:00 2001 From: poire-z Date: Wed, 21 Sep 2022 00:26:10 +0200 Subject: [PATCH] ReaderDict: fix use of dicts with ifo with DOS line endings (#9536) Fixed in upstream sdcv, but we need to also do it in our parsing of .ifo and picking out dict name. Also includes minor bump of base/sdcv. --- base | 2 +- frontend/apps/reader/modules/readerdictionary.lua | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/base b/base index 66f8b4ae3..bcf5ab2ff 160000 --- a/base +++ b/base @@ -1 +1 @@ -Subproject commit 66f8b4ae3e110da48ad2978cfc362c695eb8717d +Subproject commit bcf5ab2fff5c3b2968e0903986aba15d7cbceece diff --git a/frontend/apps/reader/modules/readerdictionary.lua b/frontend/apps/reader/modules/readerdictionary.lua index a092be6eb..4902dc368 100644 --- a/frontend/apps/reader/modules/readerdictionary.lua +++ b/frontend/apps/reader/modules/readerdictionary.lua @@ -134,7 +134,7 @@ function ReaderDictionary:init() if f then local content = f:read("*all") f:close() - local dictname = content:match("\nbookname=(.-)\n") + local dictname = content:match("\nbookname=(.-)\r?\n") local is_html = content:find("sametypesequence=h", 1, true) ~= nil -- sdcv won't use dict that don't have a bookname= if dictname then