kiwix/kiwix-apple
1
0
Fork 0
mirror of https://github.com/kiwix/kiwix-apple.git synced 2025-09-25 04:48:16 -04:00
Code Issues Packages Projects Releases Wiki Activity

Squashed commit of the following:

Browse Source 
commit b3f47fa8c0708aca20ac391144b08bbd13724768
Merge: a90d196 b019f69
Author: Balazs Perlaki-Horvath <ba.perlaki@gmail.com>
Date:   Sun Apr 14 17:35:12 2024 +0200

    Merge branch '622-corrupted-zim-leads-to-crash' of github.com:kiwix/apple into 622-corrupted-zim-leads-to-crash

commit a90d196e65a02a94d885eabd8c7c6e0d2b2334e8
Author: Balazs Perlaki-Horvath <ba.perlaki@gmail.com>
Date:   Tue Apr 9 21:31:22 2024 +0200

    Update try catch

commit b784b27c9cd882179c8d75fbb8a27ee370d03257
Author: Balazs Perlaki-Horvath <ba.perlaki@gmail.com>
Date:   Tue Apr 9 13:19:11 2024 +0200

    Wrap search in standard exception handling

commit b019f698c8cbaac1d09fb9067fb8bc1cc84070e7
Merge: d6e8e9a 8541cde
Author: Balazs Perlaki-Horvath <ba.perlaki@gmail.com>
Date:   Tue Apr 9 23:54:53 2024 +0200

    Merge branch '622-corrupted-zim-leads-to-crash' of github.com:kiwix/apple into 622-corrupted-zim-leads-to-crash

commit d6e8e9ac3e4328ba6154a9597ebd2f950c711f20
Author: Balazs Perlaki-Horvath <ba.perlaki@gmail.com>
Date:   Tue Apr 9 21:31:22 2024 +0200

    Update try catch

commit c1329127136088ec92ca25669f5455953c77844d
Author: Balazs Perlaki-Horvath <ba.perlaki@gmail.com>
Date:   Tue Apr 9 13:19:11 2024 +0200

    Wrap search in standard exception handling

commit 8541cde6b66570d26cfa8ef590303059b7c6c8d4
Author: Balazs Perlaki-Horvath <ba.perlaki@gmail.com>
Date:   Tue Apr 9 13:19:11 2024 +0200

    Wrap search in standard exception handling

commit 57e008e5590b7567d4410057c590ce0914b8a37b
Merge: 5024548 4459187
Author: Balazs Perlaki-Horvath <ba.perlaki@gmail.com>
Date:   Tue Apr 9 13:02:15 2024 +0200

    Merge branch '622-corrupted-zim-leads-to-crash' of github.com:kiwix/apple into 622-corrupted-zim-leads-to-crash

commit 44591871ce85e4bb7d3a9d1454d03d3b36bf8488
Author: Balazs Perlaki-Horvath <ba.perlaki@gmail.com>
Date:   Mon Apr 8 08:39:00 2024 +0200

    Fix unlinked ZIM file tab state
This commit is contained in:
Balazs Perlaki-Horvath 2024-04-14 17:40:10 +02:00 committed by Kelson
parent 5eb686857e
commit 8c57208d6a
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
SwiftUI/Model/SearchOperation/SearchOperation.mm
View File

@ -52,7 +52,7 @@
// get a list of archives that are included in search
typedef std::unordered_map<std::string, zim::Archive> archives_map;
auto *allArchives = static_cast<archives_map *>([[ZimFileService sharedInstance] getArchives]);
std::vector<zim::Archive> indexSearchArchives = std::vector<zim::Archive>();
std::vector<zim::Archive> titleSearchArchives = std::vector<zim::Archive>();
for (NSUUID *zimFileID in self.zimFileIDs) {
@ -63,9 +63,9 @@
indexSearchArchives.push_back(archive);
}
titleSearchArchives.push_back(archive);
} catch (std::out_of_range) { }
} catch (std::exception) { }
}
// perform index and title search
[self addIndexSearchResults:indexSearchArchives];
if (titleSearchArchives.size() > 0) {