Mholloway has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/373985 )
Change subject: Populate metadata for downloadable ZIM files from Kiwix
......................................................................
Populate metadata for downloadable ZIM files from Kiwix
Notes:
* Dates are currently approximate based on mm-yyyy combinations from the
Kiwix download site, but it looks like we have the true timestamps on
dumps. These can be updated later.
* The image assets for the OR Wikipedia full collection with no media
don't seem to have been uploaded; those are empty.
Bug: T164760
Change-Id: I657e9eb37c5ccd2b3ca8ea994e57f838a4441edf
---
M app/build.gradle
A app/src/main/assets/zims.tsv
M app/src/main/java/org/wikipedia/offline/Compilation.java
M app/src/main/java/org/wikipedia/offline/CompilationClient.java
M app/src/main/java/org/wikipedia/offline/CompilationDetailFragment.java
M app/src/main/java/org/wikipedia/offline/RemoteCompilationsFragment.java
6 files changed, 122 insertions(+), 93 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia
refs/changes/85/373985/1
diff --git a/app/build.gradle b/app/build.gradle
index afd312d..661ac4b 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -194,6 +194,7 @@
}
compile 'net.hockeyapp.android:HockeySDK:4.1.3'
compile 'org.apache.commons:commons-lang3:3.5'
+ compile "commons-io:commons-io:2.5"
compile 'org.jsoup:jsoup:1.10.2'
compile 'com.dmitrybrant:zimdroid:0.0.11'
@@ -213,7 +214,6 @@
testCompile mockitoCore
testCompile 'org.robolectric:robolectric:3.3.2'
testCompile "com.squareup.okhttp3:mockwebserver:$okHttpVersion"
- testCompile "commons-io:commons-io:2.5"
androidTestCompile mockitoCore
androidTestApk 'com.crittercism.dexmaker:dexmaker:1.4'
diff --git a/app/src/main/assets/zims.tsv b/app/src/main/assets/zims.tsv
new file mode 100644
index 0000000..51412b2
--- /dev/null
+++ b/app/src/main/assets/zims.tsv
@@ -0,0 +1,72 @@
+Medical Wiki AR/العربية
http://download.kiwix.org/zim/wikipedia_ar_medicine.zim ar This is a
complete collection of all health care, anatomy, and medication related topics
from Wikipedia. ALL
https://upload.wikimedia.org/wikipedia/commons/thumb/5/58/Wiki_Project_Med_Foundation_logo.svg/320px-Wiki_Project_Med_Foundation_logo.svg.png
https://upload.wikimedia.org/wikipedia/commons/thumb/4/4e/WikiMedicine-Large_image-EN%404x.png/640px-WikiMedicine-Large_image-EN%404x.png
1043986445 1501545600
+Medical Wiki BN/বাংলা http://download.kiwix.org/zim/wikipedia_bn_medicine.zim
bn This is a complete collection of all health care, anatomy, and
medication related topics from Wikipedia in an offline format. ALL
https://upload.wikimedia.org/wikipedia/commons/thumb/5/58/Wiki_Project_Med_Foundation_logo.svg/320px-Wiki_Project_Med_Foundation_logo.svg.png
https://upload.wikimedia.org/wikipedia/commons/thumb/4/4e/WikiMedicine-Large_image-EN%404x.png/640px-WikiMedicine-Large_image-EN%404x.png
177557471 1501545600
+Medical Wiki DE/Deutsch
http://download.kiwix.org/zim/wikipedia_de_medicine.zim de This is a
complete collection of all health care, anatomy, and medication related topics
from Wikipedia in an offline format. ALL
https://upload.wikimedia.org/wikipedia/commons/thumb/5/58/Wiki_Project_Med_Foundation_logo.svg/320px-Wiki_Project_Med_Foundation_logo.svg.png
https://upload.wikimedia.org/wikipedia/commons/thumb/4/4e/WikiMedicine-Large_image-EN%404x.png/640px-WikiMedicine-Large_image-EN%404x.png
1015686289 1501545600
+Medical Wiki EN/English
http://download.kiwix.org/zim/wikipedia_en_medicine.zim en With 51,000+
medical articles, Wikimed is the largest and most comprehensive collection of
health-related articles available. It includes content on diseases,
medications, anatomy, and sanitation. As an encyclopedic medical dictionary,
Wikimed is perfect for practicing physicians, as well as medicine and other
healthcare students. If you are in the developing world without access to
the Internet or on a boat in the middle of nowhere you can now access one of
the foremost and up-to-date medical dictionaries, for free. ALL
https://upload.wikimedia.org/wikipedia/commons/thumb/5/58/Wiki_Project_Med_Foundation_logo.svg/320px-Wiki_Project_Med_Foundation_logo.svg.png
https://upload.wikimedia.org/wikipedia/commons/thumb/4/4e/WikiMedicine-Large_image-EN%404x.png/640px-WikiMedicine-Large_image-EN%404x.png
4627268005 1501545600
+Medical Wiki ES/Español
http://download.kiwix.org/zim/wikipedia_es_medicine.zim es This is a
complete collection of all health care, anatomy, and medication related topics
from Wikipedia. ALL
https://upload.wikimedia.org/wikipedia/commons/thumb/5/58/Wiki_Project_Med_Foundation_logo.svg/320px-Wiki_Project_Med_Foundation_logo.svg.png
https://upload.wikimedia.org/wikipedia/commons/thumb/4/4e/WikiMedicine-Large_image-EN%404x.png/640px-WikiMedicine-Large_image-EN%404x.png
955152487 1501545600
+Medical Wiki FR/Français
http://download.kiwix.org/zim/wikipedia_fr_medicine.zim fr This is a
complete collection of all health care, anatomy, and medication related topics
from Wikipedia in an offline format. ALL
https://upload.wikimedia.org/wikipedia/commons/thumb/5/58/Wiki_Project_Med_Foundation_logo.svg/320px-Wiki_Project_Med_Foundation_logo.svg.png
https://upload.wikimedia.org/wikipedia/commons/thumb/4/4e/WikiMedicine-Large_image-EN%404x.png/640px-WikiMedicine-Large_image-EN%404x.png
758066406 1501545600
+Medical Wiki HI/हिन्दी http://download.kiwix.org/zim/wikipedia_hi_medicine.zim
hi This is a complete collection of all health care, anatomy, and
medication related topics from Wikipedia in an offline format. ALL
https://upload.wikimedia.org/wikipedia/commons/thumb/5/58/Wiki_Project_Med_Foundation_logo.svg/320px-Wiki_Project_Med_Foundation_logo.svg.png
https://upload.wikimedia.org/wikipedia/commons/thumb/4/4e/WikiMedicine-Large_image-EN%404x.png/640px-WikiMedicine-Large_image-EN%404x.png
105169701 1501545600
+Medical Wiki IT/Italiano
http://download.kiwix.org/zim/wikipedia_it_medicine.zim it This is a
complete collection of all health care, anatomy, and medication related topics
from Wikipedia in an offline format. ALL
https://upload.wikimedia.org/wikipedia/commons/thumb/5/58/Wiki_Project_Med_Foundation_logo.svg/320px-Wiki_Project_Med_Foundation_logo.svg.png
https://upload.wikimedia.org/wikipedia/commons/thumb/4/4e/WikiMedicine-Large_image-EN%404x.png/640px-WikiMedicine-Large_image-EN%404x.png
501419605 1501545600
+Medical Wiki MR/मराठी http://download.kiwix.org/zim/wikipedia_mr_medicine.zim
mr This is a complete collection of all health care, anatomy, and
medication related topics from Wikipedia in an offline format. ALL
https://upload.wikimedia.org/wikipedia/commons/thumb/5/58/Wiki_Project_Med_Foundation_logo.svg/320px-Wiki_Project_Med_Foundation_logo.svg.png
https://upload.wikimedia.org/wikipedia/commons/thumb/4/4e/WikiMedicine-Large_image-EN%404x.png/640px-WikiMedicine-Large_image-EN%404x.png
60950381 1501545600
+Medical Wiki PT/Português
http://download.kiwix.org/zim/wikipedia_pt_medicine.zim pt This is a
complete collection of all health care, anatomy, and medication related topics
from Wikipedia in an offline format. ALL
https://upload.wikimedia.org/wikipedia/commons/thumb/5/58/Wiki_Project_Med_Foundation_logo.svg/320px-Wiki_Project_Med_Foundation_logo.svg.png
https://upload.wikimedia.org/wikipedia/commons/thumb/4/4e/WikiMedicine-Large_image-EN%404x.png/640px-WikiMedicine-Large_image-EN%404x.png
591212643 1501545600
+Medical Wiki TA/தமிழ் http://download.kiwix.org/zim/wikipedia_ta_medicine.zim
ta This is a complete collection of all health care, anatomy, and
medication related topics from Wikipedia in an offline format. ALL
https://upload.wikimedia.org/wikipedia/commons/thumb/5/58/Wiki_Project_Med_Foundation_logo.svg/320px-Wiki_Project_Med_Foundation_logo.svg.png
https://upload.wikimedia.org/wikipedia/commons/thumb/4/4e/WikiMedicine-Large_image-EN%404x.png/640px-WikiMedicine-Large_image-EN%404x.png
91796968 1501545600
+Medical Wiki ZH/中文 http://download.kiwix.org/zim/wikipedia_zh_medicine.zim
zh This is a complete collection of all health care, anatomy, and
medication related topics from Wikipedia in an offline format. ALL
https://upload.wikimedia.org/wikipedia/commons/thumb/5/58/Wiki_Project_Med_Foundation_logo.svg/320px-Wiki_Project_Med_Foundation_logo.svg.png
https://upload.wikimedia.org/wikipedia/commons/thumb/4/4e/WikiMedicine-Large_image-EN%404x.png/640px-WikiMedicine-Large_image-EN%404x.png
644706132 1501545600
+Medical Wiki OR/ଓଡ଼ିଆ http://download.kiwix.org/zim/wikipedia_or_medicine.zim
or This is a complete collection of all health care, anatomy, and
medication related topics from Wikipedia in an offline format. ALL
https://upload.wikimedia.org/wikipedia/commons/thumb/5/58/Wiki_Project_Med_Foundation_logo.svg/320px-Wiki_Project_Med_Foundation_logo.svg.png
https://upload.wikimedia.org/wikipedia/commons/thumb/4/4e/WikiMedicine-Large_image-EN%404x.png/640px-WikiMedicine-Large_image-EN%404x.png
247019389 1501545600
+Medical Wiki FA/فارسی http://download.kiwix.org/zim/wikipedia_fa_medicine.zim
fa This is a complete collection of all health care, anatomy, and
medication related topics from Wikipedia in an offline format. ALL
https://upload.wikimedia.org/wikipedia/commons/thumb/5/58/Wiki_Project_Med_Foundation_logo.svg/320px-Wiki_Project_Med_Foundation_logo.svg.png
https://upload.wikimedia.org/wikipedia/commons/thumb/4/4e/WikiMedicine-Large_image-EN%404x.png/640px-WikiMedicine-Large_image-EN%404x.png
252961663 1501545600
+Medical Wiki AR/العربية (no video)
http://download.kiwix.org/zim/wikipedia_ar_medicine_novid.zim ar This is
a complete collection of all health care, anatomy, and medication related
topics from Wikipedia in an offline format. NOVID
https://upload.wikimedia.org/wikipedia/commons/thumb/5/58/Wiki_Project_Med_Foundation_logo.svg/320px-Wiki_Project_Med_Foundation_logo.svg.png
https://upload.wikimedia.org/wikipedia/commons/thumb/3/35/WikiMedicine-nomedia-Large_image-EN.svg/640px-WikiMedicine-nomedia-Large_image-EN.svg.png
314283535 1501545600
+Medical Wiki BN/বাংলা (no video)
http://download.kiwix.org/zim/wikipedia_bn_medicine_novid.zim bn This is
a complete collection of all health care, anatomy, and medication related
topics from Wikipedia in an offline format. NOVID
https://upload.wikimedia.org/wikipedia/commons/thumb/5/58/Wiki_Project_Med_Foundation_logo.svg/320px-Wiki_Project_Med_Foundation_logo.svg.png
https://upload.wikimedia.org/wikipedia/commons/thumb/3/35/WikiMedicine-nomedia-Large_image-EN.svg/640px-WikiMedicine-nomedia-Large_image-EN.svg.png
32746622 1501545600
+Medical Wiki DE/Deutsch (no video)
http://download.kiwix.org/zim/wikipedia_de_medicine_novid.zim de This is
a complete collection of all health care, anatomy, and medication related
topics from Wikipedia in an offline format. NOVID
https://upload.wikimedia.org/wikipedia/commons/thumb/5/58/Wiki_Project_Med_Foundation_logo.svg/320px-Wiki_Project_Med_Foundation_logo.svg.png
https://upload.wikimedia.org/wikipedia/commons/thumb/3/35/WikiMedicine-nomedia-Large_image-EN.svg/640px-WikiMedicine-nomedia-Large_image-EN.svg.png
302021041 1501545600
+Medical Wiki EN/English (no video)
http://download.kiwix.org/zim/wikipedia_en_medicine_novid.zim en With
51,000+ medical articles, Wikimed is the largest and most comprehensive
collection of health-related articles available. It includes content on
diseases, medications, anatomy, and sanitation. As an encyclopedic medical
dictionary, Wikimed is perfect for practicing physicians, as well as medicine
and other healthcare students. If you are in the developing world without
access to the Internet or on a boat in the middle of nowhere you can now access
one of the foremost and up-to-date medical dictionaries, for free. NOVID
https://upload.wikimedia.org/wikipedia/commons/thumb/5/58/Wiki_Project_Med_Foundation_logo.svg/320px-Wiki_Project_Med_Foundation_logo.svg.png
https://upload.wikimedia.org/wikipedia/commons/thumb/3/35/WikiMedicine-nomedia-Large_image-EN.svg/640px-WikiMedicine-nomedia-Large_image-EN.svg.png
1181464899 1501545600
+Medical Wiki ES/Español (no video)
http://download.kiwix.org/zim/wikipedia_es_medicine_novid.zim es This is
a complete collection of all health care, anatomy, and medication related
topics from Wikipedia. NOVID
https://upload.wikimedia.org/wikipedia/commons/thumb/5/58/Wiki_Project_Med_Foundation_logo.svg/320px-Wiki_Project_Med_Foundation_logo.svg.png
https://upload.wikimedia.org/wikipedia/commons/thumb/3/35/WikiMedicine-nomedia-Large_image-EN.svg/640px-WikiMedicine-nomedia-Large_image-EN.svg.png
290300506 1501545600
+Medical Wiki FR/Français (no video)
http://download.kiwix.org/zim/wikipedia_fr_medicine_novid.zim fr This is
a complete collection of all health care, anatomy, and medication related
topics from Wikipedia in an offline format. NOVID
https://upload.wikimedia.org/wikipedia/commons/thumb/5/58/Wiki_Project_Med_Foundation_logo.svg/320px-Wiki_Project_Med_Foundation_logo.svg.png
https://upload.wikimedia.org/wikipedia/commons/thumb/3/35/WikiMedicine-nomedia-Large_image-EN.svg/640px-WikiMedicine-nomedia-Large_image-EN.svg.png
292409222 1501545600
+Medical Wiki HI/हिन्दी (no video)
http://download.kiwix.org/zim/wikipedia_hi_medicine_novid.zim hi This is
a complete collection of all health care, anatomy, and medication related
topics from Wikipedia in an offline format. NOVID
https://upload.wikimedia.org/wikipedia/commons/thumb/5/58/Wiki_Project_Med_Foundation_logo.svg/320px-Wiki_Project_Med_Foundation_logo.svg.png
https://upload.wikimedia.org/wikipedia/commons/thumb/3/35/WikiMedicine-nomedia-Large_image-EN.svg/640px-WikiMedicine-nomedia-Large_image-EN.svg.png
43586977 1501545600
+Medical Wiki IT/Italiano (no video)
http://download.kiwix.org/zim/wikipedia_it_medicine_novid.zim it This is
a complete collection of all health care, anatomy, and medication related
topics from Wikipedia in an offline format. NOVID
https://upload.wikimedia.org/wikipedia/commons/thumb/5/58/Wiki_Project_Med_Foundation_logo.svg/320px-Wiki_Project_Med_Foundation_logo.svg.png
https://upload.wikimedia.org/wikipedia/commons/thumb/3/35/WikiMedicine-nomedia-Large_image-EN.svg/640px-WikiMedicine-nomedia-Large_image-EN.svg.png
243036619 1501545600
+Medical Wiki MR/मराठी (no video)
http://download.kiwix.org/zim/wikipedia_mr_medicine_novid.zim mr This is
a complete collection of all health care, anatomy, and medication related
topics from Wikipedia in an offline format. NOVID
https://upload.wikimedia.org/wikipedia/commons/thumb/5/58/Wiki_Project_Med_Foundation_logo.svg/320px-Wiki_Project_Med_Foundation_logo.svg.png
https://upload.wikimedia.org/wikipedia/commons/thumb/3/35/WikiMedicine-nomedia-Large_image-EN.svg/640px-WikiMedicine-nomedia-Large_image-EN.svg.png
5915705 1501545600
+Medical Wiki PT/Português (no video)
http://download.kiwix.org/zim/wikipedia_pt_medicine_novid.zim pt This is
a complete collection of all health care, anatomy, and medication related
topics from Wikipedia in an offline format. NOVID
https://upload.wikimedia.org/wikipedia/commons/thumb/5/58/Wiki_Project_Med_Foundation_logo.svg/320px-Wiki_Project_Med_Foundation_logo.svg.png
https://upload.wikimedia.org/wikipedia/commons/thumb/3/35/WikiMedicine-nomedia-Large_image-EN.svg/640px-WikiMedicine-nomedia-Large_image-EN.svg.png
164741875 1501545600
+Medical Wiki TA/தமிழ் (no video)
http://download.kiwix.org/zim/wikipedia_ta_medicine_novid.zim ta This is
a complete collection of all health care, anatomy, and medication related
topics from Wikipedia in an offline format. NOVID
https://upload.wikimedia.org/wikipedia/commons/thumb/5/58/Wiki_Project_Med_Foundation_logo.svg/320px-Wiki_Project_Med_Foundation_logo.svg.png
https://upload.wikimedia.org/wikipedia/commons/thumb/3/35/WikiMedicine-nomedia-Large_image-EN.svg/640px-WikiMedicine-nomedia-Large_image-EN.svg.png
50315890 1501545600
+Medical Wiki ZH/中文 (no video)
http://download.kiwix.org/zim/wikipedia_zh_medicine_novid.zim zh This is
a complete collection of all health care, anatomy, and medication related
topics from Wikipedia in an offline format. NOVID
https://upload.wikimedia.org/wikipedia/commons/thumb/5/58/Wiki_Project_Med_Foundation_logo.svg/320px-Wiki_Project_Med_Foundation_logo.svg.png
https://upload.wikimedia.org/wikipedia/commons/thumb/3/35/WikiMedicine-nomedia-Large_image-EN.svg/640px-WikiMedicine-nomedia-Large_image-EN.svg.png
187069217 1501545600
+Medical Wiki OR/ଓଡ଼ିଆ (no video)
http://download.kiwix.org/zim/wikipedia_or_medicine_novid.zim or This is
a complete collection of all health care, anatomy, and medication related
topics from Wikipedia in an offline format. NOVID
https://upload.wikimedia.org/wikipedia/commons/thumb/5/58/Wiki_Project_Med_Foundation_logo.svg/320px-Wiki_Project_Med_Foundation_logo.svg.png
https://upload.wikimedia.org/wikipedia/commons/thumb/3/35/WikiMedicine-nomedia-Large_image-EN.svg/640px-WikiMedicine-nomedia-Large_image-EN.svg.png
20570495 1501545600
+Medical Wiki FA/فارسی (no video)
http://download.kiwix.org/zim/wikipedia_fa_medicine_novid.zim fa This is
a complete collection of all health care, anatomy, and medication related
topics from Wikipedia. NOVID
https://upload.wikimedia.org/wikipedia/commons/thumb/5/58/Wiki_Project_Med_Foundation_logo.svg/320px-Wiki_Project_Med_Foundation_logo.svg.png
https://upload.wikimedia.org/wikipedia/commons/thumb/3/35/WikiMedicine-nomedia-Large_image-EN.svg/640px-WikiMedicine-nomedia-Large_image-EN.svg.png
175186102 1501545600
+Wikipedia AR/العربية
http://download.kiwix.org/zim/wikipedia_ar_all_novid.zim ar
Download the entire Arabic Wikipedia for exploring offline. NOVID
https://upload.wikimedia.org/wikipedia/commons/thumb/b/bb/Wikipedia-logo-v2-ar.svg/320px-Wikipedia-logo-v2-ar.svg.png
https://upload.wikimedia.org/wikipedia/commons/thumb/b/bb/Wikipedia-logo-v2-ar.svg/640px-Wikipedia-logo-v2-ar.svg.png
6581534394 1498867200
+Wikipedia BN/বাংলা
http://download.kiwix.org/zim/wikipedia_bn_all_novid.zim bn
Download the entire Bangla Wikipedia for exploring offline. NOVID
https://upload.wikimedia.org/wikipedia/commons/thumb/e/e5/Wikipedia-logo-v2-bn.svg/320px-Wikipedia-logo-v2-bn.svg.png
https://upload.wikimedia.org/wikipedia/commons/thumb/e/e5/Wikipedia-logo-v2-bn.svg/640px-Wikipedia-logo-v2-bn.svg.png
754188994 1501545600
+Wikipedia DE/Deutsch http://download.kiwix.org/zim/wikipedia_de_all.zim
de Download the entire German Wikipedia for exploring offline.
ALL
https://upload.wikimedia.org/wikipedia/commons/thumb/9/9e/Wikipedia-logo-v2-de.svg/320px-Wikipedia-logo-v2-de.svg.png
https://upload.wikimedia.org/wikipedia/commons/thumb/9/9e/Wikipedia-logo-v2-de.svg/640px-Wikipedia-logo-v2-de.svg.png
26975535224 1496275200
+Wikipedia EN/English
http://download.kiwix.org/zim/wikipedia_en_all_novid.zim en With
over 5 million articles, download the entire English Wikipedia for exploring
offline. NOVID
https://upload.wikimedia.org/wikipedia/commons/thumb/b/b3/Wikipedia-logo-v2-en.svg/320px-Wikipedia-logo-v2-en.svg.png
https://upload.wikimedia.org/wikipedia/commons/thumb/b/b3/Wikipedia-logo-v2-en.svg/640px-Wikipedia-logo-v2-en.svg.png
64048847318 1498867200
+Wikipedia ES/Español
http://download.kiwix.org/zim/wikipedia_es_all_novid.zim es
Download the entire Spanish Wikipedia for exploring offline. NOVID
https://upload.wikimedia.org/wikipedia/commons/thumb/1/1e/Wikipedia-logo-v2-es.svg/320px-Wikipedia-logo-v2-es.svg.png
https://upload.wikimedia.org/wikipedia/commons/thumb/1/1e/Wikipedia-logo-v2-es.svg/640px-Wikipedia-logo-v2-es.svg.png
16232349636 1501545600
+Wikipedia FR/Français
http://download.kiwix.org/zim/wikipedia_fr_all_novid.zim fr
Download the entire French Wikipedia for exploring offline. NOVID
https://upload.wikimedia.org/wikipedia/commons/thumb/d/d1/Wikipedia-logo-v2-fr.svg/320px-Wikipedia-logo-v2-fr.svg.png
https://upload.wikimedia.org/wikipedia/commons/thumb/d/d1/Wikipedia-logo-v2-fr.svg/640px-Wikipedia-logo-v2-fr.svg.png
24393764607 1498867200
+Wikipedia HI/हिन्दी
http://download.kiwix.org/zim/wikipedia_hi_all_novid.zim hi
Download the entire Wikipedia for exploring offline. NOVID
https://upload.wikimedia.org/wikipedia/commons/thumb/b/b6/Wikipedia-logo-v2-hi.svg/320px-Wikipedia-logo-v2-hi.svg.png
https://upload.wikimedia.org/wikipedia/commons/thumb/b/b6/Wikipedia-logo-v2-hi.svg/640px-Wikipedia-logo-v2-hi.svg.png
927422737 1501545600
+Wikipedia ID/Bahasa Indonesia
http://download.kiwix.org/zim/wikipedia_id_all.zim id Download the
entire Bahasa Indonesian Wikipedia for exploring offline. NOVID
https://upload.wikimedia.org/wikipedia/commons/thumb/5/57/Wikipedia-logo-v2-id.svg/320px-Wikipedia-logo-v2-id.svg.png
https://upload.wikimedia.org/wikipedia/commons/thumb/5/57/Wikipedia-logo-v2-id.svg/640px-Wikipedia-logo-v2-id.svg.png
3136797405 1483228800
+Wikipedia IG/Igbo
http://download.kiwix.org/zim/wikipedia_ig_all_novid.zim ig
Download the entire Igbo Wikipedia for exploring offline. NOVID
https://upload.wikimedia.org/wikipedia/commons/thumb/9/9e/Wikipedia-logo-v2-ig.svg/320px-Wikipedia-logo-v2-ig.svg.png
https://upload.wikimedia.org/wikipedia/commons/thumb/9/9e/Wikipedia-logo-v2-ig.svg/640px-Wikipedia-logo-v2-ig.svg.png
11858465 1501545600
+Wikipedia IT/Italiano http://download.kiwix.org/zim/wikipedia_it_all.zim
it Download the entire Italian Wikipedia for exploring offline.
NOVID
https://upload.wikimedia.org/wikipedia/commons/thumb/9/90/Wikipedia-logo-v2-it.svg/320px-Wikipedia-logo-v2-it.svg.png
https://upload.wikimedia.org/wikipedia/commons/thumb/9/90/Wikipedia-logo-v2-it.svg/640px-Wikipedia-logo-v2-it.svg.png
14722946785 1483228800
+Wikipedia MR/मराठी
http://download.kiwix.org/zim/wikipedia_mr_all_novid.zim mr
Download the entire Marathi Wikipedia for exploring offline. NOVID
https://upload.wikimedia.org/wikipedia/commons/thumb/0/0e/Wikipedia-logo-v2-mr.svg/320px-Wikipedia-logo-v2-mr.svg.png
https://upload.wikimedia.org/wikipedia/commons/thumb/0/0e/Wikipedia-logo-v2-mr.svg/640px-Wikipedia-logo-v2-mr.svg.png
357894586 1501545600
+Wikipedia MY/မြန်မာဘာသာ
http://download.kiwix.org/zim/wikipedia_my_all_novid.zim my
Download the entire Burmese Wikipedia for exploring offline. NOVID
https://upload.wikimedia.org/wikipedia/commons/thumb/9/97/Wikipedia-logo-v2-my.svg/320px-Wikipedia-logo-v2-my.svg.png
https://upload.wikimedia.org/wikipedia/commons/thumb/9/97/Wikipedia-logo-v2-my.svg/640px-Wikipedia-logo-v2-my.svg.png
204840881 1501545600
+Wikipedia PT/Português
http://download.kiwix.org/zim/wikipedia_pt_all_novid.zim pt
Download the entire Portuguese Wikipedia for exploring offline. NOVID
https://upload.wikimedia.org/wikipedia/commons/thumb/7/7f/Wikipedia-logo-v2-pt.svg/320px-Wikipedia-logo-v2-pt.svg.png
https://upload.wikimedia.org/wikipedia/commons/thumb/7/7f/Wikipedia-logo-v2-pt.svg/640px-Wikipedia-logo-v2-pt.svg.png
9594313590 1496275200
+Wikipedia RU/русский http://download.kiwix.org/zim/wikipedia_ru_all.zim
ru Download the entire Russian Wikipedia for exploring offline.
NOVID
https://upload.wikimedia.org/wikipedia/commons/thumb/7/77/Wikipedia-logo-v2-ru.svg/320px-Wikipedia-logo-v2-ru.svg.png
https://upload.wikimedia.org/wikipedia/commons/thumb/7/77/Wikipedia-logo-v2-ru.svg/640px-Wikipedia-logo-v2-ru.svg.png
18979499502 1483228800
+Wikipedia TA/தமிழ்
http://download.kiwix.org/zim/wikipedia_ta_all_novid.zim ta
Download the entire Tamil Wikipedia for exploring offline. NOVID
https://upload.wikimedia.org/wikipedia/commons/thumb/8/80/Wikipedia-logo-v2-ta.svg/320px-Wikipedia-logo-v2-ta.svg.png
https://upload.wikimedia.org/wikipedia/commons/thumb/8/80/Wikipedia-logo-v2-ta.svg/640px-Wikipedia-logo-v2-ta.svg.png
1081258789 1501545600
+Wikipedia TL/Tagalog
http://download.kiwix.org/zim/wikipedia_tl_all_novid.zim tl
Download the entire Tagalog Wikipedia for exploring offline. NOVID
https://upload.wikimedia.org/wikipedia/commons/thumb/0/0f/Wikipedia-logo-v2-tl.svg/320px-Wikipedia-logo-v2-tl.svg.png
https://upload.wikimedia.org/wikipedia/commons/thumb/0/0f/Wikipedia-logo-v2-tl.svg/640px-Wikipedia-logo-v2-tl.svg.png
368406532 1501545600
+Wikipedia TR/Türkçe
http://download.kiwix.org/zim/wikipedia_tr_all_novid.zim tr
Download the entire Turkish Wikipedia for exploring offline. NOVID
https://upload.wikimedia.org/wikipedia/commons/thumb/8/83/Wikipedia-logo-v2-tr.svg/320px-Wikipedia-logo-v2-tr.svg.png
https://upload.wikimedia.org/wikipedia/commons/thumb/8/83/Wikipedia-logo-v2-tr.svg/640px-Wikipedia-logo-v2-tr.svg.png
3266316799 1501545600
+Wikipedia YO/Yorùbá http://download.kiwix.org/zim/wikipedia_yo_all.zim
yo Download the entire Yoruba Wikipedia for exploring offline.
NOVID
https://upload.wikimedia.org/wikipedia/commons/thumb/b/b0/Wikipedia-logo-v2-yo.svg/320px-Wikipedia-logo-v2-yo.svg.png
https://upload.wikimedia.org/wikipedia/commons/thumb/b/b0/Wikipedia-logo-v2-yo.svg/640px-Wikipedia-logo-v2-yo.svg.png
88041735 1470009600
+Wikipedia ZH/中文 http://download.kiwix.org/zim/wikipedia_zh_all.zim
zh Download the entire Chinese Wikipedia for exploring offline.
NOVID
https://upload.wikimedia.org/wikipedia/commons/thumb/a/a0/Wikipedia-logo-v2-zh.svg/320px-Wikipedia-logo-v2-zh.svg.png
https://upload.wikimedia.org/wikipedia/commons/thumb/a/a0/Wikipedia-logo-v2-zh.svg/640px-Wikipedia-logo-v2-zh.svg.png
9845409526 1483228800
+Wikipedia OR/ଓଡ଼ିଆ
http://download.kiwix.org/zim/wikipedia_or_all_novid.zim or
Download the entire Odia Wikipedia for exploring offline. NOVID
https://upload.wikimedia.org/wikipedia/commons/thumb/9/98/Wikipedia-logo-v2-or.svg/320px-Wikipedia-logo-v2-or.svg.png
https://upload.wikimedia.org/wikipedia/commons/thumb/9/98/Wikipedia-logo-v2-or.svg/640px-Wikipedia-logo-v2-or.svg.png
132351124 1501545600
+Wikipedia FA/فارسی http://download.kiwix.org/zim/wikipedia_fa_all.zim
fa Download the entire Persian Wikipedia for exploring offline.
NOVID
https://upload.wikimedia.org/wikipedia/commons/thumb/f/fb/Wikipedia-logo-v2-fa.svg/320px-Wikipedia-logo-v2-fa.svg.png
https://upload.wikimedia.org/wikipedia/commons/thumb/f/fb/Wikipedia-logo-v2-fa.svg/640px-Wikipedia-logo-v2-fa.svg.png
5378045483 1491004800
+Wikipedia AR/العربية (no pictures)
http://download.kiwix.org/zim/wikipedia_ar_all_nopic.zim ar Save
storage space with this text-only version of the entire Arabic Wikipedia for
exploring offline. NOPIC
https://upload.wikimedia.org/wikipedia/commons/thumb/8/83/Nomedia-Thumb-AR.svg/320px-Nomedia-Thumb-AR.svg.png
https://upload.wikimedia.org/wikipedia/commons/thumb/f/f1/Nomedia-Large_image-AR.svg/640px-Nomedia-Large_image-AR.svg.png
1849978806 1498867200
+Wikipedia BN/বাংলা (no pictures)
http://download.kiwix.org/zim/wikipedia_bn_all_nopic.zim bn Save
storage space with this text-only version of the entire Bangla Wikipedia for
exploring offline. NOPIC
https://upload.wikimedia.org/wikipedia/commons/thumb/b/b8/Nomedia-Thumb-BN.svg/320px-Nomedia-Thumb-BN.svg.png
https://upload.wikimedia.org/wikipedia/commons/thumb/a/ae/Nomedia-Large_image-BN.svg/640px-Nomedia-Large_image-BN.svg.png
168480336 1501545600
+Wikipedia DE/Deutsch (no pictures)
http://download.kiwix.org/zim/wikipedia_de_all_nopic.zim de Save
storage space with this text-only version of the entire German Wikipedia for
exploring offline. NOPIC
https://upload.wikimedia.org/wikipedia/commons/thumb/3/39/Nomedia-Thumb-EN.svg/320px-Nomedia-Thumb-EN.svg.png
https://upload.wikimedia.org/wikipedia/commons/thumb/f/f5/Nomedia-Large_image-EN.svg/640px-Nomedia-Large_image-EN.svg.png
5522498260 1496275200
+Wikipedia EN/English (no pictures)
http://download.kiwix.org/zim/wikipedia_en_all_nopic.zim en Save
storage space with this text-only version of the entire English Wikipedia for
exploring offline. NOPIC
https://upload.wikimedia.org/wikipedia/commons/thumb/3/39/Nomedia-Thumb-EN.svg/320px-Nomedia-Thumb-EN.svg.png
https://upload.wikimedia.org/wikipedia/commons/thumb/f/f5/Nomedia-Large_image-EN.svg/640px-Nomedia-Large_image-EN.svg.png
20180173311 1483228800
+Wikipedia ES/Español (no pictures)
http://download.kiwix.org/zim/wikipedia_es_all_nopic.zim es Save
storage space with this text-only version of the entire Spanish Wikipedia for
exploring offline. NOPIC
https://upload.wikimedia.org/wikipedia/commons/thumb/3/39/Nomedia-Thumb-EN.svg/320px-Nomedia-Thumb-EN.svg.png
https://upload.wikimedia.org/wikipedia/commons/thumb/f/f5/Nomedia-Large_image-EN.svg/640px-Nomedia-Large_image-EN.svg.png
3818231307 1501545600
+Wikipedia FR/Français (no pictures)
http://download.kiwix.org/zim/wikipedia_fr_all_nopic.zim fr Save
storage space with this text-only version of the entire French Wikipedia for
exploring offline. NOPIC
https://upload.wikimedia.org/wikipedia/commons/thumb/3/39/Nomedia-Thumb-EN.svg/320px-Nomedia-Thumb-EN.svg.png
https://upload.wikimedia.org/wikipedia/commons/thumb/9/9b/Nomedia-Large_image-FR.svg/640px-Nomedia-Large_image-FR.svg.png
5186563119 1498867200
+Wikipedia HI/हिन्दी (no pictures)
http://download.kiwix.org/zim/wikipedia_hi_all_nopic.zim hi Save
storage space with this text-only version of the entire Wikipedia for exploring
offline. NOPIC
https://upload.wikimedia.org/wikipedia/commons/thumb/4/43/Nomedia-Thumb-HI.svg/320px-Nomedia-Thumb-HI.svg.png
https://upload.wikimedia.org/wikipedia/commons/thumb/f/f6/Nomedia-Large_image-HI.svg/640px-Nomedia-Large_image-HI.svg.png
240182202 1501545600
+Wikipedia ID/Bahasa Indonesia (no pictures)
http://download.kiwix.org/zim/wikipedia_id_all_nopic.zim id Save
storage space with this text-only version of the entire Bahasa Indonesian
Wikipedia for exploring offline. NOPIC
https://upload.wikimedia.org/wikipedia/commons/thumb/3/39/Nomedia-Thumb-EN.svg/320px-Nomedia-Thumb-EN.svg.png
https://upload.wikimedia.org/wikipedia/commons/thumb/f/f5/Nomedia-Large_image-EN.svg/640px-Nomedia-Large_image-EN.svg.png
786367466 1483228800
+Wikipedia IG/Igbo (no pictures)
http://download.kiwix.org/zim/wikipedia_ig_all_nopic.zim ig Save
storage space with this text-only version of the entire Igbo Wikipedia for
exploring offline. NOPIC
https://upload.wikimedia.org/wikipedia/commons/thumb/3/39/Nomedia-Thumb-EN.svg/320px-Nomedia-Thumb-EN.svg.png
https://upload.wikimedia.org/wikipedia/commons/thumb/f/f5/Nomedia-Large_image-EN.svg/640px-Nomedia-Large_image-EN.svg.png
746082 1501545600
+Wikipedia IT/Italiano (no pictures)
http://download.kiwix.org/zim/wikipedia_it_all_nopic.zim it Save
storage space with this text-only version of the entire Italian Wikipedia for
exploring offline. NOPIC
https://upload.wikimedia.org/wikipedia/commons/thumb/3/39/Nomedia-Thumb-EN.svg/320px-Nomedia-Thumb-EN.svg.png
https://upload.wikimedia.org/wikipedia/commons/thumb/f/f5/Nomedia-Large_image-EN.svg/640px-Nomedia-Large_image-EN.svg.png
3003432499 1483228800
+Wikipedia MR/मराठी (no pictures)
http://download.kiwix.org/zim/wikipedia_mr_all_nopic.zim mr Save
storage space with this text-only version of the entire Marathi Wikipedia for
exploring offline. NOPIC
https://upload.wikimedia.org/wikipedia/commons/thumb/3/39/Nomedia-Thumb-EN.svg/320px-Nomedia-Thumb-EN.svg.png
https://upload.wikimedia.org/wikipedia/commons/thumb/f/f5/Nomedia-Large_image-EN.svg/640px-Nomedia-Large_image-EN.svg.png
69213182 1501545600
+Wikipedia MY/မြန်မာဘာသာ (no pictures)
http://download.kiwix.org/zim/wikipedia_my_all_nopic.zim my Save
storage space with this text-only version of the entire Burmese Wikipedia for
exploring offline. NOPIC
https://upload.wikimedia.org/wikipedia/commons/thumb/2/26/Nomedia-Thumb-MY.svg/320px-Nomedia-Thumb-MY.svg.png
https://upload.wikimedia.org/wikipedia/commons/thumb/3/37/Nomedia-Large_image-MY.svg/640px-Nomedia-Large_image-MY.svg.png
44003832 1501545600
+Wikipedia PT/Português (no pictures)
http://download.kiwix.org/zim/wikipedia_pt_all_nopic.zim pt Save
storage space with this text-only version of the entire Portuguese Wikipedia
for exploring offline. NOPIC
https://upload.wikimedia.org/wikipedia/commons/thumb/3/39/Nomedia-Thumb-EN.svg/320px-Nomedia-Thumb-EN.svg.png
https://upload.wikimedia.org/wikipedia/commons/thumb/f/f5/Nomedia-Large_image-EN.svg/640px-Nomedia-Large_image-EN.svg.png
2023740572 1496275200
+Wikipedia RU/русский (no pictures)
http://download.kiwix.org/zim/wikipedia_ru_all_nopic.zim ru Save
storage space with this text-only version of the entire Russian Wikipedia for
exploring offline. NOPIC
https://upload.wikimedia.org/wikipedia/commons/thumb/8/80/Nomedia-Thumb-RU.svg/320px-Nomedia-Thumb-RU.svg.png
https://upload.wikimedia.org/wikipedia/commons/thumb/b/b5/Nomedia-Large_image-RU.svg/640px-Nomedia-Large_image-RU.svg.png
5257209573 1483228800
+Wikipedia TA/தமிழ் (no pictures)
http://download.kiwix.org/zim/wikipedia_ta_all_nopic.zim ta Save
storage space with this text-only version of the entire Tamil Wikipedia for
exploring offline. NOPIC
https://upload.wikimedia.org/wikipedia/commons/thumb/b/b4/Nomedia-Thumb-TA.svg/320px-Nomedia-Thumb-TA.svg.png
https://upload.wikimedia.org/wikipedia/commons/thumb/2/25/Nomedia-Large_image-TA.svg/640px-Nomedia-Large_image-TA.svg.png
263547159 1501545600
+Wikipedia TL/Tagalog (no pictures)
http://download.kiwix.org/zim/wikipedia_tl_all_nopic.zim tl Save
storage space with this text-only version of the entire Tagalog Wikipedia for
exploring offline. NOPIC
https://upload.wikimedia.org/wikipedia/commons/thumb/3/39/Nomedia-Thumb-EN.svg/320px-Nomedia-Thumb-EN.svg.png
https://upload.wikimedia.org/wikipedia/commons/thumb/f/f5/Nomedia-Large_image-EN.svg/640px-Nomedia-Large_image-EN.svg.png
66370271 1470009600
+Wikipedia TR/Türkçe (no pictures)
http://download.kiwix.org/zim/wikipedia_tr_all_nopic.zim tr Save
storage space with this text-only version of the entire Turkish Wikipedia for
exploring offline. NOPIC
https://upload.wikimedia.org/wikipedia/commons/thumb/e/e0/Nomedia-Thumb-TR.svg/320px-Nomedia-Thumb-TR.svg.png
https://upload.wikimedia.org/wikipedia/commons/thumb/b/bf/Nomedia-Large_image-TR.svg/640px-Nomedia-Large_image-TR.svg.png
741516920 1501545600
+Wikipedia YO/Yorùbá (no pictures)
http://download.kiwix.org/zim/wikipedia_yo_all_nopic.zim yo Save
storage space with this text-only version of the entire Yoruba Wikipedia for
exploring offline. NOPIC
https://upload.wikimedia.org/wikipedia/commons/thumb/3/39/Nomedia-Thumb-EN.svg/320px-Nomedia-Thumb-EN.svg.png
https://upload.wikimedia.org/wikipedia/commons/thumb/f/f5/Nomedia-Large_image-EN.svg/640px-Nomedia-Large_image-EN.svg.png
14427999 1470009600
+Wikipedia ZH/中文 (no pictures)
http://download.kiwix.org/zim/wikipedia_zh_all_nopic.zim zh Save
storage space with this text-only version of the entire Chinese Wikipedia for
exploring offline. NOPIC
https://upload.wikimedia.org/wikipedia/commons/thumb/d/d8/Nomedia-Thumb-ZH.svg/320px-Nomedia-Thumb-ZH.svg.png
https://upload.wikimedia.org/wikipedia/commons/thumb/f/f2/Nomedia-Large_image-ZH.svg/640px-Nomedia-Large_image-ZH.svg.png
3483076352 1483228800
+Wikipedia OR/ଓଡ଼ିଆ (no pictures)
http://download.kiwix.org/zim/wikipedia_or_all_nopic.zim or Save
storage space with this text-only version of the entire Odia Wikipedia for
exploring offline. NOPIC 21483082
1501545600
+Wikipedia FA/فارسی (no pictures)
http://download.kiwix.org/zim/wikipedia_fa_all_nopic.zim fa Save
storage space with this text-only version of the entire Persian Wikipedia for
exploring offline. NOPIC
https://upload.wikimedia.org/wikipedia/commons/thumb/e/e9/Nomedia-Thumb-FA.svg/320px-Nomedia-Thumb-FA.svg.png
https://upload.wikimedia.org/wikipedia/commons/thumb/8/86/Nomedia-Large_image-FA.svg/640px-Nomedia-Large_image-FA.svg.png
1477394793 1491004800
+English Wikipedia for Schools
http://download.kiwix.org/zim/wikipedia_en_for-schools.zim en This
selection of articles from English Wikipedia matches the UK National Curriculum
and can be used by school children around the world. The 2013 edition of
Wikipedia for Schools contains 6,000 articles comprising 26 million words, as
well as 50,000 images. Taking the UK National Curriculum as its starting point,
articles are organised by school subject, from Art and Citizenship, to
Geography and Mathematics. All pages were selected from the English Wikipedia
by staff and volunteers at SOS Children, before being checked to ensure
suitability for children, and any inappropriate content removed before release.
NOVID
https://upload.wikimedia.org/wikipedia/commons/thumb/d/d9/WikipediaForSchools-Thumb-EN.svg/320px-WikipediaForSchools-Thumb-EN.svg.png
https://upload.wikimedia.org/wikipedia/commons/thumb/4/4f/WikipediaForSchools-Large_image-EN.svg/640px-WikipediaForSchools-Large_image-EN.svg.png
2600274930 1356998400
+English Wikipedia Top 45,000
http://download.kiwix.org/zim/wikipedia_en_wp1-0.8.zim en A core subset
of articles from English Wikipedia, selected based on their importance and
quality. NOVID
https://upload.wikimedia.org/wikipedia/commons/thumb/b/b3/Wikipedia-logo-v2-en.svg/320px-Wikipedia-logo-v2-en.svg.png
https://upload.wikimedia.org/wikipedia/commons/thumb/b/b3/Wikipedia-logo-v2-en.svg/640px-Wikipedia-logo-v2-en.svg.png
5453656823 1485907200
\ No newline at end of file
diff --git a/app/src/main/java/org/wikipedia/offline/Compilation.java
b/app/src/main/java/org/wikipedia/offline/Compilation.java
index 561d4b4..698ba5e 100644
--- a/app/src/main/java/org/wikipedia/offline/Compilation.java
+++ b/app/src/main/java/org/wikipedia/offline/Compilation.java
@@ -16,7 +16,6 @@
import java.io.File;
import java.io.IOException;
import java.net.URLDecoder;
-import java.util.Arrays;
import java.util.Collections;
import java.util.List;
@@ -34,7 +33,7 @@
@Nullable private MediaContent media;
@Nullable private Image thumb;
@Nullable private Image featureImage;
- private int count;
+ private long count;
private long size; // bytes
private long timestamp;
@@ -43,7 +42,7 @@
@Nullable private transient ZimReader reader;
public enum MediaContent {
- ALL, IMAGES, NONE
+ ALL, NOVID, NOPIC
}
Compilation(@NonNull File file) throws IOException {
@@ -64,7 +63,7 @@
@SuppressWarnings("checkstyle:parameternumber")
Compilation(@NonNull String name, @NonNull Uri uri, @Nullable List<String>
langCodes,
@Nullable String summary, @Nullable String description,
@Nullable MediaContent media,
- @Nullable Image thumb, @Nullable Image featureImage, int
count, long size, long timestamp) {
+ @Nullable Image thumb, @Nullable Image featureImage, long
count, long size, long timestamp) {
this.name = name;
this.uri = uri;
this.langCodes = langCodes;
@@ -76,6 +75,20 @@
this.count = count;
this.size = size;
this.timestamp = timestamp;
+ }
+
+ Compilation(@NonNull String[] data) {
+ this.name = data[0];
+ this.uri = Uri.parse(data[1]);
+ this.langCodes = Collections.singletonList(data[2]);
+ this.summary = data[3];
+ this.description = data[4];
+ this.media = MediaContent.valueOf(data[5]);
+ this.thumb = new Image(Uri.parse(data[6]), 0, 0);
+ this.featureImage = new Image(Uri.parse(data[7]), 0, 0);
+ this.count = 0; // currently unused
+ this.size = Long.parseLong(data[9]);
+ this.timestamp = Long.parseLong(data[10]);
}
public void copyMetadataFrom(@NonNull Compilation other) {
@@ -192,7 +205,7 @@
return featureImage != null ? featureImage.uri() : null;
}
- public int count() {
+ public long count() {
return count;
}
@@ -250,10 +263,6 @@
private int width;
private int height;
- Image(@Nullable String uri, int width, int height) {
- this(Uri.parse(defaultString(uri)), width, height);
- }
-
Image(@NonNull Uri uri, int width, int height) {
this.uri = uri;
this.width = width;
@@ -271,68 +280,5 @@
public int height() {
return height;
}
- }
-
- // TODO: Below functions are for dev only, remove when finished!
- @SuppressWarnings("checkstyle:magicnumber")
- static List<Compilation> getMockInfoForTesting() {
- return Arrays.asList(
- new Compilation("Wikipedia (English) top 45000 articles, Feb
2017",
-
Uri.parse("https://download.kiwix.org/zim/wikipedia/wikipedia_en_wp1-0.8_2017-02.zim";),
- Collections.singletonList("en"),
- "",
- "Compilation of the top 45000 articles, by popularity,
from English Wikipedia.",
- Compilation.MediaContent.ALL,
- getThumbImage(),
- getFeatureImage(),
- 10000, 5453656823L, 1487065620),
- new Compilation("Wikipedia (English) top 45000 articles
without images, Feb 2017",
-
Uri.parse("https://download.kiwix.org/zim/wikipedia/wikipedia_en_wp1-0.8_nopic_2017-02.zim";),
- Collections.singletonList("en"),
- "",
- "Compilation of the top 45000 articles, by popularity,
from English Wikipedia. The articles in this compilation are text-only (no
images) to reduce the download size.",
- MediaContent.NONE,
- getThumbImage(),
- getFeatureImage(),
- 10000, 1400000000L, 1487065620),
- new Compilation("WikiProject Medicine (English), Jun 2017",
-
Uri.parse("https://download.kiwix.org/zim/wikipedia/wikipedia_en_medicine_novid_2017-06.zim";),
- Collections.singletonList("en"),
- "",
- "Compilation of all articles from WikiProject
Medicine, from English Wikipedia.",
- Compilation.MediaContent.IMAGES,
- new
Compilation.Image("https://upload.wikimedia.org/wikipedia/commons/thumb/d/d6/WHO_Rod.svg/125px-WHO_Rod.svg.png";,
125, 292),
- new
Compilation.Image("https://upload.wikimedia.org/wikipedia/commons/thumb/2/22/Da_Vinci_Vitruve_Luc_Viatour.jpg/441px-Da_Vinci_Vitruve_Luc_Viatour.jpg";,
441, 600),
- 10000, 1175000000L, 1487065620),
- new Compilation("हिन्दी विकिपीडिया (Hindi Wikipedia), Mar
2017",
-
Uri.parse("https://download.kiwix.org/zim/wikipedia/wikipedia_hi_all_2017-03.zim";),
- Collections.singletonList("hi"),
- "",
- "Compilation of all articles from Hindi Wikipedia.",
- MediaContent.IMAGES,
- new
Compilation.Image("https://upload.wikimedia.org/wikipedia/commons/thumb/b/b6/Wikipedia-logo-v2-hi.svg/209px-Wikipedia-logo-v2-hi.svg.png";,
209, 240),
- new
Compilation.Image("https://upload.wikimedia.org/wikipedia/commons/thumb/b/b6/Wikipedia-logo-v2-hi.svg/669px-Wikipedia-logo-v2-hi.svg.png";,
669, 768),
- 10000, 847000000L, 1487065620),
- new Compilation("Wikipedia Uganda (English) test compilation,
Sep 2014",
-
Uri.parse("https://download.kiwix.org/zim/wikipedia/wikipedia_en_uganda_09_2014.zim";),
- Collections.singletonList("en"),
- "",
- "Test compilation of Wikipedia articles related to
Uganda.",
- MediaContent.IMAGES,
- getThumbImage(),
- getFeatureImage(),
- 10000, 20000000L, 1487065620)
-
- );
- }
-
- @SuppressWarnings("checkstyle:magicnumber")
- private static Compilation.Image getFeatureImage() {
- return new
Compilation.Image("https://upload.wikimedia.org/wikipedia/commons/thumb/b/b3/Wikipedia-logo-v2-en.svg/200px-Wikipedia-logo-v2-en.svg.png";,
640, 480);
- }
-
- @SuppressWarnings("checkstyle:magicnumber")
- private static Compilation.Image getThumbImage() {
- return new
Compilation.Image("https://upload.wikimedia.org/wikipedia/commons/thumb/b/b3/Wikipedia-logo-v2-en.svg/200px-Wikipedia-logo-v2-en.svg.png";,
320, 240);
}
}
diff --git a/app/src/main/java/org/wikipedia/offline/CompilationClient.java
b/app/src/main/java/org/wikipedia/offline/CompilationClient.java
index 54c0868..2ff473b 100644
--- a/app/src/main/java/org/wikipedia/offline/CompilationClient.java
+++ b/app/src/main/java/org/wikipedia/offline/CompilationClient.java
@@ -4,13 +4,16 @@
import android.support.annotation.Nullable;
import android.support.annotation.VisibleForTesting;
-import org.wikipedia.dataclient.WikiSite;
+import org.apache.commons.io.IOUtils;
+import org.apache.commons.io.LineIterator;
+import org.wikipedia.WikipediaApp;
import org.wikipedia.json.annotations.Required;
-import org.wikipedia.settings.Prefs;
+import org.wikipedia.util.log.L;
import java.io.IOException;
+import java.io.InputStream;
+import java.util.ArrayList;
import java.util.List;
-import java.util.Locale;
import retrofit2.Call;
import retrofit2.Response;
@@ -27,18 +30,14 @@
@Nullable private Call<CallbackAdapter.CompilationResponse> call;
- // todo: according to Jake Wharton, Retrofit service objects are very
expensive and should only
- // be created once for the application and then cached for reuse. Figure
out how to make these
- // WikiSite-independent, and create once.
- // https://stackoverflow.com/a/20627010/5520737
- public void request(@NonNull WikiSite wiki, @NonNull Callback cb) {
- cb.success(Compilation.getMockInfoForTesting()); // returning mock
info for dev/testing
-
- /*cancel();
- Retrofit retrofit = RetrofitFactory.newInstance(getEndpoint(wiki),
wiki);
- Service service = retrofit.create(Service.class);
- call = request(service);
- call.enqueue(new CallbackAdapter(cb));*/
+ // TODO: replace static file with dataclient when service is set up
+ public void request(@NonNull Callback cb) {
+ try {
+ cb.success(getRemoteZimInfo());
+ } catch (IOException e) {
+ cb.error(e);
+ L.e(e);
+ }
}
public void cancel() {
@@ -97,7 +96,19 @@
Call<CallbackAdapter.CompilationResponse> get();
}
- private String getEndpoint(WikiSite wiki) {
- return String.format(Locale.ROOT, Prefs.getRestbaseUriFormat(),
wiki.scheme(), wiki.authority());
+ @NonNull
+ private List<Compilation> getRemoteZimInfo() throws IOException {
+ List<Compilation> result = new ArrayList<>();
+ LineIterator i = IOUtils.lineIterator(openAssetFile("zims.tsv"),
"UTF-8");
+ while (i.hasNext()) {
+ result.add(new Compilation(i.nextLine().split("\t")));
+ }
+ i.close();
+ return result;
+ }
+
+ @NonNull
+ private static InputStream openAssetFile(String path) throws IOException {
+ return WikipediaApp.getInstance().getAssets().open(path);
}
}
diff --git
a/app/src/main/java/org/wikipedia/offline/CompilationDetailFragment.java
b/app/src/main/java/org/wikipedia/offline/CompilationDetailFragment.java
index 714b7a1..4af4c76 100644
--- a/app/src/main/java/org/wikipedia/offline/CompilationDetailFragment.java
+++ b/app/src/main/java/org/wikipedia/offline/CompilationDetailFragment.java
@@ -83,8 +83,8 @@
nameView.setText(compilation.name());
dateSizeView.setText(String.format(getString(R.string.offline_compilation_detail_date_size),
getShortDateString(compilation.timestamp()),
bytesToGB(compilation.size())));
- summaryView.setText(compilation.description());
- // descriptionView.setText(""); // TODO: update this to use
description() if a "summary" is added to ZIMs
+ summaryView.setText(compilation.summary());
+ descriptionView.setText(compilation.description());
downloadButton.setText(String.format(getString(R.string.offline_compilation_detail_button_download),
bytesToGB(compilation.size())));
diff --git
a/app/src/main/java/org/wikipedia/offline/RemoteCompilationsFragment.java
b/app/src/main/java/org/wikipedia/offline/RemoteCompilationsFragment.java
index d2fe25b..511a571 100644
--- a/app/src/main/java/org/wikipedia/offline/RemoteCompilationsFragment.java
+++ b/app/src/main/java/org/wikipedia/offline/RemoteCompilationsFragment.java
@@ -141,7 +141,7 @@
private void beginUpdate() {
updating = true;
lastError = null;
- new
CompilationClient().request(WikipediaApp.getInstance().getWikiSite(),
compilationCallback);
+ new CompilationClient().request(compilationCallback);
updateEmptyState();
}
--
To view, visit https://gerrit.wikimedia.org/r/373985
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I657e9eb37c5ccd2b3ca8ea994e57f838a4441edf
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Mholloway <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
![https://upload.wikimedia.org/wikipedia/commons/thumb/d/d6/WHO_Rod.svg/125px-WHO_Rod.svg.png"](https://upload.wikimedia.org/wikipedia/commons/thumb/d/d6/WHO_Rod.svg/125px-WHO_Rod.svg.png"){kind=link}
![https://upload.wikimedia.org/wikipedia/commons/thumb/2/22/Da_Vinci_Vitruve_Luc_Viatour.jpg/441px-Da_Vinci_Vitruve_Luc_Viatour.jpg"](https://upload.wikimedia.org/wikipedia/commons/thumb/2/22/Da_Vinci_Vitruve_Luc_Viatour.jpg/441px-Da_Vinci_Vitruve_Luc_Viatour.jpg"){kind=link}
![https://upload.wikimedia.org/wikipedia/commons/thumb/b/b6/Wikipedia-logo-v2-hi.svg/209px-Wikipedia-logo-v2-hi.svg.png"](https://upload.wikimedia.org/wikipedia/commons/thumb/b/b6/Wikipedia-logo-v2-hi.svg/209px-Wikipedia-logo-v2-hi.svg.png"){kind=link}
![https://upload.wikimedia.org/wikipedia/commons/thumb/b/b6/Wikipedia-logo-v2-hi.svg/669px-Wikipedia-logo-v2-hi.svg.png"](https://upload.wikimedia.org/wikipedia/commons/thumb/b/b6/Wikipedia-logo-v2-hi.svg/669px-Wikipedia-logo-v2-hi.svg.png"){kind=link}
![https://upload.wikimedia.org/wikipedia/commons/thumb/b/b3/Wikipedia-logo-v2-en.svg/200px-Wikipedia-logo-v2-en.svg.png"](https://upload.wikimedia.org/wikipedia/commons/thumb/b/b3/Wikipedia-logo-v2-en.svg/200px-Wikipedia-logo-v2-en.svg.png"){kind=link}