smallsolar
/
libkiwix
mirror of https://github.com/kiwix/libkiwix.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Code & local repository cleanup

This commit is contained in:
Aditya-Sood 2019-08-24 23:45:25 +05:30
parent daaadf3e1c
commit e1acf9acff
10 changed files with 0 additions and 270 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.idea/encodings.xml
View File

@ -1,4 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="Encoding" addBOMForNewFiles="with NO BOM" />
</project>

9
.idea/kiwix-lib.iml
View File

@ -1,9 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<module type="JAVA_MODULE" version="4">
<component name="NewModuleRootManager" inherit-compiler-output="true">
<exclude-output />
<content url="file://$MODULE_DIR$" />
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
</component>
</module>

8
.idea/modules.xml
View File

@ -1,8 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ProjectModuleManager">
<modules>
<module fileurl="file://$PROJECT_DIR$/.idea/kiwix-lib.iml" filepath="$PROJECT_DIR$/.idea/kiwix-lib.iml" />
</modules>
</component>
</project>

194
.idea/workspace.xml
View File

@ -1,194 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ChangeListManager">
<list default="true" id="9d6ed582-82a4-4bfc-b836-6f05a32a7b68" name="Default Changelist" comment="" />
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
<option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
<option name="LAST_RESOLUTION" value="IGNORE" />
</component>
<component name="FileEditorManager">
<leaf>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/reader.cpp">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="276">
<caret line="813" selection-start-line="813" selection-end-line="813" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/android/kiwixreader.cpp">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="461">
<caret line="366" column="46" selection-start-line="366" selection-start-column="46" selection-end-line="366" selection-end-column="46" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/src/android/org/kiwix/kiwixlib/JNIKiwixReader.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="222">
<caret line="82" column="84" lean-forward="true" selection-start-line="82" selection-start-column="84" selection-end-line="82" selection-end-column="84" />
<folding>
<element signature="e#0#3989#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
</leaf>
</component>
<component name="IdeDocumentHistory">
<option name="CHANGED_PATHS">
<list>
<option value="$PROJECT_DIR$/src/android/kiwixreader.cpp" />
<option value="$PROJECT_DIR$/src/android/org/kiwix/kiwixlib/JNIKiwixReader.java" />
</list>
</option>
</component>
<component name="ProjectFrameBounds" extendedState="6">
<option name="x" value="260" />
<option name="y" value="55" />
<option name="width" value="1400" />
<option name="height" value="1000" />
</component>
<component name="ProjectView">
<navigator currentView="ProjectPane" proportions="" version="1">
<foldersAlwaysOnTop value="true" />
</navigator>
<panes>
<pane id="PackagesPane" />
<pane id="Scope" />
<pane id="ProjectPane">
<subPane>
<expand>
<path>
<item name="kiwix-lib" type="b2602c69:ProjectViewProjectNode" />
<item name="kiwix-lib" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="kiwix-lib" type="b2602c69:ProjectViewProjectNode" />
<item name="kiwix-lib" type="462c0819:PsiDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="kiwix-lib" type="b2602c69:ProjectViewProjectNode" />
<item name="kiwix-lib" type="462c0819:PsiDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
<item name="android" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="kiwix-lib" type="b2602c69:ProjectViewProjectNode" />
<item name="kiwix-lib" type="462c0819:PsiDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
<item name="android" type="462c0819:PsiDirectoryNode" />
<item name="org" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="kiwix-lib" type="b2602c69:ProjectViewProjectNode" />
<item name="kiwix-lib" type="462c0819:PsiDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
<item name="android" type="462c0819:PsiDirectoryNode" />
<item name="org" type="462c0819:PsiDirectoryNode" />
<item name="kiwix" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="kiwix-lib" type="b2602c69:ProjectViewProjectNode" />
<item name="kiwix-lib" type="462c0819:PsiDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
<item name="android" type="462c0819:PsiDirectoryNode" />
<item name="org" type="462c0819:PsiDirectoryNode" />
<item name="kiwix" type="462c0819:PsiDirectoryNode" />
<item name="kiwixlib" type="462c0819:PsiDirectoryNode" />
</path>
</expand>
<select />
</subPane>
</pane>
</panes>
</component>
<component name="PropertiesComponent">
<property name="android.sdk.path" value="$USER_HOME$/Android/Sdk" />
<property name="last_opened_file_path" value="$PROJECT_DIR$" />
<property name="settings.editor.selected.configurable" value="AndroidSdkUpdater" />
</component>
<component name="RunDashboard">
<option name="ruleStates">
<list>
<RuleState>
<option name="name" value="ConfigurationTypeDashboardGroupingRule" />
</RuleState>
<RuleState>
<option name="name" value="StatusDashboardGroupingRule" />
</RuleState>
</list>
</option>
</component>
<component name="SvnConfiguration">
<configuration />
</component>
<component name="TaskManager">
<task active="true" id="Default" summary="Default task">
<changelist id="9d6ed582-82a4-4bfc-b836-6f05a32a7b68" name="Default Changelist" comment="" />
<created>1562150865430</created>
<option name="number" value="Default" />
<option name="presentableId" value="Default" />
<updated>1562150865430</updated>
</task>
<servers />
</component>
<component name="ToolWindowManager">
<frame x="0" y="32" width="1920" height="1048" extended-state="6" />
<layout>
<window_info content_ui="combo" id="Project" visible="true" weight="0.18152525" />
<window_info id="Structure" side_tool="true" />
<window_info id="Image Layers" />
<window_info id="Designer" />
<window_info id="Resources Explorer" />
<window_info id="Capture Tool" />
<window_info id="Favorites" side_tool="true" />
<window_info id="Captures" order="0" weight="0.25" />
<window_info anchor="bottom" id="Version Control" />
<window_info anchor="bottom" id="TODO" />
<window_info active="true" anchor="bottom" id="Terminal" visible="true" weight="0.32960895" />
<window_info anchor="bottom" id="Event Log" side_tool="true" />
<window_info anchor="right" id="Capture Analysis" />
<window_info anchor="right" id="Theme Preview" />
<window_info anchor="right" x="0" y="0" width="430" height="848" id="Documentation" side_tool="true" visible="true" weight="0.32975295" />
<window_info anchor="right" id="Palette&#9;" />
</layout>
</component>
<component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/src/reader.cpp">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="276">
<caret line="813" selection-start-line="813" selection-end-line="813" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/android/kiwix.cpp">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/src/android/kiwixreader.cpp">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="461">
<caret line="366" column="46" selection-start-line="366" selection-start-column="46" selection-end-line="366" selection-end-column="46" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/android/org/kiwix/kiwixlib/JNIKiwixReader.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="222">
<caret line="82" column="84" lean-forward="true" selection-start-line="82" selection-start-column="84" selection-end-line="82" selection-end-column="84" />
<folding>
<element signature="e#0#3989#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</component>
</project>

16
.vscode/c_cpp_properties.json vendored
View File

@ -1,16 +0,0 @@
{
"configurations": [
{
"name": "Linux",
"includePath": [
"${workspaceFolder}/**"
],
"defines": [],
"compilerPath": "/usr/bin/gcc",
"cStandard": "c11",
"cppStandard": "c++17",
"intelliSenseMode": "clang-x64"
}
],
"version": 4
}

BIN
.vscode/ipch/68a3c1a579621cc7/mmap_address.bin vendored
View File

Binary file not shown.

BIN
.vscode/ipch/eae59a4735b0c0b5/mmap_address.bin vendored
View File

Binary file not shown.

21
src/android/kiwixreader.cpp
View File

@ -350,27 +350,6 @@ Java_org_kiwix_kiwixlib_JNIKiwixReader_searchSuggestions(JNIEnv* env,
return retVal;
}
/*JNIEXPORT jboolean JNICALL
Java_org_kiwix_kiwixlib_JNIKiwixReader_getNextSuggestion(JNIEnv* env,
jobject obj,
jobject titleObj)
{
jboolean retVal = JNI_FALSE;
std::string cTitle;
try {
if (READER->getNextSuggestion(cTitle)) {
setStringObjValue(cTitle, titleObj, env);
retVal = JNI_TRUE;
}
} catch (std::exception& e) {
__android_log_print(ANDROID_LOG_WARN, "kiwix", "Unable to get next suggestion");
__android_log_print(ANDROID_LOG_WARN, "kiwix", e.what());
}
return retVal;
}*/
JNIEXPORT jboolean JNICALL
Java_org_kiwix_kiwixlib_JNIKiwixReader_getNextSuggestion(JNIEnv* env,
jobject obj,

2
src/android/org/kiwix/kiwixlib/JNIKiwixReader.java
View File

@ -102,8 +102,6 @@ public class JNIKiwixReader
public native boolean searchSuggestions(String prefix, int count);
/*public native boolean getNextSuggestion(JNIKiwixString title);*/
public native boolean getNextSuggestion(JNIKiwixString title, JNIKiwixString url);
public native boolean getPageUrlFromTitle(String title, JNIKiwixString url);

16
src/reader.cpp
View File

@ -901,22 +901,6 @@ bool Reader::searchSuggestionsSmart(const string& prefix,
return retVal;
}
/* Get next suggestion */
// bool Reader::getNextSuggestion(string& title)
// {
// if (this->suggestionsOffset != this->suggestions.end()) {
// /* title */
// title = (*(this->suggestionsOffset))[0];
// /* increment the cursor for the next call */
// this->suggestionsOffset++;
// return true;
// }
// return false;
// }
bool Reader::getNextSuggestion(string& title, string& url)
{
if (this->suggestionsOffset != this->suggestions.end()) {