diff --new-file --recursive --suppress-common-lines --exclude changes.txt --exclude diff.txt releases/unplug-2.028/source/chrome/content/common.js releases/unplug-2.029/source/chrome/content/common.js
135c135
< 	version  : 2.028,
---
> 	version  : 2.029,
139c139
< 	revision : 201007302040,
---
> 	revision : 201008090205,
diff --new-file --recursive --suppress-common-lines --exclude changes.txt --exclude diff.txt releases/unplug-2.028/source/chrome/content/display/pop/pop.js releases/unplug-2.029/source/chrome/content/display/pop/pop.js
77a78
> 			var searchbar = document.getElementById("search_progress");
79,82c80,82
< 				with (document.getElementById("search_progress")) {
< 					mode = "determined";
< 					value = "100";
< 				}
---
> 				searchbar.mode = "determined";
> 				searchbar.value = "100";
> 				
94,95c94,98
< 				with (document.getElementById("search_progress")) {
< 					mode = "undetermined";
---
> 				if (statusinfo.percent == 0 || statusinfo.percent == 100) {
> 					searchbar.mode = "undetermined";
> 				} else {
> 					searchbar.mode = "determined";
> 					searchbar.value = statusinfo.percent;
384c387
< 				var file = UnPlug2SearchPage._save_as_box(res.details.description || res.details.name, res.details.file_ext);
---
> 				var file = UnPlug2SearchPage._save_as_box(res.details.name, res.details.file_ext);
diff --new-file --recursive --suppress-common-lines --exclude changes.txt --exclude diff.txt releases/unplug-2.028/source/chrome/content/rules.xml releases/unplug-2.029/source/chrome/content/rules.xml
50a51
> 		<priority level="low">cpro.baidu.com</priority>
51a53,59
> 	<!--
> 		First, grab the original page title, so we know what to save it as
> 	-->
> 	<optional_element ref="origtitle" tagname="title" require_attrs="innerHTML" />
> 	<!--
> 		Now the actual rules
> 	-->
55c63
< 			<media url="${flvre.1}" certainty="low" />
---
> 			<media url="${flvre.1}" certainty="low" title="${origtitle.innerHTML}" type="flv" />
64c72
< 				<media url="${flvurl.1}" />
---
> 				<media url="${flvurl.1}" title="${origtitle.innerHTML}" type="flv" />
68c76
< 	<rule>
---
> 	<rule id="joy69.com">
74,76c82,86
< 				<if_re ref="content"> (http://[^"]+\.flv[^"]*)" </if_re>
< 				<if_re ref="poster"> &lt;poster url="([^"]+jpg)" </if_re>
< 				<media url="${content.1}" thumbnail="${poster.1}" />
---
> 				<!-- content like: <media:content url="[filename]?start=[seek],http://media.joy69.com/.....flv" duration="185" lang="en"> -->
> 				<if_re ref="content" re="(http://[^&quot;]+\.flv[^&quot;]*)&quot;" />
> 				<optional_element ref="poster" tagname="media:thumbnail" require_attrs="innerHTML" />
> 				<optional_element ref="media_title" tagname="media:title" require_attrs="innerHTML" />
> 				<media url="${content.1}" thumbnail="${poster.innerHTML}" title="${either:media_title.innerHTML:origtitle.innerHTML}" type="flv" />
80,84d89
< 	<rule id="supernovatube.com">
< 		<if_url host="supernovatube.com" />
< 		<if_re ref="param" tagname="script"> so\.addVariable\("file",\s*"(http://[^"]+)"\) </if_re>
< 		<media url="${param.1}" type="flv" />
< 	</rule>
85a91,92
> 		<!-- TODO veoh support is broken -->
> 		<if_false />
101,110d107
< 		<if_url host="tudou.com" />
< 		<if_re ref="iid" tagname="script"> iid\s*=\s*(\d+) </if_re>
< 		<!-- nocatch is a random number, i think. xml gives a list of flv files from different servers. -->
< 		<download url="http://v2.tudou.com/v2/cdn?id=${iid.1}&amp;noCatch=0000&amp;safekey=IAlsoNeverKnow">
< 			<each_element ref="f" tagname="f" require_attrs="innerHTML">
< 				<media url="${f.innerHTML}" type="flv" />
< 			</each_element>
< 		</download>
< 	</rule>
< 	<rule id="playlist..tudou.com">
112,128c109,136
< 		<!-- nocatch is a random number, i think. xml gives a list of flv files from different servers. -->
< 		<download url="http://v2.tudou.com/v2/cdn?id=${qparam:iid:url.url}&amp;noCatch=0000&amp;safekey=IAlsoNeverKnow">
< 			<each_element ref="f" tagname="f" require_attrs="innerHTML">
< 				<media url="${f.innerHTML}" type="flv" />
< 			</each_element>
< 		</download>
< 	</rule>
< 	<rule id="hd.tudou.com">
< 		<if_url host="tudou.com" />
< 		<if_re ref="iid" tagname="script"> iid\s*:\s*&quot;(\d+)&quot; </if_re>
< 		<optional_re ref="title" tagname="script"> title\s*:\s*&quot;(.*?)&quot; </optional_re>
< 		<!-- nocatch is a random number, i think. xml gives a list of flv files from different servers. -->
< 		<download url="http://v2.tudou.com/v2/kili?id=${iid.1}&amp;safekey=YouNeverKnowThat&amp;noCatch=0000">
< 			<each_element ref="f" tagname="f" require_attrs="innerHTML">
< 				<media url="${f.innerHTML}" type="flv" description="${translate:hd_quality} ${optional:title.1}" />
< 			</each_element>
< 		</download>
---
> 		<optional_re ref="vc_title" re="&lt;span id=&quot;vcate_title&quot;&gt;(.*)&lt;/span&gt;" />
> 		<optional_re ref="thumb" re="&lt;div class=&quot;summary&quot;&gt;&lt;span class=&quot;s_pic&quot;&gt;(http://[^&lt;&gt;]+jpg)&lt;/span&gt;" />
> 		<rule id="tudou-single">
> 			<if_re ref="iid" tagname="script"> iid\s*=\s*(\d+) </if_re>
> 			<!-- nocatch is a random number, i think. xml gives a list of the same flv file on different mirrors. -->
> 			<download url="http://v2.tudou.com/v2/cdn?id=${iid.1}&amp;noCatch=0000&amp;safekey=IAlsoNeverKnow">
> 				<each_element ref="f" tagname="f" require_attrs="innerHTML">
> 					<media url="${f.innerHTML}" type="flv" mediaid="toudu-${iid.1}" quality="mid" title="${either:vc_title.1:origtitle.innerHTML}" thumbnail="${thumb.1}" />
> 				</each_element>
> 			</download>
> 		</rule>
> 		<rule id="tudou.com-playlist">
> 			<download url="http://v2.tudou.com/v2/cdn?id=${qparam:iid:url.url}&amp;noCatch=0000&amp;safekey=IAlsoNeverKnow">
> 				<each_element ref="f" tagname="f" require_attrs="innerHTML">
> 					<media url="${f.innerHTML}" type="flv" mediaid="toudu-${qparam:iid:url.url}" quality="mid" title="${either:vc_title.1:origtitle.innerHTML}" thumbnail="${thumb.1}" />
> 				</each_element>
> 			</download>
> 		</rule>
> 		<rule id="hd.tudou.com">
> 			<if_url host="hd.tudou.com" />
> 			<if_re ref="iid" tagname="script"> iid\s*:\s*&quot;(\d+)&quot; </if_re>
> 			<optional_re ref="title" tagname="script"> title\s*:\s*&quot;(.*?)&quot; </optional_re>
> 			<download url="http://v2.tudou.com/v2/kili?id=${iid.1}&amp;safekey=YouNeverKnowThat&amp;noCatch=0000">
> 				<each_element ref="f" tagname="f" require_attrs="innerHTML">
> 					<media url="${f.innerHTML}" type="flv" description="${translate:hd_quality} ${optional:title.1}" title="${title.1}" quality="very-high" mediaid="${iid.1}" thumbnail="${thumb.1}" />
> 				</each_element>
> 			</download>
> 		</rule>
131c139,140
< 		<!-- TODO - when we have binary downloads, we can treat the orignial .mov file as a playlist element -->
---
> 		<!-- TODO movies.apple.com site dead? -->
> 		<!-- when we have binary downloads, we can treat the orignial .mov file as a playlist element -->
141c150,158
< 		<if_re ref="videoid" re="videoId\s*:\s*&quot;(\d+)&quot;" tagname="script" />
---
> 		<if_false />
> 		<!-- TODO does not work -->
> 		<!--
> 		url to grab some json data:
> 		http://www.wat.tv/interface/contentv3/5039961
> 		
> 		minimal url for getting download url
> 		http://www.wat.tv/get/web/5039961?token=0b6c33af021d74d8e8c122cbfaf61ecf/4c54c602&domain=www.wat.tv&getURL=1
> 		-->
154c171,232
< 		<media type="flv" description="${title.1}" url="http://www${s.1}.megavideo.com/files/${megavideo:un.1:k1.1:k2.1}/" />
---
> 		<media type="flv" description="${title.1}" url="http://www${s.1}.megavideo.com/files/${megavideo:un.1:k1.1:k2.1}/" title="${either:title.1:origtitle.innerHTML}" />
> 	</rule>
> 	<rule id="videosz.com">
> 		<!-- just the clips -->
> 		<rule id="videosz_movie">
> 			<if_url host="videosz.com" ref="url" />
> 			<rule>
> 				<if_re string="${url.url}" re="dvd_id=(\d+)" ref="dvd_id" />
> 				<each_re ref="vzinfo" re="var scene = new Array([\s\S]*?)scenesInfo\[(\d+)\] = scene;">
> 					<if_re string="${vzinfo.1}" ref="scene" re="scene\['scene'\] = &quot;([^&quot;]+)&quot;;" />
> 					<optional_re ref="place" string="${vzinfo.1}" re="scene\['place'\] = &quot;(\d+)&quot;;" />
> 					<rule>
> 						<optional_re ref="thumb" re="&quot;(http://ss\d+\.videosz\.com/${dvd_id.1}/.*/${place.1}/thumbs\d+/\d+\.jpg)&quot;" />
> 						<rule>
> 							<if_re string="${vzinfo.1}" re="scene\['host'\] = &quot;flv1&quot;;" />
> 							<media url="http://galleries.videosz.com/${scene.1}_1/videosz-${scene.1}-1${place.1}.flv"  thumbnail="${thumb.1}" type="flv" description="flv ${scene.1}" title="${origtitle.innerHTML}-${scene.1}" />
> 						</rule>
> 						<rule>
> 							<if_re string="${vzinfo.1}" re="scene\['host'\] = &quot;flv2&quot;;" />
> 							<media url="http://largesamples.videosz.com/${dvd_id.1}/videosz-${scene.1}.flv"  thumbnail="${thumb.1}" type="flv" description="flv ${scene.1}" title="${origtitle.innerHTML}-${scene.1}" />
> 							<media url="http://largesamples.videosz.com/${dvd_id.1}/videosz-${scene.1}.avi"  thumbnail="${thumb.1}" type="avi" description="avi ${scene.1}" title="${origtitle.innerHTML}-${scene.1}" />
> 						</rule>
> 					</rule>
> 				</each_re>
> 			</rule>
> 		</rule>
> 		<rule id="videosz_img">
> 			<ifnot_url host="videosz.com" />
> 			<if_re ref="vzimgurl" re="ss\d+\.videosz\.com/(\d+)/movie/\d+/\d+.jpg" />
> 			<download url="http://videosz.com/movie.php?dvd_id=${vzimgurl.1}">
> 				<rule goto="videosz_movie" />
> 			</download>
> 		</rule>
> 	</rule>
> 	<rule id="metacafe.com">
> 		<!-- TODO broken -->
> 		<if_false />
> 		<if_url host="metacafe.com" />
> 		<if_re string="${.url}" ref="reurl" >
> 			/watch/([^/]+)
> 		</if_re>
> 		<media url="http://www.metacafe.com/fplayer.php?itemID=${reurl.1}&amp;fs=n&amp;t=embedded" type="flv" />
> 	</rule>
> 	<rule id="vimeo.com">
> 		<!-- TODO unchecked -->
> 		<if_url host="vimeo.com" />
> 		<if_re ref="vimeoscript" elem="script">
> 			clip_id: '(\d+)',
> 		</if_re>
> 		<rule id="vimeodownload" target="vimeodownload">
> 			<!-- download url should end in &amp;param_context=user:${user_id}&amp;context=user:${user_id} -->
> 			<download url="http://vimeo.com/moogaloop/load/clip:${vimeoscript.1}/local?param_md5=0&amp;param_context_id=&amp;param_force_embed=0&amp;param_clip_id=${vimeoscript.1}&amp;param_show_portrait=0&amp;param_multimoog=&amp;param_server=vimeo.com&amp;param_show_title=0&amp;param_color=00ADEF&amp;param_autoplay=0&amp;param_show_byline=0&amp;param_fullscreen=1">
> 				<each_element tagname="request_signature" ref="sig" attrs="innerHTML">
> 					<each_element tagname="request_signature_expires" ref="expires" attrs="innerHTML">
> 						<!-- <if_element tagname="clip_id" ref="clipid" attrs="innerHTML" /> -->
> 						<optional_element tagname="thumbnail" ref="thumb" attrs="innerHTML" />
> 						<optional_element tagname="caption" ref="caption" attrs="innerHTML" />
> 						<media url="http://vimeo.com/moogaloop/play/clip:${vimeoscript.1}/${sig.innerHTML}/${expires.innerHTML}/?q=sd&amp;type=local" type="flv" thumbnail="${thumb.innerHTML}" description="${optional:caption.innerHTML}" />
> 					</each_element>
> 				</each_element>
> 			</download>
> 		</rule>
156,160c234,239
< 	<rule id="wikipedia_file_link">
< 		<if_url host="wikipedia.org" />
< 		<each_element tagname="button" require_attrs="onclick" ref="btn">
< 			<if_re ref="fileloc" string="${btn.onclick}"> "videoUrl"\s*:\s*"(http://[^"]+)", </if_re>
< 			<media url="${fileloc.1}" />
---
> 	<rule id="html5">
> 		<each_element ref="vid" tagname="video" require_attrs="src" attrs="poster">
> 			<media url="${vid.src}" thumbnail="${vid.poster}" certainty="mid" title="${origtitle.innerHTML}" />
> 		</each_element>
> 		<each_element ref="aud" tagname="audio" require_attrs="src">
> 			<media url="${aud.src}" certainty="mid" title="${origtitle.innerHTML}" description="Audio file" />
161a241,351
> 		<each_element ref="sou" tagname="source" require_attrs="src">
> 			<media url="${sou.src}" certainty="mid" title="${origtitle.innerHTML}" />
> 		</each_element>
> 	</rule>
> 	<rule id="spiegel.de">
> 		<!-- TODO unchecked -->
> 		<if_url host="spiegel.de" path="/video/" ref="url" />
> 		<rule>
> 			<if_re string="${url.path}" ref="videoid"> /video/video\-(\d+)\.html </if_re>
> 			<download url="http://video.spiegel.de/flash/${videoid.1}.xml">
> 				<each_element tagname="filename" ref="filename" require_attrs="innerHTML">
> 					<media url="http://video.spiegel.de/flash/${filename.innerHTML}" />
> 				</each_element>
> 			</download>
> 		</rule>
> 	</rule>
> 	<rule id="search.googlevideo">
> 		<!-- TODO unchecked -->
> 		<!-- for google video search, grab the link to the page the video is really on -->
> 		<if_url inhost="google" />
> 		<rule id="video.google.com">
> 			<if_re ref="div" flags="mi"> &lt;div\s+id=[&quot;']current\-title[&quot;']\s*&gt;([\s\S]*?)&lt;/div\s*&gt; </if_re>
> 			<rule>
> 				<if_re ref="url" string="${div.1}"> href=[&quot;'](http://[^&quot;']+)[&quot;'] </if_re>
> 				<download url="${url.1}">
> 					<rule goto="*" />
> 				</download>
> 			</rule>
> 		</rule>
> 		<rule id="video.google.de">
> 			<each_element ref="alink" tagname="a" require_attrs="id,href">
> 				<if_equal a="${alink.id}" b="hs_title_link" />
> 				<download url="${alink.href}">
> 					<rule goto="*" />
> 				</download>
> 			</each_element>
> 		</rule>
> 	</rule>
> 	<rule id="keezmovies.com">
> 		<!-- TODO unchecked -->
> 		<if_url ref="url" host="keezmovies.com"/>
> 		<rule>
> 			<if_re ref="vidid" string="${url.path}"> /(\d+) </if_re>
> 			<download url="http://www.keezmovies.com/watch_player.php?id=${vidid.1}">
> 				<each_element ref="flvurl" tagname="flv_url" require_attrs="innerHTML">
> 					<media url="${flvurl.innerHTML}" />
> 				</each_element>
> 			</download>
> 		</rule>
> 	</rule>
> 	<rule id="animez.com.go4ent">
> 		<!-- TODO unchecked -->
> 		<if_url ref="azurl" host="go4ent.com" />
> 		<rule>
> 			<if_re ref="hexres" string="${hextostr:reversed:padprefix:0:2:qparam:urls:azurl.url}" > (http.*?\.flv) </if_re>
> 			<media url="${hexres.1}" type="flv" />
> 		</rule>
> 	</rule>
> 	<rule id="rutube.ru-2010">
> 		<if_url host="rutube.ru" ref="url" />
> 		<rule>
> 			<if_re ref="v" re="^(.*)$" string="${qparam:v:url.url}" />
> 			<optional_elem tagname="h1" require_attrs="innerHTML" />
> 			<rule id="rutube-from-id" target="rutube-from-id">
> 				<download url="http://bl.rutube.ru/${v.1}.xml?schema=rtmp">
> 					<if_re ref="final" re="&lt;finalAddress&gt;&lt;!\[CDATA\[(http.*?)\]\]&gt;&lt;/finalAddress&gt;" />
> 					<media url="${final.1}" thumbnail="http://img.rutube.ru/thumbs/${substring:0:2:v.1}/${substring:2:4:v.1}/${v.1}-1.jpg" title="${either:h1.innerHTML:origtitle.innerHTML}" type="flv" mediaid="rutube-${v.1}" />
> 				</download>
> 			</rule>
> 		</rule>
> 	</rule>
> 	<rule id="revver.com">
> 		<!-- TODO unchecked -->
> 		<if_url ref="url" host="revver.com" path="/video" />
> 		<rule>
> 			<if_re ref="videoid" string="${url.url}"> /video/(\d+) </if_re>
> 			<rule id="revver.com.downloadmov">
> 				<!-- TODO - not always available? -->
> 				<media url="http://media.revver.com/qt;download/${videoid.1}.mov" />
> 			</rule>
> 		</rule>
> 	</rule>
> 	<rule id="mtv.de">
> 		<!-- TODO unchecked -->
> 		<!-- <if_url host="mtv.de" inpath="videos" /> -->
> 		<if_re> intl\.esperanto\.mtvi\.com </if_re>
> 		<if_re tagname="script" ref="videoid"> var uri\s*=\s*&quot;(.*?)&quot; </if_re>
> 		<download url="http://intl.esperanto.mtvi.com/www/xml/video.jhtml?uri=${urlencode:videoid.1}" >
> 			<optional_element ref="image" tagname="media:thumbnail" attrs="url" />
> 			<each_element ref="content" tagname="media:content" require_attrs="url">
> 				<download url="${content.url}">
> 					<if_element ref="src" tagname="src" require_attrs="innerHTML" />
> 					<media url="${src.innerHTML}" thumbnail="${image.url}" />
> 				</download>
> 			</each_element>
> 		</download>
> 	</rule>
> 	<rule id="noembed.video.google.com">
> 		<if_url inhost="google" />
> 		<if_re ref="playerurl" tagname="script" re="(googleplayer\.swf\?[^&quot;']+)[&quot;']" />
> 		<media url="${qparam:videoUrl:jsdecode:playerurl.1}" thumbnail="${qparam:thumbnailUrl:jsdecode:playerurl.1}" title="${origtitle.innerHTML}" type="flv" />
> 	</rule>
> 	<rule id="vbox7.com">
> 		<if_url ref="url" host="vbox7.com" />
> 		<rule>
> 			<if_re ref="vidid" re="vbox7\.com/play:([a-fA-F0-9]+)" string="${url.url}" />
> 			<download url="http://www.vbox7.com/play/magare.do" post="onLoad=%5Btype%20Function%5D&amp;vid=${vidid.1}">
> 				<if_re ref="vid" re="&amp;videoFile=(http[^&amp;]+)&amp;" />
> 				<media url="${vid.1}" title="${origtitle.innerHTML}" thumbnail="http://i.vbox7.com/p/${vidid.1}1.jpg" type="flv" />
> 			</download>
> 		</rule>
171a362
> 		This also work around scripts
174,231c365
< 		<rule id="youtube.com" target="youtube.com">
< 			<if_url host="youtube.com" />
< 			<if_re ref="fmt_stream_map" re="&amp;fmt_stream_map=([^&amp;]+)" />
< 			<optional_re ref="title" re="&lt;title&gt;\s*YouTube\s+\-\s+(.*)\s*&lt;/title&gt;" />
< 			<optional_re ref="video_id" re="&lt;input type=&quot;hidden&quot; name=&quot;video_id&quot; value=&quot;([^&quot;]+)&quot; /&gt;" />
< 			<each_re ref="fmt_part" string="${urldecode:fmt_stream_map.1}" re="([^,]+)">
< 				<if_re ref="fmt_url" re="^(\d+)\|(http[^\|]+)(?:\|.*)?$" string="${fmt_part.1}" />
< 				<rule>
< 					<if_re string="${fmt_url.1}" re="^(22)$" />
< 					<media url="${fmt_url.2}" thumbnail="http://i4.ytimg.com/vi/${video_id.1}/default.jpg"
< 						description="${translate:hd_quality} - ${optional:title.1}" type="mp4" />
< 				</rule>
< 				<rule>
< 					<if_re string="${fmt_url.1}" re="^(5)$" />
< 					<media url="${fmt_url.2}" thumbnail="http://i4.ytimg.com/vi/${video_id.1}/default.jpg"
< 						description="${translate:low_quality} - ${optional:title.1}" type="flv" />
< 				</rule>
< 				<rule>
< 					<if_re string="${fmt_url.1}" re="^(34|4)$" />
< 					<media url="${fmt_url.2}" thumbnail="http://i4.ytimg.com/vi/${video_id.1}/default.jpg"
< 						description="${translate:mid_quality} - ${optional:title.1}" type="flv" />
< 				</rule>
< 				<rule>
< 					<if_re string="${fmt_url.1}" re="^(18)$" />
< 					<media url="${fmt_url.2}" thumbnail="http://i4.ytimg.com/vi/${video_id.1}/default.jpg"
< 						description="${translate:mid_quality} (mp4) - ${optional:title.1}" type="mp4" />
< 				</rule>
< 				<rule>
< 					<if_re string="${fmt_url.1}" re="^(35)$" />
< 					<media url="${fmt_url.2}" thumbnail="http://i4.ytimg.com/vi/${video_id.1}/default.jpg"
< 						description="${translate:high_quality} - ${optional:title.1}" type="flv" />
< 				</rule>
< 				<rule>
< 					<if_not_re string="${fmt_url.1}" re="^(4|5|18|22|34|35)$" />
< 					<media url="${fmt_url.2}" thumbnail="http://i4.ytimg.com/vi/${video_id.1}/default.jpg"
< 						description="Unknown quality code ${fmt_url.1} - ${optional:title.1}" type="flv" />
< 				</rule>
< 			</each_re>
< 		</rule>
< 		<rule id="embed-youtube-2010">
< 			<each_re ref="video_id" re="http://(?:www\.)?youtube\.com/v/([a-zA-Z0-9_\-]+)">
< 				<download url="http://www.youtube.com/watch?v=${video_id.1}">
< 					<rule goto="youtube.com" />
< 				</download>
< 			</each_re>
< 		</rule>
< 		<rule id="alluc.org">
< 			<if_url ref="url" host="alluc.org" />
< 			<rule>
< 				<if_re string="${url.path}" re="^(/.*/)[^/]+$" ref="firstpath" />
< 				<each_re ref="hcvalue" re="&lt;a href=&quot;([^/&quot;][^&quot;]+/watch\d+\.html\?hc=[^&quot;]+)&quot; target=&quot;_blank&quot; title=">
< 					<download url="http://${url.host}${firstpath.1}${htmldecode:hcvalue.1}">
< 						<rule goto="*" />
< 					</download>
< 				</each_re>
< 			</rule>
< 		</rule>
< 		<rule id="generic_embedded">
---
> 		<rule id="each_embed">
233,244c367,385
< 				<rule id="all_embed">
< 					<media url="${embedelem.src}" />
< 				</rule>
< 				<rule id="embed_with_media_ext">
< 					<if_ext is_media="yes" filename="${embedelem.src}" />
< 					<media url="${embedelem.src}" />
< 				</rule>
< 				<rule id="embed.veoh.com">
< 					<if_re string="${embedelem.src}"> veoh\.com.*\.swf </if_re>
< 					<rule>
< 						<if_re string="${htmldecode:embedelem.src}" ref="videoid"> (?:\?|&amp;)permalinkId=([^&amp;]+) </if_re>
< 						<rule goto="veoh" />
---
> 				<rule>
> 					<!-- guesses applicable anywhere -->
> 					<rule id="all_embed">
> 						<!-- normally swf files, can be any embed -->
> 						<!-- lets not use page title (origtitle.innerHTML) because we're not too certain of this one -->
> 						<media url="${embedelem.src}" certainty="low" description="${translate:embedplayer}" />
> 					</rule>
> 					<rule id="embed_with_media_ext">
> 						<!-- this is an embedded media file, PROBABLY with a sane filename already, so we won't set title to origtitle.innerHTML -->
> 						<if_ext is_media="yes" filename="${embedelem.src}" />
> 						<media url="${embedelem.src}" certainty="mid" />
> 					</rule>
> 					<rule id="generic_flashvars">
> 						<each_re ref="queryparam" string="${embed.flashvars}" re="([^&amp;]+)=([^&amp;]+)">
> 							<rule>
> 								<if_re string="${queryparam.2}" re="\.flv(?:\?|#|;|$)" />
> 								<media url="${queryparam.2}" type="flv" certainty="mid" title="${origtitle.innerHTML}" />
> 							</rule>
> 						</each_re>
246,253d386
< 				</rule>
< 				<rule id="smotri.com">
< 					<if_re re="//pics.smotri.com/" string="${embedelem.src}" />
< 					<if_re ref="vid_id" re="file=([^&amp;]+)&amp;" string="${embedelem.flashvars}" />
< 					<download url="http://smotri.com/video/view/url/bot/?video_url=1&amp;ticket=${vid_id.1}">
< 						<if_re ref="vid_url" re="&quot;_vidURL&quot;\s*:\s*&quot;([^&quot;]+)&quot;" />
< 						<media url="${jsdecode:vid_url.1}" type="flv" />
< 					</download>
256,257c389,390
< 					<if_re ref="playlisturl" string="${embedelem.src}"> embed\.magnatune\.com.*playlist_url=([^&amp;]+) </if_re>
< 					<download url="${playlisturl.1}">
---
> 					<if_re ref="playlisturl" string="${embedelem.src}"> magnatune\.com.*[&amp;\?]playlist_url=([^&amp;]+) </if_re>
> 					<playlist url="${playlisturl.1}">
266c399
< 					</download>
---
> 					</playlist>
268a402
> 					<!-- TODO unchecked -->
276,290c410,414
< 				<rule id="embed.video.google.com">
< 					<!-- possibly not working as we don't serialize page any more -->
< 					<if_re ref="googlevidurl" string="${embedelem.src}">
< 						/googleplayer\.swf\?videoUrl=([^&amp;]+)&amp;thumbnailUrl=([^&amp;]*)
< 					</if_re>
< 					<media url="${urldecode:googlevidurl.1}" thumbnail="${urldecode:googlevidurl.2}" />
< 				</rule>
< 				<rule id="embed.youtube.com">
< 					<if_re ref="embedyoutube" string="${embedelem.src}">
< 						youtube\.com\/v\/([^&amp;]+)
< 					</if_re>
< 					<download url="http://www.youtube.com/get_video_info?&amp;video_id=${embedyoutube.1}&amp;el=embedded&amp;ps=default">
< 						<if_re ref="token"> token=([^&amp;]+)&amp; </if_re>
< 						<if_re ref="title" optional="yes"> title=([^&amp;]+)&amp; </if_re>
< 						<media description="${urldecode:title.1}" url="http://www.youtube.com/get_video?video_id=${embedyoutube.1}&amp;t=${token.1}" type="flv" thumbnail="http://i4.ytimg.com/vi/${embedyoutube.1}/default.jpg"/>
---
> 				<rule id="embed.video.google.com-2010">
> 					<if_re ref="docid" string="${embedelem.src}" re="video\.google\.com.*docid=(\d+)(&amp;|$)" />
> 					<download url="http://video.google.com/videoplay?docid=${docid.1}">
> 						<optional_element ref="origtitle" tagname="title" require_attrs="innerHTML" />
> 						<rule goto="noembed.video.google.com" />
294,296c418
< 					<if_re ref="vimeoscript" string="${embedelem.src}">
< 						vimeo\.com/moogaloop\.swf\?clip_id=(\d+)&amp;
< 					</if_re>
---
> 					<if_re ref="vimeoscript" string="${embedelem.src}" re="vimeo\.com/moogaloop\.swf\?clip_id=(\d+)&amp;" />
305,312d426
< 				<!--
< 				<rule id="metacafe">
< 					http://www.metacafe.com/fplayer/2384460/crazy_old_man.swf
< 					<if_re ref="embedsrc" string="${embedelem.src}">
< 						^http://www.metacafe.com/fplayer/([^/]+)
< 					</if_re>
< 				</rule>
< 				-->
313a428
> 					<!-- TODO unchecked -->
316a432,435
> 				<rule id="rutube.ru-embed-2010">
> 					<if_re ref="v" string="${embedelem.src}" re="^http://video\.rutube\.ru/([0-9a-fA-F]+)" />
> 					<rule goto="rutube-from-id" />
> 				</rule>
317a437
> 					<!-- TODO unchecked -->
321,333d440
< 				<rule id="generic_flashvars">
< 					<!-- TODO - have some special tag to parse this sort of thing? -->
< 					<each_re ref="queryparam" string="${embed.flashvars}" re="([^&amp;]+)=([^&amp;]+)">
< 						<rule>
< 							<if_re string="${queryparam.2}"> \.flv(?:\?|$) </if_re>
< 							<media url="${queryparam.2}" type="flv" />
< 						</rule>
< 					</each_re>
< 				</rule>
< 				<rule id="embedsrc" priority="low">
< 					<!-- normally swf files, can be any embed -->
< 					<media src="${embedelem.src}" description="${translate:embedplayer}"/>
< 				</rule>
334a442
> 					<!-- TODO unchecked -->
342a451
> 					<!-- TODO unchecked -->
352,365c461,499
< 			<each_element ref="param" tagname="param" require_attrs="name,value">
< 				<rule id="pram.default">
< 					<if_re string="${param.name}" flags="i"> (movie|src|href) </if_re>
< 					<media url="${param.value}" description="${translate:embedplayer}"/>
< 				</rule>
< 				<rule id="param.youtube.com">
< 					<if_re ref="embedyoutube" string="${param.value}">
< 						youtube\.com\/v\/([^&amp;]+)
< 					</if_re>
< 					<download url="http://www.youtube.com/get_video_info?&amp;video_id=${embedyoutube.1}&amp;el=embedded&amp;ps=default">
< 						<if_re ref="token"> token=([^&amp;]+)&amp; </if_re>
< 						<if_re ref="title" optional="yes"> title=([^&amp;]+)&amp; </if_re>
< 						<media description="${urldecode:title.1}" url="http://www.youtube.com/get_video?video_id=${embedyoutube.1}&amp;t=${token.1}" />
< 					</download>
---
> 		</rule>
> 		<rule id="each_param">
> 			<each_element tagname="param" ref="p" require_attrs="name,value">
> 				<rule id="generic_param">
> 					<if_re string="${p.name}" flags="i" re="(?:filename|url|movie)" />
> 					<rule id="all_param">
> 						<media url="${p.value}" certainty="low" />
> 					</rule>
> 					<rule id="media_param">
> 						<if_ext is_media="yes" filename="${p.value}" />
> 						<media url="${p.value}" certainty="mid" />
> 					</rule>
> 					<rule id="dailyshow">
> 						<!-- name=movie -->
> 						<if_re ref="mgid" re="^http://media\.mtvnservices\.com/(mgid:.*)$" string="${p.value}" />
> 						<download url="http://media.mtvnservices.com/player/config.jhtml?uri=${urlencode:mgid.1}" geolocate="US">
> 							<each_re ref="item" re="&lt;item&gt;([\s\S]*?)&lt;/item&gt;">
> 								<optional_re ref="title" string="${item.1}" re="&lt;title&gt;\s*(.*?)\s*&lt;/title&gt;" />
> 								<if_element ref="xmlurl" require_attrs="url" tagname="media:content" string="${item.1}" />
> 								<download url="${xmlurl.url}">
> 									<each_re ref="rend" re="&lt;rendition[^&lt;&gt;]*?bitrate=&quot;(\d+)&quot;[\s\S]*?&lt;src&gt;\s*(rtmpe?|http)://(.*?)\s*&lt;/src&gt;">
> 										<!-- this gives an rtmpe link -->
> 										<rule>
> 											<if_re re="^(1720)$" string="${rend.1}" />
> 											<media url="${rend.2}://${rend.3}" description="${optional:title.1} (${rend.1} bits/sec)" title="${either:title.1:origtitle.innerHTML}" type="flv" quality="high" />
> 										</rule>
> 										<rule>
> 											<if_re re="^(450)$" string="${rend.1}" />
> 											<media url="${rend.2}://${rend.3}" description="${optional:title.1} (${rend.1} bits/sec)" title="${either:title.1:origtitle.innerHTML}" type="flv" quality="low" />
> 										</rule>
> 										<rule>
> 											<ifnot_re re="^(1720|450)$" string="${rend.1}" />
> 											<media url="${rend.2}://${rend.3}" description="${optional:title.1} (${rend.1} bits/sec)" title="${either:title.1:origtitle.innerHTML}" type="flv" />
> 										</rule>
> 									</each_re>
> 								</download>
> 							</each_re>
> 						</download>
> 					</rule>
369a504,590
> 		<rule id="generic-flv-urlencoded">
> 			<!-- TODO unchecked -->
> 			<!-- eg: redtube.com -->
> 			<if_re ref="loc" re="[&amp;\?&quot;](?:[a-z0-9_-]+=)?(http%3A%2F%2F[a-z0-9%_\.-]+\.flv(?:%3F[a-z0-9%_\.-]*)?)[&amp;&quot;']" flags="i" />
> 			<media url="${urldecode:loc.1}" type="flv" />
> 		</rule>
> 		<rule id="youtube.com">
> 			<if_url ref="url" host="youtube.com" />
> 			<rule id="youtube-single" target="youtube-single">
> 				<if_re ref="fmt_stream_map" re="&amp;fmt_stream_map=([^&amp;]+)" />
> 				<optional_re ref="title" re="&lt;title&gt;\s*YouTube\s+\-\s+(.*)\s*&lt;/title&gt;" />
> 				<optional_re ref="video_id" re="&lt;input type=&quot;hidden&quot; name=&quot;video_id&quot; value=&quot;([^&quot;]+)&quot; /&gt;" />
> 				<each_re ref="fmt_part" string="${urldecode:fmt_stream_map.1}" re="([^,]+)">
> 					<if_re ref="fmt_url" re="^(\d+)\|(http[^\|]+)(?:\|.*)?$" string="${fmt_part.1}" />
> 					<rule>
> 						<if_re string="${fmt_url.1}" re="^(22)$" />
> 						<media url="${fmt_url.2}" thumbnail="http://i4.ytimg.com/vi/${video_id.1}/default.jpg"
> 							quality="very-high" title="${either:title.1:origtitle.innerHTML}" mediaid="${video_id.1}"
> 							description="${translate:hd_quality} - ${optional:title.1}" type="mp4" />
> 					</rule>
> 					<rule>
> 						<if_re string="${fmt_url.1}" re="^(5)$" />
> 						<media url="${fmt_url.2}" thumbnail="http://i4.ytimg.com/vi/${video_id.1}/default.jpg"
> 							quality="low" title="${either:title.1:origtitle.innerHTML}" mediaid="${video_id.1}"
> 							description="${translate:low_quality} - ${optional:title.1}" type="flv" />
> 					</rule>
> 					<rule>
> 						<if_re string="${fmt_url.1}" re="^(34|4)$" />
> 						<media url="${fmt_url.2}" thumbnail="http://i4.ytimg.com/vi/${video_id.1}/default.jpg"
> 							quality="mid" title="${either:title.1:origtitle.innerHTML}" mediaid="${video_id.1}"
> 							description="${translate:mid_quality} - ${optional:title.1}" type="flv" />
> 					</rule>
> 					<rule>
> 						<if_re string="${fmt_url.1}" re="^(18)$" />
> 						<media url="${fmt_url.2}" thumbnail="http://i4.ytimg.com/vi/${video_id.1}/default.jpg"
> 							quality="mid" title="${either:title.1:origtitle.innerHTML}" mediaid="${video_id.1}"
> 							description="${translate:mid_quality} (mp4) - ${optional:title.1}" type="mp4" />
> 					</rule>
> 					<rule>
> 						<if_re string="${fmt_url.1}" re="^(35)$" />
> 						<media url="${fmt_url.2}" thumbnail="http://i4.ytimg.com/vi/${video_id.1}/default.jpg"
> 							quality="mid" title="${either:title.1:origtitle.innerHTML}" mediaid="${video_id.1}"
> 							description="${translate:high_quality} - ${optional:title.1}" type="flv" />
> 					</rule>
> 					<rule>
> 						<ifnot_re string="${fmt_url.1}" re="^(4|5|18|22|34|35)$" />
> 						<media url="${fmt_url.2}" thumbnail="http://i4.ytimg.com/vi/${video_id.1}/default.jpg"
> 							description="Unknown quality code ${fmt_url.1} - ${optional:title.1}" type="flv" />
> 					</rule>
> 				</each_re>
> 			</rule>
> 			<rule id="youtube-channel">
> 				<!-- click the "see all uploads" link -->
> 				<if_re string="${url.path}" ref="username" re="^/user/([^#\?]+)" />
> 				<download url="http://www.youtube.com/profile_ajax?action_ajax=1&amp;user=${urlencode:username.1}&amp;new=1&amp;box_method=load_playlist&amp;box_name=user_playlist_navigator&amp;playlistName=uploads&amp;sort=default" post="session_token=&amp;messages=%5B%7B%22type%22%3A%22box_method%22%2C%22request%22%3A%7B%22name%22%3A%22user_playlist_navigator%22%2C%22x_position%22%3A1%2C%22y_position%22%3A-2%2C%22palette%22%3A%22default%22%2C%22method%22%3A%22load_playlist%22%2C%22params%22%3A%7B%22playlist_name%22%3A%22uploads%22%2C%22view%22%3A%22play%22%2C%22playlist_sort%22%3A%22default%22%7D%7D%7D%5D">
> 					<each_re re="&lt;div id=\\&quot;playnav\-play\-uploads\-page\-(\d+)\\&quot;" ref="pagenum">
> 						<!-- lets limit this to top few pages so we don't get an insane (or unlimited!) number of results (although we hit our download limit eventually...) -->
> 						<if_re string="_${pagenum.1}_" re="_[0-3]_" />
> 						<download url="http://www.youtube.com/profile_ajax?action_ajax=1&amp;user=${urlencode:username.1}&amp;new=1&amp;box_method=load_playlist_page&amp;box_name=user_playlist_navigator" post="session_token=&amp;messages=%5B%7B%22type%22%3A%22box_method%22%2C%22request%22%3A%7B%22name%22%3A%22user_playlist_navigator%22%2C%22x_position%22%3A1%2C%22y_position%22%3A-2%2C%22palette%22%3A%22default%22%2C%22method%22%3A%22load_playlist_page%22%2C%22params%22%3A%7B%22playlist_name%22%3A%22uploads%22%2C%22encrypted_playlist_id%22%3A%22uploads%22%2C%22query%22%3A%22%22%2C%22encrypted_shmoovie_id%22%3A%22uploads%22%2C%22page_num%22%3A${pagenum.1}%2C%22view%22%3A%22play%22%2C%22playlist_sort%22%3A%22default%22%7D%7D%7D%5D">
> 							<each_re ref="link" re="&lt;a href=\\&quot;\\/(watch\?v=[^&quot;]+)\\&quot; class=\\&quot;playnav-item-title">
> 								<download url="http://www.youtube.com/${jsdecode:link.1}">
> 									<rule goto="youtube-single" />
> 								</download>
> 							</each_re>
> 						</download>
> 					</each_re>
> 				</download>
> 			</rule>
> 		</rule>
> 		<rule id="embed-youtube-2010">
> 			<each_re ref="video_id" re="http://(?:www\.)?youtube\.com/v/([a-zA-Z0-9_\-]+)">
> 				<download url="http://www.youtube.com/watch?v=${video_id.1}">
> 					<rule goto="youtube-single" />
> 				</download>
> 			</each_re>
> 		</rule>
> 		<rule id="alluc.org">
> 			<if_url ref="url" host="alluc.org" />
> 			<rule>
> 				<if_re string="${url.path}" re="^(/.*/)[^/]+$" ref="firstpath" />
> 				<each_re ref="hcvalue" re="&lt;a href=&quot;([^/&quot;][^&quot;]+/watch\d+\.html\?hc=[^&quot;]+)&quot; target=&quot;_blank&quot; title=">
> 					<download url="http://${url.host}${firstpath.1}${htmldecode:hcvalue.1}">
> 						<rule goto="*" />
> 					</download>
> 				</each_re>
> 			</rule>
> 		</rule>
370a592
> 			<!-- TODO unchecked -->
376a599
> 			<!-- TODO unchecked -->
381a605
> 			<!-- TODO unchecked -->
416a641
> 			<!-- TODO unchecked -->
425a651
> 			<!-- TODO unchecked -->
446a673
> 			<!-- TODO unchecked -->
452a680
> 			<!-- TODO unchecked -->
464a693
> 			<!-- TODO unchecked -->
474,476c703,714
< 					<if_re ref="flvstreamid" re="&quot;streamfileids&quot;:\{&quot;flv&quot;:&quot;([^&quot;]+)&quot;\}" />
< 					<each_re ref="piece" re="\{&quot;no&quot;:&quot;(\d+)&quot;,">
< 						<media url="${youku:key1.1:key2.1:seed.1:flvstreamid.1:piece.1}" thumbnail="${jsdecode:thumbnail.1}" description="Part ${piece.1}" type="flv" />
---
> 					<if_re ref="flvstreamid" re="&quot;flv&quot;:&quot;([\d\*]+\*)&quot;" />
> 					<if_re ref="flvarray" re="&quot;flv&quot;:\[(\{&quot;no&quot;:[^\]]+)\]" />
> 					<each_re ref="piece" re="\{&quot;no&quot;:&quot;?(\d+)&quot;?," string="${flvarray.1}">
> 						<media url="${youku:flv:key1.1:key2.1:seed.1:flvstreamid.1:piece.1}" thumbnail="${jsdecode:thumbnail.1}" description="Part ${piece.1} (flv)" type="flv" />
> 						<!-- TODO really need to double check this. Possibly all the pieces give the same output!? -->
> 					</each_re>
> 				</rule>
> 				<rule>
> 					<if_re ref="mp4streamid" re="&quot;mp4&quot;:&quot;([\d\*]+\*)&quot;" />
> 					<if_re ref="mp4array" re="&quot;mp4&quot;:\[(\{&quot;no&quot;:[^\]]+)\]" />
> 					<each_re ref="piece" re="\{&quot;no&quot;:&quot;?(\d+)&quot;?," string="${mp4array.1}">
> 						<media url="${youku:mp4:key1.1:key2.1:seed.1:mp4streamid.1:piece.1}" thumbnail="${jsdecode:thumbnail.1}" description="Part ${piece.1} (mp4)" type="mp4" />
481,507c719,723
< 	</download><!-- flashblock workaround -->
< 	<rule id="generic_param">
< 		<each_element tagname="param" ref="p" require_attrs="name,value">
< 			<if_re string="${p.name}" flags="i"> (?:filename|url) </if_re>
< 			<media url="${p.value}" />
< 		</each_element>
< 	</rule>
< 	<rule id="comedycentral.com">
< 		<if_url host="comedycentral.com" />
< 		<if_re ref="mgid" re="/media/(mgid:cms:video:comedycentral.com:\d+)&quot;" />
< 		<rule>
< 			<download id="ccmgid" url="http://www.comedycentral.com/comedycentral/video/data/mrss.jhtml?useMediaGen=clip&amp;uri=${urlencode:mgid.1}&amp;poe=">
< 				<optional_element ref="thumbnail" tagname="media:thumbnail" require_attrs="url" />
< 				<each_element ref="videoxml" tagname="media:content" require_attrs="url">
< 					<download id="ccxml" url="${videoxml.url}">
< 						<each_re ref="src" re="&lt;src&gt;\s*([a-z]+)://(.*?)\s*&lt;/src&gt;">
< 							<rule id="ccall">
< 								<if_config name="show_all" value="true" />
< 								<!--
< 								rtmp link we can't download yet
< 								-->
< 								<media url="${src.1}://${src.2}" thumbnail="${thumbnail.url}" />
< 							</rule>
< 						</each_re>
< 					</download>
< 				</each_element>
< 			</download>
---
> 		<rule id="supernovatube.com">
> 			<!-- TODO unchecked -->
> 			<if_url host="supernovatube.com" />
> 			<if_re ref="param" tagname="script"> so\.addVariable\("file",\s*"(http://[^"]+)"\) </if_re>
> 			<media url="${param.1}" type="flv" />
509,518c725,726
< 	</rule>
< 	<rule id="crunchyroll.com">
< 		<if_url host="crunchyroll.com" />
< 		<if_re ref="videoid"> video_id%3D%27(\d+)%27 </if_re>
< 		<if_re ref="mediaid"> media_id%3D%27(\d+)%27 </if_re>
< 		<media url="http://www.crunchyroll.com/getitem?videoid=${videoid.1}&amp;mediaid=${mediaid.1}" />
< 	</rule>
< 	<rule id="videosz.com">
< 		<rule id="videosz_movie">
< 			<if_url host="videosz.com" ref="url" />
---
> 		<rule id="spankwire.com">
> 			<if_url host="spankwire.com" ref="loc" />
520,578c728,731
< 				<if_re string="${url.url}" re="dvd_id=(\d+)" ref="dvd_id" />
< 				<each_re ref="vzinfo" re="var scene = new Array([\s\S]*?)scenesInfo\[(\d+)\] = scene;">
< 					<if_re string="${vzinfo.1}" ref="scene" re="scene\['scene'\] = &quot;([^&quot;]+)&quot;;" />
< 					<optional_re ref="place" string="${vzinfo.1}" re="scene\['place'\] = &quot;(\d+)&quot;;" />
< 					<rule>
< 						<optional_re ref="thumb" re="&quot;(http://ss\d+\.videosz\.com/${dvd_id.1}/.*/${place.1}/thumbs\d+/\d+\.jpg)&quot;" />
< 						<rule>
< 							<if_re string="${vzinfo.1}" re="scene\['host'\] = &quot;flv1&quot;;" />
< 							<media url="http://galleries.videosz.com/${scene.1}_1/videosz-${scene.1}-1${place.1}.flv"  thumbnail="${thumb.1}" type="flv" description="flv ${scene.1}" />
< 						</rule>
< 						<rule>
< 							<if_re string="${vzinfo.1}" re="scene\['host'\] = &quot;flv2&quot;;" />
< 							<media url="http://largesamples.videosz.com/${dvd_id.1}/videosz-${scene.1}.flv"  thumbnail="${thumb.1}" type="flv" description="flv ${scene.1}" />
< 							<media url="http://largesamples.videosz.com/${dvd_id.1}/videosz-${scene.1}.avi"  thumbnail="${thumb.1}" type="avi" description="avi ${scene.1}" />
< 						</rule>
< 					</rule>
< 				</each_re>
< 			</rule>
< 		</rule>
< 		<rule id="videosz_img">
< 			<ifnot_url host="videosz.com" />
< 			<if_re ref="vzimgurl" re="ss\d+\.videosz\.com/(\d+)/movie/\d+/\d+.jpg" />
< 			<download url="http://videosz.com/movie.php?dvd_id=${vzimgurl.1}">
< 				<rule goto="videosz_movie" />
< 			</download>
< 		</rule>
< 	</rule>
< 	<rule id="spankwire.com">
< 		<if_url host="spankwire.com" ref="loc" />
< 		<rule>
< 			<if_re string="${loc.path}" ref="id"> /video(\d+)/ </if_re>
< 			<download url="http://www.spankwire.com/Player/VideoXML.aspx?id=${id.1}&amp;pid=0&amp;r=${randomfloat}">
< 				<each_element ref="xmlurl" tagname="url" require_attrs="innerHTML">
< 					<media url="${xmlurl.innerHTML}" />
< 				</each_element>
< 			</download>
< 		</rule>
< 	</rule>
< 	<rule>
< 		<if_url host="metacafe.com" />
< 		<if_re string="${.url}" ref="reurl" >
< 			/watch/([^/]+)
< 		</if_re>
< 		<media url="http://www.metacafe.com/fplayer.php?itemID=${reurl.1}&amp;fs=n&amp;t=embedded" type="flv" />
< 	</rule>
< 	<rule id="vimeo.com">
< 		<if_url host="vimeo.com" />
< 		<if_re ref="vimeoscript" elem="script">
< 			clip_id: '(\d+)',
< 		</if_re>
< 		<rule id="vimeodownload" target="vimeodownload">
< 			<!-- download url should end in &amp;param_context=user:${user_id}&amp;context=user:${user_id} -->
< 			<download url="http://vimeo.com/moogaloop/load/clip:${vimeoscript.1}/local?param_md5=0&amp;param_context_id=&amp;param_force_embed=0&amp;param_clip_id=${vimeoscript.1}&amp;param_show_portrait=0&amp;param_multimoog=&amp;param_server=vimeo.com&amp;param_show_title=0&amp;param_color=00ADEF&amp;param_autoplay=0&amp;param_show_byline=0&amp;param_fullscreen=1">
< 				<each_element tagname="request_signature" ref="sig" attrs="innerHTML">
< 					<each_element tagname="request_signature_expires" ref="expires" attrs="innerHTML">
< 						<!-- <if_element tagname="clip_id" ref="clipid" attrs="innerHTML" /> -->
< 						<optional_element tagname="thumbnail" ref="thumb" attrs="innerHTML" />
< 						<optional_element tagname="caption" ref="caption" attrs="innerHTML" />
< 						<media url="http://vimeo.com/moogaloop/play/clip:${vimeoscript.1}/${sig.innerHTML}/${expires.innerHTML}/?q=sd&amp;type=local" type="flv" thumbnail="${thumb.innerHTML}" description="${optional:caption.innerHTML}" />
---
> 				<if_re ref="playlist" re="videoPath: &quot;\.\./(PlaylistXml\.aspx%3Fid=[^&quot;]+)&quot;" />
> 				<download url="http://static.spankwire.com/Controls/UserControls/Players/v3/${urldecode:playlist.1}">
> 					<each_element ref="xmlurl" tagname="url" require_attrs="innerHTML">
> 						<media url="${xmlurl.innerHTML}" title="${origtitle.1}" />
580,614d732
< 				</each_element>
< 			</download>
< 		</rule>
< 	</rule>
< 	<rule id="html5">
< 		<each_element ref="vid" tagname="video" require_attrs="src" attrs="poster">
< 			<media url="${vid.src}" thumbnail="${vid.poster}" />
< 		</each_element>
< 		<each_element ref="aud" tagname="audio" require_attrs="src">
< 			<media url="${aud.src}" />
< 		</each_element>
< 		<each_element ref="sou" tagname="source" require_attrs="src">
< 			<media url="${sou.src}" />
< 		</each_element>
< 	</rule>
< 	<rule id="spiegel.de">
< 		<if_url host="spiegel.de" path="/video/" ref="url" />
< 		<rule>
< 			<if_re string="${url.path}" ref="videoid"> /video/video\-(\d+)\.html </if_re>
< 			<download url="http://video.spiegel.de/flash/${videoid.1}.xml">
< 				<each_element tagname="filename" ref="filename" require_attrs="innerHTML">
< 					<media url="http://video.spiegel.de/flash/${filename.innerHTML}" />
< 				</each_element>
< 			</download>
< 		</rule>
< 	</rule>
< 	<rule id="search.googlevideo">
< 		<!-- for google video search, grab the link to the page the video is really on -->
< 		<if_url inhost="google" />
< 		<rule id="video.google.com">
< 			<if_re ref="div" flags="mi"> &lt;div\s+id=[&quot;']current\-title[&quot;']\s*&gt;([\s\S]*?)&lt;/div\s*&gt; </if_re>
< 			<rule>
< 				<if_re ref="url" string="${div.1}"> href=[&quot;'](http://[^&quot;']+)[&quot;'] </if_re>
< 				<download url="${url.1}">
< 					<rule goto="*" />
618,679c736
< 		<rule id="video.google.de">
< 			<each_element ref="alink" tagname="a" require_attrs="id,href">
< 				<if_equal a="${alink.id}" b="hs_title_link" />
< 				<download url="${alink.href}">
< 					<rule goto="*" />
< 				</download>
< 			</each_element>
< 		</rule>
< 	</rule>
< 	<rule id="keezmovies.com">
< 		<if_url ref="url" host="keezmovies.com"/>
< 		<rule>
< 			<if_re ref="vidid" string="${url.path}"> /(\d+) </if_re>
< 			<download url="http://www.keezmovies.com/watch_player.php?id=${vidid.1}">
< 				<each_element ref="flvurl" tagname="flv_url" require_attrs="innerHTML">
< 					<media url="${flvurl.innerHTML}" />
< 				</each_element>
< 			</download>
< 		</rule>
< 	</rule>
< 	<rule id="animez.com.go4ent">
< 		<if_url ref="azurl" host="go4ent.com" />
< 		<rule>
< 			<if_re ref="hexres" string="${hextostr:reversed:padprefix:0:2:qparam:urls:azurl.url}" > (http.*?\.flv) </if_re>
< 			<media url="${hexres.1}" type="flv" />
< 		</rule>
< 	</rule>
< 	<rule id="rutube.ru">
< 		<if_url host="rutube.ru"/>
< 		<each_re ref="playurl" re="'(http[^']+player\.swf\?[^']+)'" tagname="script">
< 			<media url="${urldecode:qparam:file:htmldecode:playurl.1}" thumbnail="${urldecode:qparam:image:htmldecode:playurl.1}" />
< 		</each_re>
< 	</rule>
< 	<rule id="revver.com">
< 		<if_url ref="url" host="revver.com" path="/video" />
< 		<rule>
< 			<if_re ref="videoid" string="${url.url}"> /video/(\d+) </if_re>
< 			<rule id="revver.com.downloadmov">
< 				<!-- TODO - not always available? -->
< 				<media url="http://media.revver.com/qt;download/${videoid.1}.mov" />
< 			</rule>
< 		</rule>
< 	</rule>
< 	<rule id="mtv.de">
< 		<!-- <if_url host="mtv.de" inpath="videos" /> -->
< 		<if_re> intl\.esperanto\.mtvi\.com </if_re>
< 		<if_re tagname="script" ref="videoid"> var uri\s*=\s*&quot;(.*?)&quot; </if_re>
< 		<download url="http://intl.esperanto.mtvi.com/www/xml/video.jhtml?uri=${urlencode:videoid.1}" >
< 			<optional_element ref="image" tagname="media:thumbnail" attrs="url" />
< 			<each_element ref="content" tagname="media:content" require_attrs="url">
< 				<download url="${content.url}">
< 					<if_element ref="src" tagname="src" require_attrs="innerHTML" />
< 					<media url="${src.innerHTML}" thumbnail="${image.url}" />
< 				</download>
< 			</each_element>
< 		</download>
< 	</rule>
< 	<rule id="noembed.video.google.com">
< 		<if_url inhost="google" />
< 		<if_re ref="playerurl" tagname="script"> (googleplayer\.swf\?[^&quot;']+)[&quot;'] </if_re>
< 		<media url="${qparam:videoUrl:jsdecode:playerurl.1}" thumbnail="${qparam:thumbnailUrl:jsdecode:playerurl.1}" />
< 	</rule>
---
> 	</download><!-- flashblock workaround -->
683c740,745
< 	<rule id="generic_link" priority="low">
---
> 	<!-- TODO
> 	this rule really slows down the search - can cause page to freeze for a moment.
> 	the each_element has slow="yes" which limits this to pages with a DOM (ie the start page only).
> 	it's also marked as defer, in case that is supported
> 	-->
> 	<rule id="generic_link" defer="yes">
687c749,753
< 				<media url="${alink.href}" description="${alink.innerHTML}" />
---
> 				<media url="${alink.href}" description="${alink.innerHTML}" certainty="mid" />
> 			</rule>
> 			<rule id="wikipedia.org-link">
> 				<if_re ref="wplink" string="${alink.href}" re="^/(wiki)/(Media|Image|File|Fichier|Datei|ファイル|Archivo|Файл|Ficheiro|Plik):(.*)\.(ogg|mp3|ogv|oga)$" />
> 				<media url="/${wplink.1}/Special:FilePath/${wplink.3}.${wplink.4}" title="${wplink.3}" type="${wplink.4}" description="Download ${wplink.3}" />
710,795d775
< 			<media url="http://example.com/example_result" description="This is a duplicate" post="NODOWNLOAD" thumbnail="chrome://unplug/skin/unplug-32.png" />
< 		</rule>
< 		<rule id="npr.org">
< 			<if_url host="npr.org" />
< 			<rule id="npr.playerpage">
< 				<if_url inpath="mediaPlayer.html" />
< 				<download url="http://www.npr.org/templates/xanadu/xplayer.php?id=${qparam:id:.url}&amp;t=${qparam:t:.url}&amp;m=${qparam:m:.url}">
< 					<each_re ref="mediaurl" re="&lt;mediaUrl&gt;(.*?)&lt;/mediaUrl&gt;">
< 						<media url="http://92.122.210.172${htmldecode:mediaurl.1}" />
< 					</each_re>
< 				</download>
< 			</rule>
< 			<rule id="npr.link">
< 				<each_re ref="nprlink" re="NPR\.Player\.openPlayer\((\d+),\s*(\d+),">
< 					<download url="http://www.npr.org/templates/xanadu/xplayer.php?id=${nprlink.1}&amp;t=1&amp;m=${nprlink.2}">
< 						<each_re ref="mediaurl" re="&lt;mediaUrl&gt;(.*?)&lt;/mediaUrl&gt;">
< 							<media url="http://a92-122-210-172.deploy.akamaitechnologies.com${htmldecode:mediaurl.1}" />
< 						</each_re>
< 					</download>
< 				</each_re>
< 			</rule>
< 		</rule>
< 		<rule id="multiply.com">
< 			<if_url ref="url" host="multiply.com" />
< 			<rule>
< 				<if_re ref="musicid"> /music/item/(\d+) </if_re>
< 				<download url="http://${url.host}/api/music/item/${musicid.1}" post="&lt;?xml version=&quot;1.0&quot; encoding=&quot;utf-8&quot;?&gt;&lt;request xmlns=&quot;http://multiply.com/api/0.1&quot;&gt;&lt;params&gt;&lt;item_id&gt;${musicid.1}&lt;/item_id&gt;&lt;/params&gt;&lt;method&gt;music.item&lt;/method&gt;&lt;/request&gt;">
< 					<each_re ref="data" re="&lt;src&gt;(.*?)&lt;/src&gt;(?:&lt;subject&gt;(.*?)&lt;/subject&gt;)?">
< 						<media url="${data.1}" description="${data.2}" />
< 					</each_re>
< 				</download>
< 			</rule>
< 		</rule>
< 		<rule>
< 			<if_url host="metacafe.com" />
< 			grab the video id
< 			<if_re string="${.url}" ref="reurl" >
< 				/watch/([^/]+)
< 			</if_re>
< 			<media url="http://www.metacafe.com/fplayer.php?itemID=${reurl.1}&amp;fs=n&amp;t=embedded" type="flv" />
< 		</rule>
< 		<rule id="bbciplayer">
< 			<if_url ref="url" host="bbc.co.uk" inurl="/iplayer/episode/" />
< 			<rule id="iplayer_1">
< 				<if_re ref="groupid" string="${url.path}"> /iplayer/episode/([^/]+) </if_re>
< 				<download url="http://www.bbc.co.uk/iplayer/playlist/${groupid.1}">
< 					<!--
< 					thumbnail:
< 						playlist > link
< 							rel="holding"
< 							href="http://node1.bbcimg.co.uk/iplayer/images/episode/b00hvwp9_640_360.jpg"
< 					-->
< 					<optional_element ref="title" tagname="title" require_attrs="innerHTML" />
< 					<each_element ref="item" tagname="item" require_attrs="kind,identifier">
< 						<if_equal a="programme" b="${item.kind}" />
< 						<!-- TODO - where do these other numbers come from? -->
< 						<!-- the full url here has a ?cb=42483 at the end of it -->
< 						<download url="http://www.bbc.co.uk/mediaselector/4/mtis/stream/${item.identifier}">
< 							<each_element ref="conn" tagname="connection" attrs="kind,server,identifier,href,authString">
< 								<!-- TODO - there are other items in the file for streaming flv versions, etc -->
< 								<rule id="iplayer_directdl">
< 									<if_isset name="${conn.href}" />
< 									<!-- this is encrypted video -->
< 									<if_re string="${conn.href}"> directdl\.iplayer\.bbc\.co\.uk </if_re>
< 									<media url="${conn.href}" description="ENCRYPTED VIDEO" />
< 								</rule>
< 								<rule id="iplayer_subtitles">
< 									<if_isset name="${conn.href}" />
< 									<if_re string="${conn.href}"> live\.xml </if_re>
< 									<media url="${conn.href}" type="subtitles" />
< 								</rule>
< 								<rule id="iplayer_rtmp">
< 									<if_equal a="${conn.kind}" b="akamai" />
< 									<media url="rtmp://92.122.210.174:1935/ondemand?_fcs_vhost=${conn.server}&amp;auth=${conn.authString}=v001&amp;slist=${conn.identifier}" />
< 								</rule>
< 							</each_element>
< 						</download>
< 					</each_element>
< 				</download>
< 			</rule>
< 		</rule>
< 		<rule id="testing.ubuntu">
< 			<if_url host="start.ubuntu.com" inurl="8.10" />
< 			<download url="http://dbatley.com/echo.php?foo=yay">
< 				<media url="http://dbatley.com/test_only" type="txt" />
< 			</download>
diff --new-file --recursive --suppress-common-lines --exclude changes.txt --exclude diff.txt releases/unplug-2.028/source/chrome/content/search/rules.js releases/unplug-2.029/source/chrome/content/search/rules.js
443a444
> 			"string",
448c449
< 			if (!doc)
---
> 			if (data.string || !doc)
464c465
< 					var regresult = reg.exec(text);
---
> 					var regresult = reg.exec(data.string || text);
diff --new-file --recursive --suppress-common-lines --exclude changes.txt --exclude diff.txt releases/unplug-2.028/source/chrome/content/search/search.js releases/unplug-2.029/source/chrome/content/search/search.js
353a354,381
> 			 * ${required:varname}
> 			 */
> 			case "required":
> 				var r = this._subst_apply_functions(parts);
> 				if (r) {
> 					return r;
> 				} else {
> 					throw "Variable gave empty string: " + parts.toSource()
> 				}
> 			/**
> 			 * ${either:var1:var2:....}
> 			 */
> 			case "either":
> 				parts = parts.reverse()
> 				while (parts) {
> 					var p = parts.pop()
> 					var z = "";
> 					try {
> 						z = this._subst_apply_functions([p]);
> 					} catch (e) {
> 						continue;
> 					}
> 					if (z) {
> 						return z;
> 					}
> 				}
> 				return "";
> 			/**
366,368c394,395
< 				var fullstring = this._subst_apply_functions(parts);
< 				var n1 = Number(parts[parts.length-1]);
< 				if (n1 < 0)
---
> 				var n1 = Number(parts.pop())
> 				if (n1 < 0) {
370,375d396
< 				var n2 = Number(parts[parts.length-2]);
< 				parts.pop(); // pop n1
< 				if (n2 === NaN) {
< 					if (n2 < 0)
< 						n2 += fullstring.length;
< 					return String(fullstring).substring(n1);
377,378c398,412
< 				parts.pop(); // pop n2 too
< 				return String(fullstring).substring(n1);
---
> 				var n2 = Number(parts[parts.length-1]);
> 				if (isNaN(n2)) {
> 					// ${substring:start:var}
> 					n2 = null;
> 				} else {
> 					// ${substring:start:end:var}
> 					parts.pop() // pop n2
> 				}
> 				var fullstring = String(this._subst_apply_functions(parts));
> 				if (!n2) {
> 					n2 = fullstring.length;
> 				} else if (n2 < 0) {
> 					n2 += fullstring.length;
> 				}
> 				return fullstring.substring(n1, n2);
420c454,457
< 				return m ? unescape(m[1]) : "";
---
> 				if (!m) {
> 					throw "qparam:" + qname + " is not in " + urlstring;
> 				}
> 				return unescape(m[1]);
436c473
< 				if (parts.length != 5) {
---
> 				if (parts.length != 6) {
438a476
> 				var mediatype = parts[5];
444c482
< 				return this.youku_url(key1, key2, seed, streamid, pieceid);
---
> 				return this.youku_url(mediatype, key1, key2, seed, streamid, pieceid);
510c548
< 	youku_url : (function (key1, key2, randomseed, streamid, piece_num) {
---
> 	youku_url : (function (mediatype, key1, key2, randomseed, streamid, piece_num) {
512a551,552
> 		piece_num = ((parseInt(piece_num) < 10) ? "0" : "") + piece_num;
> 		
538c578
< 		for (var i = 0; i < 11; ++i) {
---
> 		for (var i = 0; i < 8; ++i) {
543,546c583,586
< 		url.push("/st/flv/fileid/");
< 		url.push(fileid.substring(0, 8));
< 		url.push(piece_num);
< 		url.push(fileid.substring(8, fileid.length));
---
> 		url.push("/st/");
> 		url.push(mediatype);
> 		url.push("/fileid/");
> 		url.push(fileid);
548d587
< 		url.push((parseInt(key1, 16) ^ 0xa55aa5a5).toString(16).toLowerCase()); // xor
549a589
> 		url.push((parseInt(key1, 16) ^ 0xa55aa5a5).toString(16).toLowerCase()); // xor
694c734
< 		UnPlug2Search._downloads[dl.reference] = null;
---
> 		UnPlug2Search._downloads[dl.reference].download = null;
705c745
< 		UnPlug2Search._downloads[dl.reference] = null;
---
> 		UnPlug2Search._downloads[dl.reference].download = null;
997a1038,1061
> 							/*
> 							TODO -- new things to implement!
> 							<media
> 							url="http://...../"        # required
> 							
> 							# display options:
> 							description="low quality"  # default "" (used for display only)
> 							thumbnail="http://..../"   # default null
> 							
> 							# file naming options
> 							title="A kitten"           # default -- guess from url or "no title"
> 							type="flv"                 # default -- guess from url or "flv"
> 							certainty="low"            # default "mid" (used to decide which name is "right" when merging duplicates)
> 							
> 							# grouping same media with different quality settings
> 							mediaid="foo"              # default url (used to group media which are the same but are different quality settings
> 							quality="low"              # default "mid" (used to order results)
> 							
> 							# grouping items which are in a playlist
> 							playlist="bar"
> 							
> 							/>
> 							*/
> 							
1022,1024c1086,1087
< 								node.getAttribute("type"),
< 								updated_variables.subst_optional(node.getAttribute("description")),
< 								updated_variables.subst_optional(node.getAttribute("thumbnail")),
---
> 								updated_variables,
> 								node,
1042a1106
> 	 * (no no native objects, etc)
1054,1055c1118,1130
< 	_make_response_object_result : function (nsiuri, download_method, file_ext, description, thumbnailurl, trace) {
< 		var name = UnPlug2Search.get_name(nsiuri.spec);
---
> 	_make_response_object_result : function (nsiuri, download_method, variables, node, trace) {
> 		var levels = { "very-low" : -20, "low" : -10, "mid" : 0, "high" : +10, "very-high" : +20 };
> 		var guesses = UnPlug2Search.guess_from_uri(nsiuri);
> 		var default_quality = 0;
> 		var default_certainty = +10; // high!
> 		
> 		var title = variables.subst_optional(node.getAttribute("title"));
> 		var file_ext = variables.subst_optional(node.getAttribute("type"));
> 		var description = variables.subst_optional(node.getAttribute("description"));
> 		var thumbnailurl = variables.subst_optional(node.getAttribute("thumbnail"));
> 		var certainty = levels[variables.subst_optional(node.getAttribute("certainty"))];
> 		var quality = levels[variables.subst_optional(node.getAttribute("quality"))];
> 		
1059,1062c1134,1150
< 				"name"        : name || "(no name!)",
< 				"url"         : nsiuri.spec, // this is used for advice only (not used for downloading)
< 				"swf"         : (nsiuri.path.indexOf(".swf") >= 0) ? true : false,
< 				"trace"       : trace || "TRACE!?" },
---
> 				"name"        : title || guesses.base_name,
> 				"mediaid"     : variables.subst_optional(node.getAttribute("mediaid")) || null,
> 				"playlistid"  : variables.subst_optional(node.getAttribute("playlistid")) || null,
> 				"certainty"   : certainty === undefined ? default_certainty : certainty,
> 				"quality"     : quality === undefined ? default_quality : quality,
> 				
> 				// IMPORTANT this is used for advice only (not used for downloading) !!
> 				"url"         : nsiuri.spec,
> 				"protocol"    : nsiuri.scheme,
> 				"host"        : guesses.host,
> 				
> 				// more details we may know
> 				"swf"         : ((file_ext || guesses.file_ext) == "swf"), // TODO roll this into file_ext?
> 				"file_ext"    : file_ext || guesses.file_ext || "flv",
> 				"description" : description || null,
> 				"thumbnail"   : thumbnailurl || null,
> 				"trace"       : trace },
1065,1081d1152
< 		// details section ( { "label" : undefined } has odd results, so assign here )
< 		if (description)
< 			result_object.details.description = description;
< 		if (file_ext)
< 			result_object.details.file_ext = file_ext;
< 		if (thumbnailurl)
< 			result_object.details.thumbnail = thumbnailurl;
< 		try {
< 			result_object.details.protocol = nsiuri.scheme
< 		} catch (e) {
< 			// probably will never fail
< 		}
< 		try {
< 			result_object.details.host = nsiuri.host
< 		} catch (e) {
< 			// fails for rtmp links (difference between nsIURI and nsIURL?)
< 		}
1084,1105d1154
< 	
< 	/**
< 	 * Turn a relative url into a full url
< 	 */
< 	_abs_url : function (url, base_url) {
< 		UnPlug2.log("_abs_url is depricaed!");
< 		// TODO - should use nsIURI-type URIs everywhere
< 		UnPlug2.log("URL: " + url + " from base " + base_url);
< 		if (base_url) {
< 			var base_nsiuri = UnPlug2Search.make_uri(base_url);
< 			return UnPlug2Search.make_uri(url, base_nsiuri).spec;
< 		}			
< 		return url;
< 	},
< 	
< 	make_uri : function (uri, base_uri) {
< 		UnPlug2.log("make_uri is depricated");
< 		// TODO - DEPRICATED
< 		var io_service = Components.classes["@mozilla.org/network/io-service;1"]
< 			.getService(Components.interfaces.nsIIOService);
< 		return io_service.newURI(uri, null, base_uri || null);
< 	},
1110,1135c1159,1200
< 	get_name : function (full_url) {
< 		if (full_url.indexOf("#") > 0)
< 			full_url = full_url.substring(0, full_url.indexOf("#"));
< 		// index of last slash (except slashes in query part)
< 		var last_slash = full_url.lastIndexOf("/");
< 		if (full_url.indexOf("?") > 0)
< 			last_slash = full_url.substring(0, full_url.indexOf("?")).lastIndexOf("/");
< 		// take everything after last slash, like foo.flv?foo=bar&woo=y
< 		full_url = full_url.substring(last_slash+1);
< 		// take first 30 chars of nnn?qqqq or take all of nnnnnn
< 		if (full_url.indexOf("?") > 0) {
< 			full_url = full_url.substring(0, Math.max(30, full_url.indexOf("?")));
< 		}
< 		if (!full_url)
< 			return "(no name)"
< 		return full_url;
< 	},
< 	
< 	/**
< 	 * TODO depricated
< 	 */
< 	_subst_node : function (node, attrib, variables) {
< 		throw "_subst_node is depricated!";
< 	},
< 	_subst : function (text, variables) {
< 		throw "_subst is depricated!";
---
> 	guess_from_uri : function (uri) {
> 		/* nsIRUI have scheme, host, port, and path (note: can be "")
> 		 * nsIURL also have a fileName (made of fileBaseName and fileExtension) which can be "" if uri ends in "/". In this case we want to look at the directory which won't have #ref or ?query or ;param.
> 		 */
> 		var data = {
> 			host : "",
> 			file_ext : "",
> 			base_name : "" };
> 		
> 		// the host SHOULD be available in the nsIURI,
> 		// but this raises an exception for unusual protocols!
> 		// there's no guarentee that "host" is meaningful, eg: data links
> 		try {
> 			data.host = nsiuri.hostPort
> 		} catch(e) {
> 			// pass
> 		}
> 		
> 		if (uri instanceof Components.interfaces.nsIURL) {
> 			// these are in nsIURL but not in nsIURI
> 			// easy! but these can be empty strings
> 			data.file_ext = uri.fileExtension;
> 			data.base_name = uri.fileBaseName;
> 		}
> 		if (!data.file_ext || !data.base_name) {
> 			var u = uri.spec;
> 			// trim endings, like #foo ;foo ?foo
> 			u = RegExp("^([^\\?;#]*)([\\?;#]|$)").exec(uri.spec)[1];
> 			// take the last meaningful segment after the final slash
> 			var r = RegExp("(^|/)([^/]+)/*$").exec(u);
> 			if (r) {
> 				u = r[2];
> 				r = RegExp("^(.*)\\.([a-zA-Z0-9]{1,5})$").exec(u);
> 				if (r) {
> 					data.base_name = r[1];
> 					data.file_ext = r[2];
> 				} else {
> 					data.base_name = u;
> 				}
> 			}
> 		}
> 		return data;
1146c1211,1213
< 		window.setInterval(UnPlug2Search.poll, 100);
---
> 		if (!UnPlug2Search._poll_timer) {
> 			UnPlug2Search._poll_timer = window.setInterval(UnPlug2Search.poll, 100);
> 		}
1155c1222
< 			if (UnPlug2Search._downloads[i])
---
> 			if (UnPlug2Search._downloads[i] && UnPlug2Search._downloads[i].download)
1166c1233,1236
< 		var info = { downloads : 0, finished : false };
---
> 		var info = { downloads : 0, finished : false, percent : 0 };
> 		var attempted_downloads = 0;
> 		var active_downloads = 0;
> 		var completed_pct = 0;
1168,1169c1238,1250
< 			if (UnPlug2Search._downloads[i])
< 				info.downloads ++
---
> 			var di = UnPlug2Search._downloads[i];
> 			if (di) {
> 				++attempted_downloads;
> 				if (di.download) {
> 					completed_pct += di.download.percent_complete();
> 					if (di.download.is_complete() == false) {
> 						++active_downloads;
> 					}
> 				} else {
> 					// we cleared the download because it was done
> 					completed_pct += 100;
> 				}
> 			}
1170a1252,1254
> 		info.downloads = active_downloads;
> 		// info.percent = 100 * (attempted_downloads - active_downloads) / (attempted_downloads || 1);
> 		info.percent = completed_pct / (attempted_downloads || 1);
diff --new-file --recursive --suppress-common-lines --exclude changes.txt --exclude diff.txt releases/unplug-2.028/source/install.rdf releases/unplug-2.029/source/install.rdf
6c6
< 		<em:version>2.028</em:version>
---
> 		<em:version>2.029</em:version>
14c14
< 				<em:maxVersion>4.0b2pre</em:maxVersion>
---
> 				<em:maxVersion>4.0b3</em:maxVersion>
Binary files releases/unplug-2.028/unplug.xpi and releases/unplug-2.029/unplug.xpi differ