Merge pull request #165 from kiwix/new_version

New version 2.0.2

ChangeLog

@@ -1,3 +1,11 @@
+kiwix-lib 2.0.2
+===============
+
+ * [Android] Forward c++ errors message de Java world.
+ * Follow redirection of favicon.
+ * Make aria2 dependency optional.
+ * Inculde unistd.h only on unix platform.
+
 kiwix-lib 2.0.1
 ===============
 

README.md

@@ -15,9 +15,9 @@ to [kiwix-build](https://github.com/kiwix/kiwix-build).
 Preamble
 --------
 
-Although the Kiwix library can be compiled/cross-compiled on/for many
+Although the Kiwix library can be (cross-)compiled on/for many
 sytems, the following documentation explains how to do it on POSIX
-ones. It is primarly though for GNU/Linux systems and has been tested
+ones. It is primarly thought for GNU/Linux systems and has been tested
 on recent releases of Ubuntu and Fedora.
 
 Dependencies
@@ -38,6 +38,7 @@ libraries need to be available:
 * Xapian ......................................... https://xapian.org/
 (package libxapian-dev on Ubuntu)
 * libaria2 .................................. https://aria2.github.io/
+(no package on Ubuntu)
 
 These dependencies may or may not be packaged by your operating
 system. They may also be packaged but only in an older version. The
@@ -52,68 +53,91 @@ If you compile ctpp2 from source and want to compile the Kiwix library
 statically then you will probably need to rename ctpp2 static library
 from ctpp2-st.a to ctpp2.a.
 
-Environnement
+Environment
 -------------
 
 The Kiwix library builds using [Meson](http://mesonbuild.com/) version
-0.34 or higher. Meson relies itself on Ninja, pkg-config and few other
+0.39 or higher. Meson relies itself on Ninja, pkg-config and few other
 compilation tools.
 
 Install first the few common compilation tools:
-* Automake
-* Libtool
-* Virtualenv
+* Meson
+* Ninja
 * Pkg-config
 
-Then install Meson itself:
-```
-virtualenv -p python3 ./ # Create virtualenv
-source bin/activate      # Activate the virtualenv
-pip3 install meson        # Install Meson
-hash -r                  # Refresh bash paths
-```
-
-Finally download and build Ninja locally:
-```
-git clone git://github.com/ninja-build/ninja.git
-cd ninja
-git checkout release
-./configure.py --bootstrap
-mkdir ../bin                      
-cp ninja ../bin
-cd ..
-```
+These tools should be packaged if you use a cutting edge operating
+system. If not, have a look to the "Troubleshooting" section.
 
 Compilation
 -----------
 
-Once all dependencies are installed, you can compile kiwix-lib with:
+Once all dependencies are installed, you can compile the Kiwix library
+with:
 ```
-mkdir build
 meson . build
-cd build
-ninja
+ninja -C build
 ```
 
-By default, it will compile dynamic linked libraries. If you want
-statically linked libraries, you can add `--default-library=static`
-option to the Meson command.
+By default, it will compile dynamic linked libraries. All binary files
+will be created in the "build" directory created automatically by
+Meson. If you want statically linked libraries, you can add
+`--default-library=static` option to the Meson command.
 
 Depending of you system, `ninja` may be called `ninja-build`.
 
 Installation
 ------------
 
-If you want to install the libraries you just have compiled on your
-system, here we go:
+If you want to install the Kiwix library and the headers you just have
+compiled on your system, here we go:
 
 ```
-ninja install
+ninja -C build install
+```
+
+You might need to run the command as root (or using 'sudo'), depending
+where you want to install the libraries. After the installation
+succeeded, you may need to run ldconfig (as root).
+
+Uninstallation
+------------
+
+If you want to uninstall the Kiwix library:
+
+```
+ninja -C build uninstall
+```
+
+Like for the installation, you might need to run the command as root
+(or using 'sudo').
+
+Troubleshooting
+---------------
+
+If you need to install Meson "manually":
+```
+virtualenv -p python3 ./ # Create virtualenv
+source bin/activate      # Activate the virtualenv
+pip3 install meson       # Install Meson
+hash -r                  # Refresh bash paths
+```
+
+If you need to install Ninja "manually":
+```
+git clone git://github.com/ninja-build/ninja.git
+cd ninja
+git checkout release
+./configure.py --bootstrap
+mkdir ../bin
+cp ninja ../bin
 cd ..
 ```
 
-You might need to run the command as root, depending where you want to
-install the libraries.
+If the compilation still fails, you might need to get a more recent
+version of a dependency than the one packaged by your Linux
+distribution. Try then with a source tarball distributed by the
+problematic upstream project or even directly from the source code
+repository.
 
 License
 -------

include/downloader.h

@@ -21,7 +21,9 @@
 #define KIWIX_DOWNLOADER_H
 
 #include <string>
-#include <aria2/aria2.h>
+#ifdef ENABLE_LIBARIA2
+# include <aria2/aria2.h>
+#endif
 #include <pthread.h>
 
 namespace kiwix
@@ -56,14 +58,15 @@ class Downloader
  private:
   static pthread_mutex_t globalLock;
 
-  aria2::Session* session;
-  DownloadedFile* fileHandle;
   std::string tmpDir;
-
+#ifdef ENABLE_LIBARIA2
+  DownloadedFile* fileHandle;
+  aria2::Session* session;
   static int downloadEventCallback(aria2::Session* session,
                                    aria2::DownloadEvent event,
                                    aria2::A2Gid gid,
                                    void* userData);
+#endif
 };
 }
 

meson.build

@@ -1,5 +1,5 @@
 project('kiwix-lib', 'cpp',
-  version : '2.0.1',
+  version : '2.0.2',
   license : 'GPL',
   default_options : ['c_std=c11', 'cpp_std=c++11', 'werror=true'])
 
@@ -7,12 +7,17 @@ compiler = meson.get_compiler('cpp')
 find_library_in_compiler = meson.version().version_compare('>=0.31.0')
 
 static_deps = get_option('android') or get_option('default_library') == 'static'
+if get_option('android')
+  extra_libs = ['-llog']
+else
+  extra_libs = []
+endif
 
 thread_dep = dependency('threads')
 libicu_dep = dependency('icu-i18n', static:static_deps)
 libzim_dep = dependency('libzim', version : '>=4.0.0', static:static_deps)
 pugixml_dep = dependency('pugixml', static:static_deps)
-libaria2_dep = dependency('libaria2', static:static_deps)
+libaria2_dep = dependency('libaria2', static:static_deps, required:false)
 
 ctpp2_include_path = ''
 has_ctpp2_dep = false
@@ -83,6 +88,13 @@ inc = include_directories('include')
 conf = configuration_data()
 conf.set('VERSION', '"@0@"'.format(meson.project_version()))
 conf.set('ENABLE_CTPP2', has_ctpp2_dep)
+conf.set('ENABLE_LIBARIA2', libaria2_dep.found())
+
+if build_machine.system() == 'windows'
+     extra_link_args = ['-lshlwapi', '-lwinmm']
+else
+     extra_link_args = []
+endif
 
 subdir('include')
 subdir('scripts')
@@ -90,12 +102,14 @@ subdir('static')
 subdir('src')
 subdir('test')
 
-pkg_requires = ['libzim', 'icu-i18n', 'pugixml', 'libaria2']
+pkg_requires = ['libzim', 'icu-i18n', 'pugixml']
+if libaria2_dep.found()
+    pkg_requires += ['libaria2']
+endif
 if xapian_dep.found()
     pkg_requires += ['xapian-core']
 endif
 
-extra_libs = []
 extra_cflags = ''
 if has_ctpp2_dep
   extra_libs += ctpp2_link_args

src/android/kiwixreader.cpp

@@ -21,6 +21,7 @@
 
 #include <jni.h>
 #include <zim/file.h>
+#include <android/log.h>
 #include "org_kiwix_kiwixlib_JNIKiwixReader.h"
 
 #include "common/base64.h"
@@ -33,16 +34,16 @@ JNIEXPORT jlong JNICALL Java_org_kiwix_kiwixlib_JNIKiwixReader_getNativeReader(
 {
   std::string cPath = jni2c(filename, env);
 
+  __android_log_print(ANDROID_LOG_INFO, "kiwix", "Attempting to create reader with: %s", cPath.c_str());
   Lock l;
-  kiwix::Reader* reader = nullptr;
   try {
-    reader = new kiwix::Reader(cPath);
-  } catch (...) {
-    std::cerr << "Unable to load ZIM " << cPath << std::endl;
-    reader = NULL;
+    kiwix::Reader* reader = new kiwix::Reader(cPath);
+    return reinterpret_cast<jlong>(new Handle<kiwix::Reader>(reader));
+  } catch (std::exception& e) {
+    __android_log_print(ANDROID_LOG_WARN, "kiwix", "Error opening ZIM file");
+    __android_log_print(ANDROID_LOG_WARN, "kiwix", e.what());
+    return 0;
   }
-
-  return reinterpret_cast<jlong>(new Handle<kiwix::Reader>(reader));
 }
 
 JNIEXPORT void JNICALL
@@ -62,8 +63,10 @@ Java_org_kiwix_kiwixlib_JNIKiwixReader_getMainPage(JNIEnv* env, jobject obj)
   try {
     std::string cUrl = READER->getMainPage().getPath();
     url = c2jni(cUrl, env);
-  } catch (...) {
-    std::cerr << "Unable to get ZIM main page" << std::endl;
+  } catch (std::exception& e) {
+    __android_log_print(ANDROID_LOG_ERROR, "kiwix", "Unable to get ZIM main page");
+    __android_log_print(ANDROID_LOG_ERROR, "kiwix", e.what());
+    url = NULL;
   }
   return url;
 }
@@ -76,8 +79,10 @@ Java_org_kiwix_kiwixlib_JNIKiwixReader_getId(JNIEnv* env, jobject obj)
   try {
     std::string cId = READER->getId();
     id = c2jni(cId, env);
-  } catch (...) {
-    std::cerr << "Unable to get ZIM id" << std::endl;
+  } catch (std::exception& e) {
+    __android_log_print(ANDROID_LOG_ERROR, "kiwix", "Unable to get ZIM id");
+    __android_log_print(ANDROID_LOG_ERROR, "kiwix", e.what());
+    id = NULL;
   }
 
   return id;
@@ -91,8 +96,9 @@ Java_org_kiwix_kiwixlib_JNIKiwixReader_getFileSize(JNIEnv* env, jobject obj)
   try {
     int cSize = READER->getFileSize();
     size = c2jni(cSize);
-  } catch (...) {
-    std::cerr << "Unable to get ZIM file size" << std::endl;
+  } catch (std::exception& e) {
+    __android_log_print(ANDROID_LOG_ERROR, "kiwix", "Unable to get ZIM file size");
+    __android_log_print(ANDROID_LOG_ERROR, "kiwix", e.what());
   }
 
   return size;
@@ -106,8 +112,10 @@ Java_org_kiwix_kiwixlib_JNIKiwixReader_getCreator(JNIEnv* env, jobject obj)
   try {
     std::string cCreator = READER->getCreator();
     creator = c2jni(cCreator, env);
-  } catch (...) {
-    std::cerr << "Unable to get ZIM creator" << std::endl;
+  } catch (std::exception& e) {
+    __android_log_print(ANDROID_LOG_ERROR, "kiwix", "Unable to get ZIM creator");
+    __android_log_print(ANDROID_LOG_ERROR, "kiwix", e.what());
+    creator = NULL;
   }
 
   return creator;
@@ -121,8 +129,10 @@ Java_org_kiwix_kiwixlib_JNIKiwixReader_getPublisher(JNIEnv* env, jobject obj)
   try {
     std::string cPublisher = READER->getPublisher();
     publisher = c2jni(cPublisher, env);
-  } catch (...) {
-    std::cerr << "Unable to get ZIM creator" << std::endl;
+  } catch (std::exception& e) {
+    __android_log_print(ANDROID_LOG_ERROR, "kiwix", "Unable to get ZIM publish");
+    __android_log_print(ANDROID_LOG_ERROR, "kiwix", e.what());
+    publisher = NULL;
   }
   return publisher;
 }
@@ -135,8 +145,10 @@ Java_org_kiwix_kiwixlib_JNIKiwixReader_getName(JNIEnv* env, jobject obj)
   try {
     std::string cName = READER->getName();
     name = c2jni(cName, env);
-  } catch (...) {
-    std::cerr << "Unable to get ZIM name" << std::endl;
+  } catch (std::exception& e) {
+    __android_log_print(ANDROID_LOG_ERROR, "kiwix", "Unable to get ZIM name");
+    __android_log_print(ANDROID_LOG_ERROR, "kiwix", e.what());
+    name = NULL;
   }
   return name;
 }
@@ -154,8 +166,10 @@ Java_org_kiwix_kiwixlib_JNIKiwixReader_getFavicon(JNIEnv* env, jobject obj)
         base64_encode(reinterpret_cast<const unsigned char*>(cContent.c_str()),
                       cContent.length()),
         env);
-  } catch (...) {
-    std::cerr << "Unable to get ZIM favicon" << std::endl;
+  } catch (std::exception& e) {
+    __android_log_print(ANDROID_LOG_ERROR, "kiwix", "Unable to get ZIM favicon");
+    __android_log_print(ANDROID_LOG_ERROR, "kiwix", e.what());
+    favicon = NULL;
   }
   return favicon;
 }
@@ -168,8 +182,10 @@ Java_org_kiwix_kiwixlib_JNIKiwixReader_getDate(JNIEnv* env, jobject obj)
   try {
     std::string cDate = READER->getDate();
     date = c2jni(cDate, env);
-  } catch (...) {
-    std::cerr << "Unable to get ZIM date" << std::endl;
+  } catch (std::exception& e) {
+    __android_log_print(ANDROID_LOG_ERROR, "kiwix", "Unable to get ZIM date");
+    __android_log_print(ANDROID_LOG_ERROR, "kiwix", e.what());
+    date = NULL;
   }
   return date;
 }
@@ -182,8 +198,10 @@ Java_org_kiwix_kiwixlib_JNIKiwixReader_getLanguage(JNIEnv* env, jobject obj)
   try {
     std::string cLanguage = READER->getLanguage();
     language = c2jni(cLanguage, env);
-  } catch (...) {
-    std::cerr << "Unable to get ZIM language" << std::endl;
+  } catch (std::exception& e) {
+    __android_log_print(ANDROID_LOG_ERROR, "kiwix", "Unable to get ZIM language");
+    __android_log_print(ANDROID_LOG_ERROR, "kiwix", e.what());
+    language = NULL;
   }
 
   return language;
@@ -199,8 +217,10 @@ JNIEXPORT jstring JNICALL Java_org_kiwix_kiwixlib_JNIKiwixReader_getMimeType(
     auto entry = READER->getEntryFromEncodedPath(cUrl);
     auto cMimeType = entry.getMimetype();
     mimeType = c2jni(cMimeType, env);
-  } catch (...) {
-    std::cerr << "Unable to get mime-type for url " << cUrl << std::endl;
+  } catch (std::exception& e) {
+    __android_log_print(ANDROID_LOG_ERROR, "kiwix", "Unable to get mime-type for url: %s", cUrl.c_str());
+    __android_log_print(ANDROID_LOG_ERROR, "kiwix", e.what());
+    mimeType = NULL;
   }
   return mimeType;
 }
@@ -230,8 +250,9 @@ JNIEXPORT jbyteArray JNICALL Java_org_kiwix_kiwixlib_JNIKiwixReader_getContent(
 
     setStringObjValue(entry.getMimetype(), mimeTypeObj, env);
     setStringObjValue(entry.getTitle(), titleObj, env);
-  } catch (...) {
-    std::cerr << "Unable to get content for url " << cUrl << std::endl;
+  } catch (std::exception& e) {
+    __android_log_print(ANDROID_LOG_ERROR, "kiwix", "Unable to get content for url: %s", cUrl.c_str());
+    __android_log_print(ANDROID_LOG_ERROR, "kiwix", e.what());
   }
 
   return data;
@@ -261,9 +282,9 @@ JNIEXPORT jbyteArray JNICALL Java_org_kiwix_kiwixlib_JNIKiwixReader_getContentPa
           data, 0, cLen, reinterpret_cast<const jbyte*>(blob.data()));
       setIntObjValue(cLen, sizeObj, env);
     }
-  } catch (...) {
-     std::cerr << "Unable to get partial content for url " << cUrl
-               << "(" << cOffset << ":" << cLen << ")" << std::endl;
+  } catch (std::exception& e) {
+    __android_log_print(ANDROID_LOG_ERROR, "kiwix", "Unable to get partial content for url: %s (%u : %u)", cUrl.c_str(), cOffset, cLen);
+    __android_log_print(ANDROID_LOG_ERROR, "kiwix", e.what());
   }
   return data;
 }
@@ -283,10 +304,9 @@ Java_org_kiwix_kiwixlib_JNIKiwixReader_getDirectAccessInformation(
     entry = entry.getFinalEntry();
     auto part_info = entry.getDirectAccessInfo();
     setPairObjValue(part_info.first, part_info.second, pair, env);
-  } catch (...) {
-    std::cerr << "Unable to locate direct access information for url " << cUrl
-              << std::endl;
-
+  } catch (std::exception& e) {
+    __android_log_print(ANDROID_LOG_ERROR, "kiwix", "Unable to get direct access info for url: %s", cUrl.c_str());
+    __android_log_print(ANDROID_LOG_ERROR, "kiwix", e.what());
   }
   return pair;
 }
@@ -305,9 +325,9 @@ Java_org_kiwix_kiwixlib_JNIKiwixReader_searchSuggestions(JNIEnv* env,
     if (READER->searchSuggestionsSmart(cPrefix, cCount)) {
       retVal = JNI_TRUE;
     }
-  } catch (...) {
-    std::cerr << "Unable to search suggestions for pattern " << cPrefix
-              << std::endl;
+  } catch (std::exception& e) {
+    __android_log_print(ANDROID_LOG_WARN, "kiwix", "Unable to get search results for pattern: %s", cPrefix.c_str());
+    __android_log_print(ANDROID_LOG_WARN, "kiwix", e.what());
   }
 
   return retVal;
@@ -326,8 +346,9 @@ Java_org_kiwix_kiwixlib_JNIKiwixReader_getNextSuggestion(JNIEnv* env,
       setStringObjValue(cTitle, titleObj, env);
       retVal = JNI_TRUE;
     }
-  } catch (...) {
-    std::cerr << "Unable to get next suggestion" << std::endl;
+  } 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;
@@ -346,8 +367,9 @@ Java_org_kiwix_kiwixlib_JNIKiwixReader_getPageUrlFromTitle(JNIEnv* env,
     entry = entry.getFinalEntry();
     setStringObjValue(entry.getPath(), urlObj, env);
     return JNI_TRUE;
-  } catch (...) {
-    std::cerr << "Unable to get URL for title " << cTitle << std::endl;
+  } catch (std::exception& e) {
+    __android_log_print(ANDROID_LOG_WARN, "kiwix", "Unable to get url for title %s: ", cTitle.c_str());
+    __android_log_print(ANDROID_LOG_WARN, "kiwix", e.what());
   }
 
   return JNI_FALSE;
@@ -361,8 +383,10 @@ JNIEXPORT jstring JNICALL Java_org_kiwix_kiwixlib_JNIKiwixReader_getTitle(
   try {
     std::string cTitle = READER->getTitle();
     title = c2jni(cTitle, env);
-  } catch (...) {
-    std::cerr << "Unable to get ZIM title" << std::endl;
+  } catch (std::exception& e) {
+    __android_log_print(ANDROID_LOG_ERROR, "kiwix", "Unable to get zim title");
+    __android_log_print(ANDROID_LOG_ERROR, "kiwix", e.what());
+    title = NULL;
   }
   return title;
 }
@@ -375,8 +399,10 @@ Java_org_kiwix_kiwixlib_JNIKiwixReader_getDescription(JNIEnv* env, jobject obj)
   try {
     std::string cDescription = READER->getDescription();
     description = c2jni(cDescription, env);
-  } catch (...) {
-    std::cerr << "Unable to get ZIM description" << std::endl;
+  } catch (std::exception& e) {
+    __android_log_print(ANDROID_LOG_ERROR, "kiwix", "Unable to get zim description");
+    __android_log_print(ANDROID_LOG_ERROR, "kiwix", e.what());
+    description = NULL;
   }
   return description;
 }
@@ -391,9 +417,9 @@ JNIEXPORT jboolean JNICALL Java_org_kiwix_kiwixlib_JNIKiwixReader_getRandomPage(
     std::string cUrl = READER->getRandomPage().getPath();
     setStringObjValue(cUrl, urlObj, env);
     retVal = JNI_TRUE;
-  } catch (...) {
-    std::cerr << "Unable to get random page" << std::endl;
+  } catch (std::exception& e) {
+    __android_log_print(ANDROID_LOG_ERROR, "kiwix", "Unable to get random page");
+    __android_log_print(ANDROID_LOG_ERROR, "kiwix", e.what());
   }
-
   return retVal;
 }

src/config.h.in

@@ -2,3 +2,5 @@
 #mesondefine VERSION
 
 #mesondefine ENABLE_CTPP2
+
+#mesondefine ENABLE_LIBARIA2

src/downloader.cpp

@@ -20,7 +20,9 @@
 #include "downloader.h"
 #include "common/pathTools.h"
 
-#include <unistd.h>
+#ifndef _WIN32
+# include <unistd.h>
+#endif
 #include <iostream>
 
 namespace kiwix
@@ -32,6 +34,7 @@ pthread_mutex_t Downloader::globalLock = PTHREAD_MUTEX_INITIALIZER;
 /* Constructor */
 Downloader::Downloader()
 {
+#ifdef ENABLE_LIBARIA2
   aria2::SessionConfig config;
   config.downloadEventCallback = Downloader::downloadEventCallback;
   config.userData = this;
@@ -39,17 +42,20 @@ Downloader::Downloader()
   aria2::KeyVals options;
   options.push_back(std::pair<std::string, std::string>("dir", tmpDir));
   session = aria2::sessionNew(options, config);
+#endif
 }
 
 
 /* Destructor */
 Downloader::~Downloader()
 {
+#ifdef ENABLE_LIBARIA2
   aria2::sessionFinal(session);
+#endif
   rmdir(tmpDir.c_str());
 }
 
-
+#ifdef ENABLE_LIBARIA2
 int Downloader::downloadEventCallback(aria2::Session* session,
                                       aria2::DownloadEvent event,
                                       aria2::A2Gid gid,
@@ -85,10 +91,12 @@ int Downloader::downloadEventCallback(aria2::Session* session,
   aria2::deleteDownloadHandle(dh);
   return 0;
 }
+#endif
 
 DownloadedFile Downloader::download(const std::string& url) {
   pthread_mutex_lock(&globalLock);
   DownloadedFile fileHandle;
+#ifdef ENABLE_LIBARIA2
   try {
     std::vector<std::string> uris = {url};
     aria2::KeyVals options;
@@ -106,6 +114,7 @@ DownloadedFile Downloader::download(const std::string& url) {
   } catch (...) {};
   this->fileHandle = nullptr;
   pthread_mutex_unlock(&globalLock);
+#endif
   return fileHandle;
 }
 

src/reader.cpp

@@ -265,6 +265,7 @@ bool Reader::getFavicon(string& content, string& mimeType) const
   for (auto &path: paths) {
     try {
       auto entry = getEntryFromPath(path);
+      entry = entry.getFinalEntry();
       content = entry.getContent();
       mimeType = entry.getMimetype();
       return true;

src/xapianSearcher.cpp

@@ -20,7 +20,9 @@
 #include "xapianSearcher.h"
 #include <sys/types.h>
 #include <unicode/locid.h>
-#include <unistd.h>
+#ifndef _WIN32
+#  include <unistd.h>
+#endif
 #include <zim/article.h>
 #include <zim/error.h>
 #include <zim/file.h>

test/meson.build

@@ -10,6 +10,7 @@ gtest_dep = dependency('gtest', fallback: ['gtest', 'gtest_dep'])
 foreach test_name : tests
     test_exe = executable(test_name, [test_name+'.cpp'],
                           link_with : kiwixlib,
+                          link_args: extra_link_args,
                           dependencies : all_deps + [gtest_dep],
                           build_rpath : '$ORIGIN')
     test(test_name, test_exe)

travis/install_deps.sh

@@ -28,6 +28,4 @@ cp ninja $HOME/bin
 # Dependencies comming from kiwix-build.
 cd ${HOME}
 wget http://tmp.kiwix.org/ci/${ARCHIVE_NAME}
-mkdir -p BUILD_${PLATFORM}
-cd BUILD_${PLATFORM}
 tar xf ${HOME}/${ARCHIVE_NAME}