fix copy-to-datastore script

add alice in wonderland (epub)
switch to master mirror for now
add recordmydesktop to allow screencasts

4 files changed, 30 insertions, 5 deletions

diff --git a/copy-to-datastore.py b/copy-to-datastore.py
index 232779d..b140c72 100755
--- a/copy-to-datastore.py
+++ b/copy-to-datastore.py
@@ -41,7 +41,7 @@ def create_entry(filename, meta):
     path = os.path.join(DS_PATH, uid[:2])
     if not os.path.isdir(path):
         os.mkdir(path)
-    path = os.path.join((path, uid))
+    path = os.path.join(path, uid)
     os.mkdir(path)
 
     shutil.copyfile(filename, os.path.join(path, 'data'))
@@ -67,6 +67,13 @@ def create_entry(filename, meta):
     create_content_file(metadata_path, 'tags', tags)
 
 files = (
+    ("pg11.epub",
+     {"title": "Alice's Adventures in Wonderland (EPUB)",
+      "mime_type": "application/epub+zip",
+      "description": "Alice's Adventures in Wonderland (1865) is a novel written by English author Charles Lutwidge Dodgson under the pseudonym Lewis Carroll. It tells the story of a girl named Alice who falls down a rabbit hole into a fantasy world populated by peculiar and anthropomorphic creatures.",
+      "tags": "Alice Adventures Wonderland Novel English",
+      }),
+
     ("south_america.pdf",
      {"title": "South America World Factbook Map (PDF)",
       "mime_type": "application/pdf",
@@ -81,6 +88,7 @@ files = (
       "description": "Africa is the second-largest and second most-populous continent, after Asia. With a billion people (as of 2009) in 61 territories, it accounts for about 14.8% of the World's human population. The continent is surrounded by the Mediterranean Sea to the north, the Suez Canal and the Red Sea to the northeast, the Indian Ocean to the southeast, and the Atlantic Ocean to the west.",
       "tags": "MALI CHAD FASO IRAN TOGO SOUTH BOTSWANA LESOTHO SWAZILAND MADAGASCAR MOZAMBIQUE ZAMBIA ANGOLA TANZANIA KENYA ETHIOPIA EGYPT ARABIA SAUDI MOROCCO MAURITANIA CENTRAL AFRICAN REPUBLIC CAPE VERDE THE GAMBIA SENEGAL NIGERIA SAO TOME AND PRINCIPE GABON TURKEY SPAIN CAMEROON UGANDA RWANDA BURUNDI MALAWI DJIBOUTI ERITREA SOMALIA GUINEA-BISSAU GUINEA SIERRA LEONE GHANA BENIN BURKINA EQUATORIAL GUINEA CÔTE D'IVOIRE ALGERIA SUDAN LIBYA NIGER FRANCE GERMANY POLAND ITALY GREECE UKRAINE U.K. IRE. RUSSIA TURKMENISTAN SYRIA UZBEKISTAN ROM. BELARUS AZER. LEB. QATAR KUWAIT JORDAN ISRAEL CYPRUS U.A.E MAURITIUS Western Sahara ALB. AUS. TUNISIA MALTA ZIMBABWE COMOROS BULG. SLO. CRO. SER. MONT. MACE. HUNG. CZ. REP. SLOV. NETH. BEL. LUX. SWITZ. MOL. BOS. & HER. AND. ARM. GEO. IRAQ BAHR. NAMIBIA YEMEN OMAN ANGOLA Cabinda YEMEN Sicily LIBERIA boundary Socotra SEYCHELLES PORTUGAL Admin. EQUA. GUI. AFG. Sardinia Corsica DEM. REP. OF THE CONGO KAZAKHSTAN St. Helena Ascension St. Helena AFRICA KOS. Strait of Gibraltar North Atlantic Ocean Mediterranean Sea Black Sea Sea of Azov Danube Nile Red Sea Volga Persian Gulf South Atlantic Ocean Gulf of Guinea Arabian Sea Indian Ocean Gulf of Aden Lake Victoria Lake Nyasa Lake Tanganyika Blue Nile White Nile Congo Benue Volta Niger Indian Ocean Mozambique Channel Zambezi Oran Aral Caspian Sea Gulf Sea AFRICA Jerusalem Berlin Warsaw Minsk Kyiv Prague Amsterdam London Dublin Brussels Vienna Budapest Bratislava Ljubljana Zagreb Belgrade Chisinau Bucharest Sofia Skopje Sarajevo Athens Valletta Tunis Algiers Tripoli Cairo Beirut Nicosia Damascus Amman Baghdad Riyadh Bern Rabat Tashkent Ashgabat Baku Doha Muscat Manama Kuwait Sanaa Asmara Abu Dhabi Djibouti Mogadishu Nairobi Ababa Addis N'Djamena Bangui Kinshasa Yaoundé Malabo Lomé São Tomé Brazzaville Libreville Niamey Abuja Novo Porto-Victoria Moroni St. Denis Port Louis Antananarivo Maputo Pretoria Maseru Mbabane Gaborone Windhoek Luanda Lusaka Harare Dar es Salaam Laayoune El Aaiún Nouakchott Praia Dakar Banjul Bamako Bissau Ouagadougou Conakry Freetown Accra Island Glorioso Islands Mayotte Bassas da India Juan de Nova Island Tromelin Island Oran Constantine Fès Casablanca Marrakech Banghazi Alexandria Kano Ogbomoso Ibadan Lagos Douala Pointe-Noire Kisangani Mbuji-Mayi Lubumbashi Bukavu Kitwe Durban Johannesburg Port Elizabeth Cape Town Beira Mombasa Hargeysa Omdurman Moundou Lubango Namibe Walvis Bay Medina Mecca Jiddah Port Sudan Aswan Al Jawf Tombouctou Blantyre Naples Milan Mashhad Esfahan Ankara Adana Izmir Istanbul Tehran Odesa Rostov Lisbon Rome Barcelona Marseille Tabriz Abidjan Yamoussoukro Monrovia Ponta Funchal Las Palmas Delgada Yerevan Aleppo Shiraz Dodoma Zanzibar Al Jizah AZORES MADEIRA ISLANDS CANARY ISLANDS Nouadhibou Mahajanga Toamasina Bandar 'Abbas Juba Zinder Agadez Annobón Tbilisi Reunion Europa Paris Madrid Khartoum Kampala Kigali Bujumbura Lilongwe Kananga Tirana Podgorica Cidade de Nacala Pristina SAHARA Mt. Kilimanjaro Lac'Assal NAMIB DESERT KALAHARI DESERT CONGO BASIN GREAT RIFT VALLEY",
       }),
+
     ("asia.pdf",
      {"title": "Asia World Factbook Map (PDF)",
       "mime_type": "application/pdf",
diff --git a/soas-aslo-and-content.ks b/soas-aslo-and-content.ks
index 8efbcaf..fcebfcb 100644
--- a/soas-aslo-and-content.ks
+++ b/soas-aslo-and-content.ks
@@ -1,4 +1,3 @@
-
 %post --nochroot
 
 # activities.sugarlabs.org (ASLO) installed-packages
@@ -59,6 +58,9 @@ cd $BUNDLES_DIR
 CACHE_DIR=$WD/../cache/aslo
 mkdir -p $CACHE_DIR
 
+EPUB_DIR=$WD/../cache/epub
+mkdir -p $EPUB_DIR
+
 ASLO_SP='0.86'
 ASLO_URL='http://activities.sugarlabs.org/services/update-aslo.php'
 ASLO_LINK='.//{http://www.mozilla.org/2004/em-rdf#}updateLink'
@@ -79,7 +81,6 @@ for bundle_id in $ASLO ; do
 done
 
 # pull sample content for the journal
-PDFS=south_america.pdf
 PDFS="$PDFS africa.pdf"
 PDFS="$PDFS asia.pdf"
 PDFS="$PDFS central_america.pdf"
@@ -99,6 +100,19 @@ for pdf in $PDFS ; do
   cp -p $bundle $BUNDLES_DIR
 done
 
+# pull e-books for inclusion
+EPUB="11" # Alice in Wonderland
+
+for epub in $EPUB ; do
+  url=http://www.gutenberg.org/cache/epub/$epub/pg$epub.epub
+  remote_file=$(basename $(curl -4 -s -L -w %{url_effective} -I $url | tail -1))
+  bundle=$EPUB_DIR/$remote_file
+  if [ ! -f $bundle ] ; then
+     curl -s -4 -L $url > $bundle
+  fi
+  cp -p $bundle $BUNDLES_DIR
+done
+
 # get the script to install the activities
 cp -p $WD/../install-activity.py .
 chmod a+x ./install-activity.py
diff --git a/soas-base.ks b/soas-base.ks
index fde05fe..ca2290e 100644
--- a/soas-base.ks
+++ b/soas-base.ks
@@ -10,9 +10,9 @@ part / --size 2048 --fstype ext4
 services --enabled=abrt,NetworkManager --disabled=atd,auditd,cups,crond,dnsmasq,ip6tables,iptables,irda,mdmonitor,netfs,network,nfs,nfslock,nscd,portreserve,rpcbind,rpcgssd,rpcidmapd,sshd
 
 # we're on Rawhide now again
-repo --name=rawhide --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide&arch=i386 --excludepkgs=kdebase-workspace,plymouth,plymouth-*,PolicyKit-kde
+# repo --name=rawhide --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide&arch=i386 --excludepkgs=kdebase-workspace,plymouth,plymouth-*,PolicyKit-kde
 # use this in case the mirrors are out of date
-# repo --name=rawhide --baseurl=http://download.fedora.redhat.com/pub/fedora/linux/development/i386/os/ --excludepkgs=kdebase-workspace,plymouth,plymouth-*,PolicyKit-kde
+repo --name=rawhide --baseurl=http://download.fedora.redhat.com/pub/fedora/linux/development/i386/os/ --excludepkgs=kdebase-workspace,plymouth,plymouth-*,PolicyKit-kde
 
 %packages
 @base
diff --git a/soas-sugar.ks b/soas-sugar.ks
index b40f1e3..3cb81c2 100644
--- a/soas-sugar.ks
+++ b/soas-sugar.ks
@@ -33,6 +33,9 @@ system-config-firewall-base
 # multimedia implementations
 gnash-plugin
 
+# screencasts are great
+gtk-recordmydesktop
+
 # pull plymouth theme
 plymouth-theme-soas