Binary files releases/unplug-2.002/source/chrome/content/.overlay.js.swp and releases/unplug-2.003/source/chrome/content/.overlay.js.swp differ
diff --new-file --recursive --suppress-common-lines --exclude changes.txt --exclude diff.txt releases/unplug-2.002/source/chrome/content/common.js releases/unplug-2.003/source/chrome/content/common.js
135c135
< 	version  : 2.002,
---
> 	version  : 2.003,
139c139
< 	revision : 200904100034,
---
> 	revision : 200904110041,
diff --new-file --recursive --suppress-common-lines --exclude changes.txt --exclude diff.txt releases/unplug-2.002/source/chrome/content/rules.js releases/unplug-2.003/source/chrome/content/rules.js
171c171
< 					value = node.textContent;
---
> 					value = UnPlug2.trim(node.textContent);
269,270c269
< 		required  : ["innerHTML"],
< 		optional  : ["string", "flags", "tagname"],
---
> 		optional  : ["string", "flags", "tagname", "innerHTML", "re"],
273c272,276
< 			var re = RegExp(data.innerHTML, data.flags);
---
> 			if (!data.innerHTML && !data.re) {
> 				throw "Needs innerHTML or re in if_re";
> 			}
> 			
> 			var re = RegExp(data.re || data.innerHTML, data.flags);
281c284
< 					if (r)
---
> 					if (r) {
282a286
> 					}
diff --new-file --recursive --suppress-common-lines --exclude changes.txt --exclude diff.txt releases/unplug-2.002/source/chrome/content/rules.xml releases/unplug-2.003/source/chrome/content/rules.xml
94c94
< 			"video_id": "([^"]+)".*?"t": "([^"]+)"
---
> 			&quot;video_id&quot;\s*:\s*&quot;([^&quot;]+)&quot;.*?&quot;t&quot;\s*:\s*&quot;([^&quot;]+)&quot;
102c102
< 			<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" />
---
> 			<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" type="mp4" />
106,107c106,108
< 			<if_re tagname="script" ref="fmt"> "fmt_map"\s*:\s*"(?:[^"]+,)?(5)/ </if_re>
< 			<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" />
---
> 			<each_re tagname="script" ref="fmt" re="&quot;fmt_map&quot;\s*:\s*&quot;(?:[^&quot;]+,)?(5)/">
> 				<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" type="flv" />
> 			</each_re>
111,112c112,115
< 			<if_re tagname="script" ref="fmt"> "fmt_map"\s*:\s*"(?:[^"]+,)?(34|35|18)/ </if_re>
< 			<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" />
---
> 			<!-- flv: 35, 4, 34, 5 -->
> 			<each_re tagname="script" ref="fmt" re="&quot;fmt_map&quot;\s*:\s*&quot;(?:[^&quot;]+,)?(34|35|18)/">
> 				<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" type="flv" />
> 			</each_re>
245a249,283
> 		<rule id="2.dailymotion.com">
> 			<if_url host="dailymotion.com"/>
> 			<if_re ref="urllist" re="addVariable\(&quot;video&quot;,\s*&quot;([^&quot;]+?)&quot;\)" />
> 			<optional_re ref="thumb" re="addVariable\(&quot;preview&quot;,\s*&quot;([^&quot;]+?)&quot;\)" />
> 			<each_re ref="urlitem" string="${urldecode:urllist.1}" re="(?:^|\|)(.*?)@@(.*?)(?:$|\|)">
> 				<rule id="2.dailymotion.com.spark">
> 					<if_equal a="${urlitem.2}" b="spark" />
> 					<media url="${urlitem.1}" description="${translate:mid_quality} - ${urlitem.2}" thumbnail="${urldecode:thumb.1}" type="flv" />
> 				</rule>
> 				<rule id="2.dailymotion.com.spak-mini">
> 					<if_equal a="${urlitem.2}" b="spak-mini" />
> 					<media url="${urlitem.1}" description="${translate:low_quality} - ${urlitem.2}" thumbnail="${urldecode:thumb.1}" type="flv" />
> 				</rule>
> 				<rule id="2.dailymotion.com.v6-hd">
> 					<if_equal a="${urlitem.2}" b="vp6-hd" />
> 					<media url="${urlitem.1}" description="${translate:hd_quality} - ${urlitem.2}" thumbnail="${urldecode:thumb.1}" type="vp6" />
> 				</rule>
> 				<rule id="2.dailymotion.com.vp6-hq">
> 					<if_equal a="${urlitem.2}" b="vp6-hq" />
> 					<media url="${urlitem.1}" description="${translate:high_quality} - ${urlitem.2}" thumbnail="${urldecode:thumb.1}" type="vp6" />
> 				</rule>
> 				<rule id="2.dailymotion.com.vp6">
> 					<if_equal a="${urlitem.2}" b="vp6" />
> 					<media url="${urlitem.1}" description="${translate:mid_quality} - ${urlitem.2}" thumbnail="${urldecode:thumb.1}" type="vp6" />
> 				</rule>
> 				<rule id="2.dailymotion.com.h264">
> 					<if_equal a="${urlitem.2}" b="h264" />
> 					<media url="${urlitem.1}" description="${translate:mid_quality} - ${urlitem.2}" thumbnail="${urldecode:thumb.1}" type="h264" />
> 				</rule>
> 				<rule id="2.dailymotion.com.default">
> 					<!-- catch-all which duplicates all of those above -->
> 					<media url="${urlitem.1}" description="${urlitem.2}" thumbnail="${urldecode:thumb.1}" />
> 				</rule>
> 			</each_re>
> 		</rule>
307,329d344
< 	<rule id="dailymotion.com">
< 		<!-- dailymotion.com, on their website -->
< 		<if_url host="dailymotion.com" />
< 		<!-- they have cdata tags so innerhtml won't work. We can get the text by re-downloading the page, so we can search the .text directly -->
< 		<!-- .url is the current url -->
< 		<download url="${.url}">
< 			<if_re ref="allvidurls">
< 				addVariable\("video", "([^"]+)"\)
< 			</if_re>
< 			<rule>
< 				<if_re ref="spark" string="${allvidurls.1}"> (%2Fget%2F.*?)%40%40spark </if_re>
< 				<media url="${urldecode:spark.1}" description="Spark" />
< 			</rule>
< 			<rule>
< 				<if_re ref="vp6" string="${allvidurls.1}"> (%2Fget%2F.*?)%40%40vp6 </if_re>
< 				<media url="${urldecode:vp6.1}" description="VP6" />
< 			</rule>
< 			<rule>
< 				<if_re ref="h264" string="${allvidurls.1}"> (%2Fget%2F.*?)%40%40h264 </if_re>
< 				<media url="${urldecode:h264.1}" description="H264" />
< 			</rule>
< 		</download>
< 	</rule>
diff --new-file --recursive --suppress-common-lines --exclude changes.txt --exclude diff.txt releases/unplug-2.002/source/chrome/content/search.js releases/unplug-2.003/source/chrome/content/search.js
50c50,54
< 	this._xmlhttp.addEventListener("progress", function (evt) { realthis._internal_callback_progress(evt); }, false);
---
> 	try {
> 		this._xmlhttp.addEventListener("progress", function (evt) { realthis._internal_callback_progress(evt); }, false);
> 	} catch (e) {
> 		// pass -- fails for ff 2.0
> 	}
881,882c885,890
< 		// take 30 characters, like foo.flv?foo=bar&woo=y
< 		full_url = full_url.substring(last_slash+1, last_slash+30);
---
> 		// 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("?")));
> 		}
diff --new-file --recursive --suppress-common-lines --exclude changes.txt --exclude diff.txt releases/unplug-2.002/source/chrome/content/searchpage.js releases/unplug-2.003/source/chrome/content/searchpage.js
206,208c206
< 			var dest = "/home/user/DELETEME";
< 			var name = reselem.getAttribute("title", "").replace(RegExp("[^\\w\\s]+", "g"), "_");
< 			var file = UnPlug2SearchPage._save_as_box(name, reselem.getAttribute("type"));
---
> 			var file = UnPlug2SearchPage._save_as_box(reselem.getAttribute("title"), reselem.getAttribute("type"));
211c209,212
< 			UnPlug2SearchPage._download_with_downloadmgr(source_url, file);
---
> 			
> 			if (false)
> 				UnPlug2SearchPage._download_with_downloadmgr(source_url, file.file);
> 			UnPlug2SearchPage._download_ff2_version(source_url, file.fileURL);
213a215
> 			alert("saveas " + e);
216a219,252
> 	_download_ff2_version : function (url, file) {
> 		var nsiurl = Components.classes["@mozilla.org/network/io-service;1"].
> 			getService(Components.interfaces.nsIIOService).
> 			newURI(url, null, null);
> 		
> 		var persistArgs = {
> 			source      : nsiurl,
> 			contentType : "application/octet-stream",
> 			target      : file,
> 			postData    : null,
> 			bypassCache : false
> 		};
> 
> 		// var persist = makeWebBrowserPersist();
> 		var persist = Components.classes["@mozilla.org/embedding/browser/nsWebBrowserPersist;1"].
> 			createInstance(Components.interfaces.nsIWebBrowserPersist);
> 
> 		// Calculate persist flags.
> 		const nsIWBP = Components.interfaces.nsIWebBrowserPersist;
> 		persist.persistFlags = (
> 			nsIWBP.PERSIST_FLAGS_REPLACE_EXISTING_FILES |
> 			nsIWBP.PERSIST_FLAGS_FROM_CACHE |
> 			nsIWBP.PERSIST_FLAGS_AUTODETECT_APPLY_CONVERSION );
> 
> 		// Create download and initiate it (below)
> 		var tr = Components.classes["@mozilla.org/transfer;1"].createInstance(Components.interfaces.nsITransfer);
> 
> 		tr.init(persistArgs.source, persistArgs.target, "", null, null, null, persist);
> 
> 		persist.progressListener = tr;
> 		var aReferrer = persistArgs.source;
> 		persist.saveURI(persistArgs.source, null, aReferrer, persistArgs.postData, null, persistArgs.target);
> 	},
> 	
220a257,276
> 		// make string, strip whitespace
> 		name = (name || "no name").replace(RegExp("(^\\s|\\s$)", "g"), "");
> 		ext = (ext || "").replace(RegExp("(^\\s+|\\s+$)", "g"), "");
> 		
> 		// look for .ext in name
> 		if (!ext) {
> 			var ext_re = RegExp("\\.(\\w{1,5})$");
> 			var ext_match = ext_re.exec(name);
> 			if (ext_match) {
> 				ext = ext_match[1];
> 				name = name.replace(ext_re, "");
> 			} else {
> 				ext = "ext"; // fallback
> 			}
> 		}
> 		
> 		// replace non-letter characters with "_"
> 		name = name.replace(RegExp("[^\\w\\s]+", "g"), "_");
> 		ext = ext.replace(RegExp("[^\\w\\s]+", "g"), "_");
> 		
224,225c280
< 		name = name || "no name";
< 		ext = ext || "ext";
---
> 		
234c289
< 		return filepicker.file;
---
> 		return { "file" : filepicker.file, "fileURL" : filepicker.fileURL };
diff --new-file --recursive --suppress-common-lines --exclude changes.txt --exclude diff.txt releases/unplug-2.002/source/chrome/content/widgets/unplug_result.xbl releases/unplug-2.003/source/chrome/content/widgets/unplug_result.xbl
43a44
> 					var change_text = false;
56a58
> 							change_text = true;
64a67,69
> 					if (change_text) {
> 						open_btn.setAttribute("label", default_open.getAttribute("label"));
> 					}
diff --new-file --recursive --suppress-common-lines --exclude changes.txt --exclude diff.txt releases/unplug-2.002/source/chrome/locale/en-US/strings.txt releases/unplug-2.003/source/chrome/locale/en-US/strings.txt
26a27
> 
diff --new-file --recursive --suppress-common-lines --exclude changes.txt --exclude diff.txt releases/unplug-2.002/source/defaults/preferences/unplug2.js releases/unplug-2.003/source/defaults/preferences/unplug2.js
5c5
< pref("extensions.unplug2.opener", "tab");
---
> pref("extensions.unplug2.opener", "copyurl");
diff --new-file --recursive --suppress-common-lines --exclude changes.txt --exclude diff.txt releases/unplug-2.002/source/install.rdf releases/unplug-2.003/source/install.rdf
6c6
< 		<em:version>2.002</em:version>
---
> 		<em:version>2.003</em:version>
Binary files releases/unplug-2.002/unplug.xpi and releases/unplug-2.003/unplug.xpi differ