diff --new-file --recursive --suppress-common-lines releases/unplug-1.901/source/chrome/content/common.js releases/200903171938/source/chrome/content/common.js
94c94
< 	 * return the string
---
> 	 * return a translated version of the string
100c100
< 			return "${" + name + "}";
---
> 			return "#{" + name + "}";
139c139
< 	revision : 200908032205,
---
> 	revision : 200903171938,
diff --new-file --recursive --suppress-common-lines releases/unplug-1.901/source/chrome/content/config.js releases/200903171938/source/chrome/content/config.js
76c76,81
< 		w.document.persist("nav-bar","currentset");
---
> 		if (navtoolbar.getAttribute("currentset")) {
> 			navtoolbar.setAttribute("currentset", navtoolbar.getAttribute("currentset").replace(",unplug2_toolbarbutton", ""));
> 			w.document.persist("nav-bar","currentset");
> 		} else {
> 			alert("Persist failed");
> 		}
81c86,91
< 		w.document.persist("nav-bar","currentset");
---
> 		if (navtoolbar.currentSet) {
> 			navtoolbar.setAttribute("currentset", navtoolbar.getAttribute("currentset") + ",unplug2_toolbarbutton");
> 			w.document.persist("nav-bar","currentset");
> 		} else {
> 			alert("Persist failed");
> 		}
diff --new-file --recursive --suppress-common-lines releases/unplug-1.901/source/chrome/content/overlay.js releases/200903171938/source/chrome/content/overlay.js
32a33,34
> 		// TODO - don't use a flag, just use:
> 		//    window.removeEventListener("load", Flashblock.onInstall, true);
53c55,57
< 		for each (name in [ "toolsmenu", "contextmenu" ]) {
---
> 		var menus = [ "toolsmenu", "contextmenu" ];
> 		for (var i = 0 ; i < menus.length; i++) {
> 			var name = menus[i];
69a74,81
> 	 * Load flashblock workaround, if possible
> 	 */
> 	load_flashblock_workaround : function () {
> 		// TODO - config option here!
> 
> 	},
> 	
> 	/**
diff --new-file --recursive --suppress-common-lines releases/unplug-1.901/source/chrome/content/rules.xml releases/200903171938/source/chrome/content/rules.xml
2c2
< <!DOCTYPE unplug SYSTEM "chrome://unplug/locale/rules.dtd" >
---
> <!DOCTYPE unplug>
6a7
> 		<media url="http://example.com/example_result" description="This is a duplicate" post="NODOWNLOAD" thumbnail="chrome://unplug/skin/unplug-32.png" />
83,84c84,85
< 				<media url="${video.fullPreviewHashLowPath}" description="&desc.quality.low;" thumbnail="${video.fullMedResImagePath}" />
< 				<media url="${video.fullPreviewHashPath}" description="&desc.quality.mid;" 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}" />
116c117
< 			<media url="http://youtube.com/get_video?video_id=${videoid.1}&amp;t=${videoid.2}&amp;fmt=22" description="&desc.quality.hd;" thumbnail="http://i4.ytimg.com/vi/${videoid.1}/default.jpg" />
---
> 			<media url="http://youtube.com/get_video?video_id=${videoid.1}&amp;t=${videoid.2}&amp;fmt=22" description="${translate:hd_quality}" thumbnail="http://i4.ytimg.com/vi/${videoid.1}/default.jpg" />
121c122
< 			<media url="http://youtube.com/get_video?video_id=${videoid.1}&amp;t=${videoid.2}&amp;fmt=${fmt.1}" description="&desc.quality.mid;" thumbnail="http://i4.ytimg.com/vi/${videoid.1}/default.jpg" />
---
> 			<media url="http://youtube.com/get_video?video_id=${videoid.1}&amp;t=${videoid.2}&amp;fmt=${fmt.1}" description="${translate:mid_quality}" thumbnail="http://i4.ytimg.com/vi/${videoid.1}/default.jpg" />
126c127
< 			<media url="http://youtube.com/get_video?video_id=${videoid.1}&amp;t=${videoid.2}&amp;fmt=${fmt.1}" description="&desc.quality.high;" thumbnail="http://i4.ytimg.com/vi/${videoid.1}/default.jpg" />
---
> 			<media url="http://youtube.com/get_video?video_id=${videoid.1}&amp;t=${videoid.2}&amp;fmt=${fmt.1}" description="${translate:high_quality}" thumbnail="http://i4.ytimg.com/vi/${videoid.1}/default.jpg" />
138c139
< 	<rule id="generic_link">
---
> 	<rule id="generic_link" priority="low">
154,155c155,156
< 		<each_element ref="embedelem" tagname="embed" require_attrs="src">
< 			<rule id="embed_wit_media_ext">
---
> 		<each_element ref="embedelem" tagname="embed" require_attrs="src" attrs="flashvars">
> 			<rule id="embed_with_media_ext">
157c158
< 				<media src="${embedelem.src}" />
---
> 				<media url="${embedelem.src}" />
188a190,198
> 			<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>
193,194c203
< 			<!-- TODO case -->
< 			<if_equal case="false" a="${p.name}" b="Filename" />
---
> 			<if_re string="${p.name}" flags="i"> (?:filename|url) </if_re>
209a219,229
> 	<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=${random:float}">
> 				<each_element ref="xmlurl" tagname="url" require_attrs="innerHTML">
> 					<media url="${xmlurl.innerHTML}" />
> 				</each_element>
> 			</download>
> 		</rule>
> 	</rule>
288a309,330
> 	<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>
> 		<if_url ref="u" host="xvideos.com" />
> 		<!-- re-download to sidestep flashblock problems -->
> 		<download url="${u.url}">
> 			<each_re ref="embed" re="(&lt;embed.*?&gt;)">
> 				<if_re ref="vidurl" string="${embed.1}">&amp;amp;flv_url=(.*?)&amp;amp;</if_re>
> 				<optional_re ref="thumburl" string="${embed.1}">&amp;amp;url_bigthumb=(.*?)&amp;amp;</optional_re>
> 				<media url="${vidurl.1}" thumbnail="${thumburl.1}" type="flv" />
> 			</each_re>
> 		</download>
> 	</rule>
diff --new-file --recursive --suppress-common-lines releases/unplug-1.901/source/chrome/content/search.js releases/200903171938/source/chrome/content/search.js
250a251,258
> 			case "random":
> 				if (parts.length != 1)
> 					throw "Cannot parse ${random:...}";
> 				switch (parts[0]) {
> 					case "float":
> 						return Math.random();
> 				}
> 				throw "Unknown ${random:...} " + parts[0];
256a265,268
> 			case "translate":
> 				if (parts.length != 1)
> 					throw "Invalid length for ${translate:...}";
> 				return UnPlug2.str(parts[0]);
diff --new-file --recursive --suppress-common-lines releases/unplug-1.901/source/chrome/content/searchpage.js releases/200903171938/source/chrome/content/searchpage.js
141a142,152
> 			
> 			var duplicate_elem = reselem.checkDuplicates(reselem.parentNode);
> 			if (duplicate_elem) {
> 				if (!UnPlug2.get_pref("show_duplicates", false)) {
> 					var things_to_copy = ["thumbnail", "description"];
> 					for (var j=0; j < things_to_copy.length; j++) {
> 						duplicate_elem.setAttribute(things_to_copy[j], duplicate_elem.getAttribute(things_to_copy[j]) || reselem.getAttribute(things_to_copy[j]));
> 					}
> 					reselem.parentNode.removeChild(reselem);
> 				}
> 			}
diff --new-file --recursive --suppress-common-lines releases/unplug-1.901/source/chrome/content/widgets/unplug_result.xbl releases/200903171938/source/chrome/content/widgets/unplug_result.xbl
93a94,111
> 			<method name="checkDuplicates">
> 				<parameter name="p"/>
> 				<body>
> 					var thiselem = this;
> 					var reslist = p.getElementsByTagName("unplug_result");
> 					for (var i=0; i &lt; reslist.length; i++) {
> 						var elem = reslist[i];
> 						if (elem === thiselem) {
> 							continue;
> 						}
> 						if (elem.url == thiselem.url &amp;&amp; elem.post == thiselem.post) {
> 							// this is a duplicate: remove thiselem
> 							return elem;
> 						}
> 					}
> 					return false;
> 				</body>
> 			</method>
diff --new-file --recursive --suppress-common-lines releases/unplug-1.901/source/chrome/locale/en-US/config.dtd releases/200903171938/source/chrome/locale/en-US/config.dtd
47c47
< <!ENTITY privacy.popcontest "Submit information on which websites UnPlug is used on">
---
> <!ENTITY privacy.popcontest "Submit information on which websites you use UnPlug on">
49,50c49,50
< <!ENTITY privacy.infolink "Privacy information">
< <!ENTITY privacy.infolink.a "P">
---
> <!ENTITY privacy.infolink "About this">
> <!ENTITY privacy.infolink.a "A">
diff --new-file --recursive --suppress-common-lines releases/unplug-1.901/source/chrome/locale/en-US/rules.dtd releases/200903171938/source/chrome/locale/en-US/rules.dtd
1,13d0
< <!--
< This is the dtd file for rules.xul
< 
< Created 03/06/06 by djb
< 
< No translation needed.
< -->
< 
< <!ENTITY desc.quality.hd   "High definition">
< <!ENTITY desc.quality.high "High quality">
< <!ENTITY desc.quality.mid  "Normal quality">
< <!ENTITY desc.quality.low  "Low quality">
< 
diff --new-file --recursive --suppress-common-lines releases/unplug-1.901/source/chrome/locale/en-US/strings.txt releases/200903171938/source/chrome/locale/en-US/strings.txt
16a17,21
> # for rules.xml
> high_quality=High quality
> low_quality=Low quality
> mid_quality=Normal quality
> hd_quality=High definition
diff --new-file --recursive --suppress-common-lines releases/unplug-1.901/source/install.rdf releases/200903171938/source/install.rdf
19,20c19,20
< 		<em:name>UnPlug 2.0 Alpha</em:name>
< 		<em:description>UnPlug 2.0 Developers' version</em:description>
---
> 		<em:name>UnPlug</em:name>
> 		<em:description>Find and download media from websites</em:description>
diff --new-file --recursive --suppress-common-lines releases/unplug-1.901/source/todo.txt releases/200903171938/source/todo.txt
4c4,6
< Fix pop_contest db -- add date to PK. Fix navigator.useragent.
---
> Implement flashblock workaround -- perhaps <each_embed>?
> 	// flashblock <div>s have .getAttribute("srcAttribute") for .src
> 	document.getElementsByTagName("div")[0].getAttribute("srcAttribute")
6,7c8,9
< Migration-assistant - add to welcome tab in config
< (this should probably be moved to 2.1 because no media player integration, etc)
---
> Implement some sort of each_element for .text, not just .doc
> This gives us a different flashblock workaround: re-downloading ${.url}
11,14d12
< Fill in <media>.type from filename extension (if none was given) in UnPlug2Search and display/use this hint in UnPlug2SearchPage
< 
< Implement flashblock workaround -- perhaps <each_embed>?
< 
17,20d14
< handle exotic types in <media> (mms://, rtsp://, ...)
< 
< Implement <rule>s for lots of sites.
< 
23c17
< Tell people that menu config is applied next restart.
---
> Tell people when menu config is applied next restart.
33a28,31
> Migration-assistant - copy media player config
> 
> handle exotic types in <media> (mms://, rtsp://, ...)
> 
38c36,37
< <each_amf_string>, <each_swf_string> + binary downloads
---
> Fill in <media>.type from filename extension (if none was given) in UnPlug2Search and display/use this hint in UnPlug2SearchPage
> 
39a39,42
> For UnPlug 2.2 ["Sprawl"]
> =========================
> 
> <each_amf_string>, <each_swf_string> + binary downloads
Binary files releases/unplug-1.901/unplug.xpi and releases/200903171938/unplug.xpi differ