[Surfraw-commits] [SCM] surfraw - a fast unix command line interface to WWW branch, master, updated. surfraw_2-2-5_1-110-gc9f9e9e
Ian Beckwith
ianb at erislabs.net
Wed Apr 21 19:34:09 UTC 2010
The following commit has been merged in the master branch:
commit 5b8e2a24fc791ac4921172a5ae37b20411190b4e
Author: Ian Beckwith <ianb at erislabs.net>
Date: Wed Apr 21 18:36:13 2010 +0100
New elvi: jamendo. Thanks to Simone Fittabile
diff --git a/AUTHORS b/AUTHORS
index 405f9a7..0f6e808 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -72,8 +72,9 @@ Sadako <Sadako at hamiltonshells.ca>
tczy <cy at wre.ath.cx>
elvi: bing
-S. <fittabile at lifegate.it>
- elvi: acronym, gcache
+Simone Fittabile <fittabile at lifegate.it>
+ elvi: acronym, gcache, jamendo
+ plus patches.
Micah Anderson <micah at debian.org>
various patches
diff --git a/ChangeLog b/ChangeLog
index 5285ede..a238d64 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-04-21 Ian Beckwith <ianb at erislabs.net>
+
+ * New elvi: jamendo - Search Jamendo: free music with Creative
+ Commons licenses (www.jamendo.com). Thanks to Simone Fittabile.
+
2010-04-19 James Rowe <jnrowe at gmail.com>
* genpkg: removed, use genportage.
diff --git a/NEWS b/NEWS
index b4a0ffa..074fff5 100644
--- a/NEWS
+++ b/NEWS
@@ -26,6 +26,8 @@ Fri Apr 16 18:53:55 BST 2010 - surfraw 2.2.7
+ by Ian Beckwith:
* duckduckgo: Search the web via duckduckgo.com.
* scroogle: Search Google anonymously via www.scroogle.org.
+ + by Simone Fittabile:
+ * jamendo: Search Jamendo: free music with Creative Commons licenses
* Removed elvi: genpkg (use genportage instead).
* Fixed elvi:
+ cnn
diff --git a/README b/README
index 580264a..65a191e 100644
--- a/README
+++ b/README
@@ -210,6 +210,7 @@ gutenberg -- Search for books on Project Gutenberg (gutenberg.org)
happypenguin -- Search the Linux Game Tome (www.happypenguin.org)
imdb -- Search the Internet Movie Database (www.imdb.com)
ixquick -- Search the web using ixquick (www.ixquick.com)
+jamendo -- Search Jamendo: free music with Creative Commons licenses (www.jamendo.com)
javasun -- Search Java API docs (java.sun.com)
l1sp -- Search lisp documentation
lastfm -- Search last.fm
diff --git a/elvi/Makefile.am b/elvi/Makefile.am
index fff711c..4d57a6e 100644
--- a/elvi/Makefile.am
+++ b/elvi/Makefile.am
@@ -59,6 +59,7 @@ dist_elvi_SCRIPTS = \
happypenguin \
imdb \
ixquick \
+ jamendo \
javasun \
l1sp \
lastfm \
diff --git a/elvi/jamendo b/elvi/jamendo
new file mode 100755
index 0000000..f8b11cd
--- /dev/null
+++ b/elvi/jamendo
@@ -0,0 +1,91 @@
+#!/bin/sh
+# $Id$
+# elvis: jamendo -- Search Jamendo: free music with Creative Commons licenses (www.jamendo.com)
+. surfraw || exit 1
+
+
+w3_usage_hook () {
+ cat <<EOF
+Usage: $w3_argv0 [options] [search words]...
+Description:
+ Surfraw search the web using Jamendo: free music with Creative Commons licenses (www.jamendo.com)
+Local options:
+ -t= | -type= Type of search (Default All types)
+ artist Artists
+ album Albums
+ xartist External artists
+ lyrics Lyrics
+ user Members
+ tag Tags
+ playlist Playlists
+
+
+ Environment: SURFRAW_jamendo_results
+
+ -l= | -lang= Search with this l10n
+ en|english
+ fr|french
+ de|german
+ it|italian
+ pt|portuguese
+ pl|polish
+ ru|russian
+ es|spanish
+ Default: English
+ Environment: SURFRAW_jamendo_lang, SURFRAW_lang
+EOF
+ w3_global_usage
+}
+
+w3_parse_option_hook () {
+ opt="$1"
+ optarg="$2"
+ case "$opt" in
+ -t=*|-type=*) setopt SURFRAW_jamendo_type $optarg ;;
+ -l=*|-lang=*) setopt SURFRAW_jamendo_lang $optarg ;;
+ *) return 1 ;;
+ esac
+ return 0
+}
+
+w3_config
+w3_parse_args "$@"
+# w3_args now contains a list of arguments
+
+
+# Use SURFRAW_lang if present
+if [ -z $SURFRAW_jamendo_lang ]; then
+ SURFRAW_jamendo_lang="$SURFRAW_lang";
+fi
+
+
+if test -z "$w3_args"; then
+
+
+ w3_browse_url "http://www.jamendo.com/${SURFRAW_jamendo_lang}/about"
+else
+ case "$SURFRAW_jamendo_lang" in
+ en|english) setopt SURFRAW_jamendo_lang en ;;
+ fr|french) setopt SURFRAW_jamendo_lang fr ;;
+ de|german) setopt SURFRAW_jamendo_lang de ;;
+ it|italian) setopt SURFRAW_jamendo_lang it ;;
+ pt|portuguese) setopt SURFRAW_jamendo_lang br;;
+ pl|polish) setopt SURFRAW_jamendo_lang pl ;;
+ ru|russian) setopt SURFRAW_jamendo_lang ru ;;
+ es|spanish) setopt SURFRAW_jamendo_lang es ;;
+ *) setopt SURFRAW_jamendo_lang en ;;
+ esac
+ case "$SURFRAW_jamendo_type" in
+ artist) ;;
+ album) ;;
+ xartist) ;;
+ lyrics) ;;
+ user) ;;
+ tag) ;;
+ playlist) ;;
+ *) setopt SURFRAW_jamendo_type "" ;;
+ esac
+ escaped_args=`w3_url_of_arg $w3_args`
+ w3_browse_url "http://www.jamendo.com/${SURFRAW_jamendo_lang}/search/${SURFRAW_jamendo_type}/search?search_string=${escaped_args}"
+
+fi
diff --git a/links.IN b/links.IN
index 485e0c8..341e312 100644
--- a/links.IN
+++ b/links.IN
@@ -55,6 +55,7 @@ elvi.1sr.gz @mandir@/man1/gutenberg.1sr.gz
elvi.1sr.gz @mandir@/man1/happypenguin.1sr.gz
elvi.1sr.gz @mandir@/man1/imdb.1sr.gz
elvi.1sr.gz @mandir@/man1/ixquick.1sr.gz
+elvi.1sr.gz @mandir@/man1/jamendo.1sr.gz
elvi.1sr.gz @mandir@/man1/javasun.1sr.gz
elvi.1sr.gz @mandir@/man1/lastfm.1sr.gz
elvi.1sr.gz @mandir@/man1/leodict.1sr.gz
diff --git a/test/Makefile.am b/test/Makefile.am
index be7b63b..0076d90 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -11,17 +11,17 @@ EXTRA_DIST = runtests elviwithouttests README COOKIES W.test \
finkpkg.test foldoc.test freebsd.test freedb.test \
freshmeat.test fsfdir.test gcache.test genbugs.test \
genportage.test google.test gutenberg.test happypenguin.test \
- imdb.test ixquick.test javasun.test lastfm.test leodict.test \
- l1sp.test lsm.test macports.test mathworld.test mininova.test \
- musicbrainz.test netbsd.test ntrs.test openbsd.test \
- opensearch.test piratebay.test port.test pgpkeys.test \
- pubmed.test rae.test rfc.test rhyme.test rpmsearch.test \
- scholar.test scicom.test scpan.test scroogle.test slashdot.test \
- slinuxdoc.test sourceforge.test springer.test stockquote.test \
- sunonesearch.test thesaurus.test translate.test urban.test \
- w3css.test w3html.test w3link.test w3rdf.test wayback.test \
- webster.test wetandwild.test wikipedia.test woffle.test \
- yahoo.test youtube.test yubnub.test
+ imdb.test ixquick.test jamendo.test javasun.test lastfm.test \
+ leodict.test l1sp.test lsm.test macports.test mathworld.test \
+ mininova.test musicbrainz.test netbsd.test ntrs.test \
+ openbsd.test opensearch.test piratebay.test port.test \
+ pgpkeys.test pubmed.test rae.test rfc.test rhyme.test \
+ rpmsearch.test scholar.test scicom.test scpan.test \
+ scroogle.test slashdot.test slinuxdoc.test sourceforge.test \
+ springer.test stockquote.test sunonesearch.test thesaurus.test \
+ translate.test urban.test w3css.test w3html.test w3link.test \
+ w3rdf.test wayback.test webster.test wetandwild.test \
+ wikipedia.test woffle.test yahoo.test youtube.test yubnub.test
test:
./runtests
diff --git a/test/jamendo.test b/test/jamendo.test
new file mode 100644
index 0000000..cd8704f
--- /dev/null
+++ b/test/jamendo.test
@@ -0,0 +1,2 @@
+jamendo helios salah
+Meditative Synestetik
--
surfraw - a fast unix command line interface to WWW
More information about the Surfraw-commits
mailing list