diff --new-file --recursive --suppress-common-lines releases/unplug-1.902/source/chrome/content/common.js releases/unplug-2.000/source/chrome/content/common.js
139c139
< 	revision : 200903280009,
---
> 	revision : 200903312332,
diff --new-file --recursive --suppress-common-lines releases/unplug-1.902/source/chrome/content/config.js releases/unplug-2.000/source/chrome/content/config.js
44a45
> 	document.getElementById("version").setAttribute("value", "Version: " + UnPlug2.version.toFixed(3) + " (" + UnPlug2.codename + ") " + UnPlug2.revision);
diff --new-file --recursive --suppress-common-lines releases/unplug-1.902/source/chrome/content/config.xul releases/unplug-2.000/source/chrome/content/config.xul
115a116
> 				<label id="version" />
diff --new-file --recursive --suppress-common-lines releases/unplug-1.902/source/chrome/content/rules.xml releases/unplug-2.000/source/chrome/content/rules.xml
4,8d3
< 	<rule id="show_all_test">
< 		<if_config name="show_all" value="true" />
< 		<media url="http://example.com/example_result" description="You have enabled showing additional results." post="NODOWNLOAD" />
< 		<media url="http://example.com/example_result" description="This is a duplicate" post="NODOWNLOAD" thumbnail="chrome://unplug/skin/unplug-32.png" />
< 	</rule>
36,76d30
< 	<rule id="bbciplayer">
< 		<if_config name="show_all" value="true" />
< 		<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>
85,92c39,48
< 		<download url="http://www.veoh.com/rest/video/${videoid.1}/details">
< 			<each_element ref="video" tagname="video" attrs="fullPreviewHashLowPath,fullPreviewHashPath,ipodLink,fullMedResImagePath,description">
< 				<!-- TODO this ipod one doesn't seem to work -->
< 				<media url="${video.ipodLink}" description="mp4" thumbnail="${video.fullMedResImagePath}" />
< 				<media url="${video.fullPreviewHashLowPath}" description="${translate:low_quality}" thumbnail="${video.fullMedResImagePath}" />
< 				<media url="${video.fullPreviewHashPath}" description="${translate:mid_quality}" thumbnail="${video.fullMedResImagePath}" />
< 			</each_element>
< 		</download>
---
> 		<rule id="veoh" target="veoh">
> 			<download url="http://www.veoh.com/rest/video/${videoid.1}/details">
> 				<each_element ref="video" tagname="video" attrs="fullPreviewHashLowPath,fullPreviewHashPath,ipodLink,fullMedResImagePath,description">
> 					<!-- TODO this ipod one doesn't seem to work -->
> 					<media url="${video.ipodLink}" description="mp4" thumbnail="${video.fullMedResImagePath}" />
> 					<media url="${video.fullPreviewHashLowPath}" description="${translate:low_quality}" thumbnail="${video.fullMedResImagePath}" />
> 					<media url="${video.fullPreviewHashPath}" description="${translate:mid_quality}" thumbnail="${video.fullMedResImagePath}" />
> 				</each_element>
> 			</download>
> 		</rule>
149a106,115
> 			<rule id="a.multiply.com">
> 				<!-- replace this with flash player one. -->
> 				<if_url host="multiply.com" />
> 				<if_re string="${qparam:xurl:alink.href}"> /playlist/ </if_re>
> 				<playlist url="${qparam:xurl:alink.href}" type="m3u">
> 					<each_re ref="m3u" re="(.+)">
> 						<media url="${m3u.1}" />
> 					</each_re>
> 				</playlist>
> 			</rule>
172,176d137
< 				<rule id="TEST_ONLY">
< 					<!-- TODO delete this rule! -->
< 					<if_url host="localhost" port="5555" />
< 					<media url="${embedelem.src}" description="${embedelem.flashvars}"/>
< 				</rule>
180a142,148
> 				<rule id="embed.veoh.com">
> 					<if_re string="${embedelem.src}"> veohplayer\.swf </if_re>
> 					<rule>
> 						<if_re string="${htmldecode:embedelem.src}" ref="videoid"> (?:\?|&amp;)permalinkId=([^&amp;]+) </if_re>
> 						<rule goto="veoh" />
> 					</rule>
> 				</rule>
222c190
< 					<rule apply="vimeodownload" />
---
> 					<rule goto="vimeodownload" />
273d240
< 	<!--
276d242
< 		grab the video id
282,288d247
< 	-->
< 	<rule id="DELME.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>
< 	</rule>
294c253
< 		<rule id="vimeodownload" applytarget="vimeodownload">
---
> 		<rule id="vimeodownload" target="vimeodownload">
394a354,460
> 	<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>
> 	<!--
> 	=====================================================================
> 	NOTICE: rules below this line are for testing only
> 	=====================================================================
> 	-->
> 	<rule id="show_all">
> 		<if_config name="show_all" value="true" />
> 		<rule id="test_only">
> 			<media url="http://example.com/example_result" description="You have enabled showing additional results." post="NODOWNLOAD" />
> 			<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>
> 		</rule>
> 	</rule>
diff --new-file --recursive --suppress-common-lines releases/unplug-1.902/source/chrome/content/search.js releases/unplug-2.000/source/chrome/content/search.js
264c264,274
< 				return this._subst_apply_functions(parts).replace("&amp;", "&");
---
> 				return this._subst_apply_functions(parts).replace(
> 					/&(.*?);/g,
> 					function (str, m, offset, s) {
> 						switch (m) {
> 							case "amp": return "&";
> 							case "quot": return "\"";
> 						}
> 						if (m[0] == "#")
> 							return String.fromCharCode(m.substr(1));
> 						throw "Unknown htmldecode: entity " + m;
> 					});
738c748
< 							if (node.hasAttribute("apply")) {
---
> 							if (node.hasAttribute("goto")) {
740c750
< 								referenced_node = UnPlug2.get_element(UnPlug2Search.get_rules_xml(), "rule", node.getAttribute("apply"));
---
> 								referenced_node = UnPlug2.get_element(UnPlug2Search.get_rules_xml(), "rule", node.getAttribute("goto"));
742c752
< 									throw "Cannot find node to apply " + node.getAttribute("apply");
---
> 									throw "Cannot find node to goto " + node.getAttribute("goto");
diff --new-file --recursive --suppress-common-lines releases/unplug-1.902/source/chrome/skin/searchpage.css releases/unplug-2.000/source/chrome/skin/searchpage.css
51a52,55
> #stop_button {
> 	list-style-image: url("moz-icon://stock/gtk-stop?size=menu");
> }
> 
diff --new-file --recursive --suppress-common-lines releases/unplug-1.902/source/todo.txt releases/unplug-2.000/source/todo.txt
1,6c1,2
< For UnPlug 2.0 ["Chiba"]
< ========================
< 
< More websites! More!
< 
< Add icon on stop button
---
> For UnPlug 2.05 ["Clinic"]
> =========================
10,24c6
< 
< Implement flashblock workaround -- perhaps <each_embed>?
< 	// flashblock <div>s have .getAttribute("srcAttribute") for .src
< 	document.getElementsByTagName("div")[0].getAttribute("srcAttribute")
< 
< Flashblock workaround
<   If we want to use flashblock workabout and flash has been blocked, then...
<     * Get original source from somewhere - load from cache with BrowserReloadWithFlags(reloadFlags) or PageLoader.loadPage() ??
<     * Set text representation to this (note - this loses dynamic changes we pick up with the dom serializer object)
<     * Feed it to the slow version of each_element
< 
< 
< 
< For UnPlug 2.05 ["Clinic"]
< =========================
---
> suggest name in "Save as..." option (esp for .flv)
diff --new-file --recursive --suppress-common-lines releases/unplug-1.902/source/todo.txt~ releases/unplug-2.000/source/todo.txt~
1,44d0
< For UnPlug 2.0 ["Chiba"]
< ========================
< 
< Implement flashblock workaround -- perhaps <each_embed>?
< 	// flashblock <div>s have .getAttribute("srcAttribute") for .src
< 	document.getElementsByTagName("div")[0].getAttribute("srcAttribute")
< 
< Implement some sort of each_element for .text, not just .doc
< This gives us a different flashblock workaround: re-downloading ${.url}
< 
< Add icon on stop button
< 
< More finely-grained optional/required attributes in UnPlug2Rules -- eg <if_re text="..." is optional, but should fail rule if it exists but is ""/error. -- name "failable"?
< 
< Rules documentation
< 
< Tell people when menu config is applied next restart.
< 
< 
< 
< For UnPlug 2.1 ["Tokyo"]
< ========================
< 
< Non-en-US locales
< 
< Add <playlist> ability
< 
< Migration-assistant - copy media player config, then UnPlug._prefs.resetBranch(old_settings_base)!
< 
< 
< handle exotic types in <media> (mms://, rtsp://, ...)
< 
< Implement (media) players, with "search for media players" config
< 
< Write your own rules more easily
< 
< Fill in <media>.type from filename extension (if none was given) in UnPlug2Search and display/use this hint in UnPlug2SearchPage
< 
< 
< For UnPlug 2.2 ["Sprawl"]
< =========================
< 
< <each_amf_string>, <each_swf_string> + binary downloads
< 
Binary files releases/unplug-1.902/unplug.xpi and releases/unplug-2.000/unplug.xpi differ