diff --new-file --recursive --suppress-common-lines --exclude changes.txt --exclude diff.txt releases/unplug-2.029/source/chrome/content/common.js releases/unplug-2.030/source/chrome/content/common.js
135c135
< 	version  : 2.029,
---
> 	version  : 2.030,
139c139
< 	revision : 201008090205,
---
> 	revision : 201008150338,
diff --new-file --recursive --suppress-common-lines --exclude changes.txt --exclude diff.txt releases/unplug-2.029/source/chrome/content/rules.xml releases/unplug-2.030/source/chrome/content/rules.xml
51a52
> 		<priority level="very-low">contentabc.com</priority>
205,213d205
< 	<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>
246c238
< 		<!-- TODO unchecked -->
---
> 		<!-- TODO broken -->
280d271
< 		<!-- TODO unchecked -->
283c274
< 			<if_re ref="vidid" string="${url.path}"> /(\d+) </if_re>
---
> 			<if_re ref="vidid" string="${url.path}" re="\-(\d+)$" />
286c277
< 					<media url="${flvurl.innerHTML}" />
---
> 					<media url="${flvurl.innerHTML}" type="flv" title="${origtitle.innerHTML}" thumbnail="http://km-pics.phncdn.com/thumbs/${substring:-9:-6:leftpad:0:10:vidid.1}/${substring:-6:-3:leftpad:0:10:vidid.1}/${substring:-3:end:leftpad:0:10:vidid.1}/small.jpg" />
291,298d281
< 	<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>
313d295
< 		<!-- TODO unchecked -->
316c298
< 			<if_re ref="videoid" string="${url.url}"> /video/(\d+) </if_re>
---
> 			<if_re ref="videoid" string="${url.url}" re="/video/(\d+)" />
318,319c300,301
< 				<!-- TODO - not always available? -->
< 				<media url="http://media.revver.com/qt;download/${videoid.1}.mov" />
---
> 				<optional_re ref="title" re="&lt;h1 id=&quot;video-title&quot;&gt;Megaman Battle Network - vs Woodman &lt;/h1&gt;" />
> 				<media url="http://media.revver.com/qt;download/${videoid.1}.mov" title="${either:title.1:origtitle.innerHTML}" type="mov" thumbnail="http://frame.revver.com/frame/120x90/${videoid.1}.jpg" />
401c383
< 				<rule id="metacafe">
---
> 				<rule id="embed.metacafe">
427c409
< 				<rule id="adultmult.ru">
---
> 				<rule id="embed.adultmult.ru">
437c419
< 					<!-- TODO unchecked -->
---
> 					<!-- also normal site -->
439c421,422
< 					<media url="${qparam:flv_url:htmldecode:embedelem.flashvars}" thumbnail="${qparam:url_bigthumb:htmldecode:embedelem.flashvars}" type="flv" />
---
> 					<optional_re ref="title" re="&lt;strong&gt;([^&lt;&gt;]+)&lt;/strong&gt;&lt;strong&gt; \- &lt;/strong&gt;\s*\d+ min" />
> 					<media url="${qparam:flv_url:htmldecode:embedelem.flashvars}" thumbnail="${qparam:url_bigthumb:htmldecode:embedelem.flashvars}" type="flv" title="${either:title.1:origtitle.innerHTML}" />
441c424
< 				<rule id="videmo">
---
> 				<rule id="embed.videmo">
450,451c433
< 				<rule id="myspace">
< 					<!-- TODO unchecked -->
---
> 				<rule id="embed.myspace-2010-lads">
453,458c435,446
< 					<download url="http://mediaservices.myspace.com/services/rss.ashx?videoID=${m.1}&amp;type=video">
< 						<optional_element ref="title" tagname="title" attrs="innerHTML" />
< 						<optional_element ref="thumb" tagname="media:thumbnail" attrs="url" />
< 						<if_element ref="content" tagname="media:content" require_attrs="url" />
< 						<media url="${content.url}" thumbnail="${thumb.url}" type="flv" description="${title.innerHTML}" />
< 					</download>
---
> 					<rule goto="embed.myspace" />
> 				</rule>
> 				<rule id="embed.myspace-2010-mservice">
> 					<if_re string="${embedelem.src}" re="mediaservices\.myspace\.com/services/media/embed.aspx/m=(\d+)," ref="m" />
> 					<rule id="embed.myspace">
> 						<download url="http://mediaservices.myspace.com/services/rss.ashx?videoID=${m.1}&amp;type=video">
> 							<optional_element ref="title" tagname="myspace:videodescription" attrs="innerHTML" />
> 							<optional_element ref="thumb" tagname="media:thumbnail" attrs="url" />
> 							<if_element ref="content" tagname="media:content" require_attrs="url" />
> 							<media url="${content.url}" thumbnail="${thumb.url}" type="flv" title="${title.innerHTML}" />
> 						</download>
> 					</rule>
500a489,493
> 				<rule id="metacafe-param-2010">
> 					<if_url host="metacafe.com" />
> 					<if_equal a="${p.name}" b="flashvars" />
> 					<media url="${qparam:mediaURL:p.value}?__gda__=${qparam:gdaKey:p.value}" mediaid="metacafe-${qparam:itemID:p.value}" title="${urldecode:qparam:title:p.value}" type="flv" />
> 				</rule>
502c495
< 		</rule>
---
> 		</rule><!-- each param -->
505d497
< 			<!-- TODO unchecked -->
508c500,501
< 			<media url="${urldecode:loc.1}" type="flv" />
---
> 			<ifnot_url host="metacafe.com" />
> 			<media url="${urldecode:loc.1}" type="flv" title="${origtitle.innerHTML}" certainty="mid" />
558c551,552
< 				<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">
---
> 				<optional_re ref="session" re="window.ajax_session_info = 'session_token=(.*?)';" />
> 				<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=${optional:urlencode:session.1}&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">
562c556
< 						<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">
---
> 						<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=${optional:session.1}&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">
683a678
> 			<optional_element tagname="h1" require_attrs="innerHTML" ref="h1" />
688c683
< 					<media url="${flv_url.innerHTML}" type="flv" thumbnail="http://ph-pics.phncdn.com/thumbs/${thumbpart.1}/small.jpg" />
---
> 					<media url="${flv_url.innerHTML}" type="flv" thumbnail="http://ph-pics.phncdn.com/thumbs/${thumbpart.1}/small.jpg" title="${either:h1.innerHTML:origtitle.innerHTML}" />
693d687
< 			<!-- TODO unchecked -->
696a691
> 			<optional_re ref="title" re="&lt;span class=&quot;name&quot;&gt;([^&lt;&gt;]+)&lt;/span&gt;\s*&lt;/h1&gt;" />
706,707c701
< 						<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!? -->
---
> 						<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" title="${either:title.1:origtitle.innerHTML}-${piece.1}" />
714c708,709
< 						<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" />
---
> 						<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" title="${either:title.1:origtitle.innerHTML}-${piece.1}" />
> 
diff --new-file --recursive --suppress-common-lines --exclude changes.txt --exclude diff.txt releases/unplug-2.029/source/chrome/content/search/search.js releases/unplug-2.030/source/chrome/content/search/search.js
367d366
< 				parts = parts.reverse()
395,397d393
< 				if (n1 < 0) {
< 					n1 += fullstring.length;
< 				}
399c395,398
< 				if (isNaN(n2)) {
---
> 				if (parts[parts.length-1] == "end") {
> 					n2 = null;
> 					parts.pop();
> 				} else if (isNaN(n2)) {
406a406,408
> 				if (n1 < 0) {
> 					n1 += fullstring.length;
> 				}
431a434,448
> 			 * ${padprefix:pad_char:size:variable}
> 			 * Adds pad_char to the left of variable until it is at least size long
> 			 */
> 			case "leftpad":
> 				var prefixvalue = parts.pop()
> 				var len = Number(parts.pop())
> 				var value = this._subst_apply_functions(parts);
> 				if (prefixvalue.length != 1)
> 					throw "char must be length 1 in ${padleft}";
> 				if (!len)
> 					throw "Invalid size in ${padleft}";
> 				while (value.length < len)
> 					value = prefixvalue + value;
> 				return value;
> 			/**
586c603,605
< 		url.push(fileid);
---
> 		url.push(fileid.substring(0, 8));
> 		url.push(piece_num);
> 		url.push(fileid.substring(10, fileid.length));
1029a1049,1055
> 							var post = "";
> 							if (node.hasAttribute("post")) {
> 								post = updated_variables.subst_optional(node.getAttribute("post"))
> 								if (!post) {
> 									throw "Post data failed";
> 								}
> 							}
1032c1058
< 								updated_variables.subst_optional(node.getAttribute("post")),
---
> 								post,
diff --new-file --recursive --suppress-common-lines --exclude changes.txt --exclude diff.txt releases/unplug-2.029/source/install.rdf releases/unplug-2.030/source/install.rdf
2,27c2,21
< 
< <RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:em="http://www.mozilla.org/2004/em-rdf#">
< 	<Description about="urn:mozilla:install-manifest">
< 		<em:id>unplug@compunach</em:id>
< 		<em:version>2.029</em:version>
< 		<em:type>2</em:type> <!-- extension -->
< 		
< 		<!-- Target Application this extension can install into, with minimum and maximum supported versions. --> 
< 		<em:targetApplication>
< 			<Description>
< 				<em:id>{ec8030f7-c20a-464f-9b0e-13a3a9e97384}</em:id>
< 				<em:minVersion>1.5</em:minVersion>
< 				<em:maxVersion>4.0b3</em:maxVersion>
< 			</Description>
< 		</em:targetApplication>
< 		
< 		<!-- Front End MetaData -->
< 		<em:name>UnPlug</em:name>
< 		<em:description>Find and download media from websites</em:description>
< 		<em:creator>h2g2bob &lt;unplug@dbatley.com&gt;</em:creator>
< 		<em:homepageURL>http://unplug.dbatley.com/</em:homepageURL>
< 		<em:iconURL>chrome://unplug/skin/unplug-32.png</em:iconURL>
< 		<em:optionsURL>chrome://unplug/content/config/config.xul</em:optionsURL>
< 	</Description>
< </RDF>
< 
---
> <RDF:RDF xmlns:em="http://www.mozilla.org/2004/em-rdf#"
>          xmlns:NC="http://home.netscape.com/NC-rdf#"
>          xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
>   <RDF:Description RDF:about="rdf:#$2b9VD"
>                    em:id="{ec8030f7-c20a-464f-9b0e-13a3a9e97384}"
>                    em:minVersion="1.5"
>                    em:maxVersion="4.0b3" />
>   <RDF:Description RDF:about="urn:mozilla:install-manifest"
>                    em:id="unplug@compunach"
>                    em:version="2.030"
>                    em:type="2"
>                    em:name="UnPlug"
>                    em:description="Find and download media from websites"
>                    em:creator="h2g2bob &lt;unplug@dbatley.com&gt;"
>                    em:homepageURL="http://unplug.dbatley.com/"
>                    em:iconURL="chrome://unplug/skin/unplug-32.png"
>                    em:optionsURL="chrome://unplug/content/config/config.xul" />
>     <em:targetApplication RDF:resource="rdf:#$2b9VD"/>
>   </RDF:Description>
> </RDF:RDF>
Binary files releases/unplug-2.029/unplug.xpi and releases/unplug-2.030/unplug.xpi differ