diff --new-file --recursive --suppress-common-lines --exclude changes.txt --exclude diff.txt releases/unplug-2.034/source/chrome/content/common.js releases/unplug-2.035/source/chrome/content/common.js
135c135
< 	version  : 2.034,
---
> 	version  : 2.035,
139c139
< 	revision : 201009150122,
---
> 	revision : 201010180152,
diff --new-file --recursive --suppress-common-lines --exclude changes.txt --exclude diff.txt releases/unplug-2.034/source/chrome/content/rules.xml releases/unplug-2.035/source/chrome/content/rules.xml
40a41
> 		<priority level="never"    >api.connect.facebook.com</priority>
108,116c109,114
< 	<rule id="veoh.com">
< 		<!-- TODO veoh support is broken -->
< 		<if_false />
< 		<if_url host="veoh.com" />
< 		<if_re ref="videoid" tagname="textarea"> "videoId":"([^"]+)" </if_re>
< 		<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 -->
---
> 	<rule id="veoh-2010">
> 		<if_url ref="url" host="veoh.com" />
> 		<rule>
> 			<if_re ref="vidid" re="/watch/([0-9A-Za-z]+)(?:$|\?|#|;)" string="${url.url}" />
> 			<download url="http://www.veoh.com/rest/v2/execute.xml?apiKey=5697781E-1C60-663B-FFD8-9B49D2B56D36&amp;method=veoh.video.findByPermalink&amp;permalink=${vidid.1}&amp;">
> 				<each_element ref="video" tagname="video" attrs="fullPreviewHashLowPath,fullPreviewHashPath,ipodLink,fullMedResImagePath,description,title">
118,120c116,117
< 					<media url="${video.ipodLink}" description="mp4" thumbnail="${video.fullMedResImagePath}" typy="mp4" />
< 					<media url="${video.fullPreviewHashLowPath}" description="${translate:low_quality}" thumbnail="${video.fullMedResImagePath}" type="flv" />
< 					<media url="${video.fullPreviewHashPath}" description="${translate:mid_quality}" thumbnail="${video.fullMedResImagePath}" type="flv" />
---
> 					<media url="${video.fullPreviewHashLowPath}" description="5 min preview: ${translate:low_quality}" thumbnail="${video.fullMedResImagePath}" type="flv" title="${video.title}" />
> 					<media url="${video.fullPreviewHashPath}" description="5 min preview: ${translate:mid_quality}" thumbnail="${video.fullMedResImagePath}" type="flv" title="${video.title}" />
306c303
< 					<if_re ref="final" re="&lt;finalAddress&gt;&lt;!\[CDATA\[(http.*?)\]\]&gt;&lt;/finalAddress&gt;" />
---
> 					<if_re ref="final" re="&lt;finalAddress&gt;&lt;!\[CDATA\[([a-z0-9]+://.*?)\]\]&gt;&lt;/finalAddress&gt;" />
351a349,353
> 	<rule id="dailyshow-url">
> 		<if_re re="(dailyshow.com|colbertnation.com)" string="${.url}" />
> 		<if_re re="http://media.mtvnservices.com/(mgid:[^:]+:[^:]+:[^:]+:\d+)" ref="mgid" />
> 		<rule goto="dailyshow-id" />
> 	</rule>
498a501,507
> 							<rule id="dailyshow-speculative">
> 								<!-- this neatly bypasses the geolocation (i think the rtmp server might re-check it tho. -->
> 								<if_re ref="parts" re="^(mgid):(cms):(item):(comedycentral\.com):(\d+)$" string="${mgid.1}" />
> 								<download url="http://${parts.4}/global/feeds/entertainment/media/mediaGenEntertainment.jhtml?uri=${mgid.1}">
> 									<rule goto="dailyshow-rend" />
> 								</download>
> 							</rule>
504,518c513,529
< 										<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>
---
> 										<rule id="dailyshow-rend" target="dailyshow-rend">
> 											<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" mediaid="${mgid.1}" />
> 												</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" mediaid="${mgid.1}" />
> 												</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" mediaid="${mgid.1}" />
> 												</rule>
> 											</each_re>
> 										</rule>
534,539c545,558
< 						<optional_re re="&quot;(http://news.bbcimg.co.uk/media/[^&quot;]*\.jpg)&quot;" ref="thumb" />
< 						<optional_re re="&lt;title&gt;([^&lt;&gt;]+)&lt;/title&gt;" ref="title" />
< 						<each_re ref="media" re="(&lt;media[\s\S]+?&lt;/media&gt;)">
< 							<if_element ref="conn" string="${media.1}" tagname="connection" require_attrs="kind,application,server,identifier" />
< 							<media url="rtmp://${conn.server}/${conn.application}/${conn.identifier}" thumbnail="${thumb.1}" title="${either:title.1:origtitle.innerHTML}" />
< 						</each_re>
---
> 						<rule id="bbc-playlist" target="bbc-playlist">
> 							<optional_re re="&quot;(http://news.bbcimg.co.uk/media/[^&quot;]*\.jpg)&quot;" ref="thumb" />
> 							<optional_re re="&lt;title&gt;([^&lt;&gt;]+)&lt;/title&gt;" ref="title" />
> 							<each_re ref="media" re="(&lt;media[\s\S]+?&lt;/media&gt;)">
> 								<if_element ref="conn" string="${media.1}" tagname="connection" require_attrs="kind,application,server,identifier" />
> 								<media url="rtmp://${conn.server}/${conn.application}/${conn.identifier}" thumbnail="${thumb.1}" title="${either:title.1:origtitle.innerHTML}" description="${conn.kind} / ${conn.application} / ${conn.identifier}" />
> 							</each_re>
> 						</rule>
> 					</download>
> 				</rule>
> 				<rule id="bbc-news">
> 					<if_equal a="${p.name}" b="externalIdentifier" />
> 					<download url="http://open.live.bbc.co.uk/mediaselector/4/mtis/stream/${p.value}">
> 						<rule goto="bbc-playlist" />
564c583
< 				<if_url host="youporn.com" />
---
> 				<if_url host="youporn.com" ref="url" />
566c585
< 				<media url="${loc.1}" type="${loc.2}" title="${either:contents.2:origtitle.innerHTML}" thumbnail="${contents.1}" />
---
> 				<media url="${loc.1}" type="${loc.2}" title="${either:contents.2:origtitle.innerHTML}" thumbnail="${contents.1}" mediaid="${url.url}" />
806a826,875
> 		<rule id="youporn-alt">
> 			<if_url host="youporn.com" ref="url" />
> 			<if_re ref="xmlloc" re="(http://download\.youporn\.com/download/\d+\?xml=1)" />
> 			<optional_re ref="contents" re="&lt;h1&gt;\s*&lt;img src=&quot;(http://.*?.youporn.com.*\.jpg)&quot;[^&lt;&gt;]*&gt;\s*([^&lt;&gt;]+)\s*&lt;/h1&gt;" />
> 			<download url="${xmlloc.1}">
> 				<if_re ref="flvloc" re="&lt;location&gt;(.*?)&lt;/location&gt;" />
> 				<media url="${htmldecode:flvloc.1}" type="flv" title="${either:contents.2:origtitle.innerHTML}" thumbnail="${contents.1}" mediaid="${url.url}" />
> 			</download>
> 		</rule>
> 		<rule id="vkontakte">
> 			<if_url host="vkontakte.ru" />
> 			<rule id="vkontakte-audio">
> 				<each_re ref="row" re="&lt;div class=&quot;audioRow&quot; id=&quot;audio\d+&quot;&gt;\s*&lt;table&gt;&lt;tbody&gt;([\s\S]*?)&lt;/table&gt;">
> 					<if_re ref="operate" re="operate\(\d+,(\d+),(\d+),'([0-9a-f]+)',\d+\);" string="${row.1}" />
> 					<optional_re ref="performer" re="id=&quot;performer\d+&quot;[^&gt;]*&gt;([^&lt;]+)" string="${row.1}" />
> 					<optional_re ref="title" re="id=&quot;title\d+&quot;[^&gt;]*&gt;([^&lt;]+)" string="${row.1}" />
> 					<media url="http://cs${operate.1}.vkontakte.ru/u${operate.2}/audio/${operate.3}.mp3" mediaid="${operate.2}" title="${performer.1} - ${title.1}" description="${title.1}" />
> 				</each_re>
> 			</rule>
> 			<rule id="vkontakte-video">
> 				<if_re ref="host" re="&quot;host&quot;\s*:\s*&quot;http:\\/\\/([^/&quot;]+)\\/&quot;" />
> 				<if_re ref="uid" re="&quot;uid&quot;\s*:\s*&quot;(\d+)&quot;" />
> 				<if_re ref="vtag" re="&quot;vtag&quot;\s*:\s*&quot;([0-9a-f]+)&quot;" />
> 				<optional_re ref="title" re="&lt;div class=&quot;summary&quot;&gt;&lt;a[^&gt;]*&gt;([^&lt;]+)&lt;/a&gt;" />
> 				<optional_re ref="thumb" re="'(http://cs\d+\.vkontakte\.ru/u\d+/video/l_[0-9a-f]+\.jpg)'" />
> 				<media url="http://${host.1}/u${uid.1}/video/${vtag.1}.240.mp4" title="${either:title.1:origtitle.innerHTML}" thumbnail="${thumb.1}" />
> 			</rule>
> 		</rule>
> 		<rule id="facebook-video">
> 			<if_url host="facebook.com" inurl="video" />
> 			<optional_re ref="thumb" re="swf_id_[0-9a-f]+\.addVariable\(&quot;thumb_url&quot;,\s*&quot;(http%3A%2F%2F[^&quot;]+)&quot;\);" />
> 			<optional_re ref="title" re="swf_id_[0-9a-f]+\.addVariable\(&quot;video_title&quot;,\s*&quot;([^&quot;]+)&quot;\);" />
> 			<rule id="fb-high">
> 				<if_re ref="highqual" re="swf_id_([0-9a-f]+)\.addVariable\(&quot;highqual_src&quot;,\s*&quot;(http%3A%2F%2F[^&quot;]+)&quot;\);" />
> 				<media url="${urldecode:highqual.2}" thumbnail="${urldecode:thumb.1}" title="${urldecode:either:title.1:origtitle.innerHTML}" mediaid="${highqual.1}" quality="high" description="${translate:high_quality}" />
> 			</rule>
> 			<rule id="fb-low">
> 				<if_re ref="lowqual" re="swf_id_([0-9a-f]+)\.addVariable\(&quot;lowqual_src&quot;,\s*&quot;(http%3A%2F%2F[^&quot;]+)&quot;\);" />
> 				<media url="${urldecode:lowqual.2}" thumbnail="${urldecode:thumb.1}" title="${urldecode:either:title.1:origtitle.innerHTML}" mediaid="${lowqual.1}" quality="low" description="${translate:low_quality}" />
> 			</rule>
> 		</rule>
> 		<rule id="pluzz.fr">
> 			<if_url host="pluzz.fr" />
> 			<if_re ref="vidid" re="&lt;a href=&quot;http://info\.francetelevisions\.fr/\?id-video=([^&quot;&amp;]+)&quot; id=&quot;current_video&quot;" />
> 			<download url="http://www.pluzz.fr/appftv/webservices/video/getInfosVideo.php?src=cappuccino&amp;video-type=simple&amp;template=ftvi&amp;template-format=complet&amp;id-externe=${vidid.1}">
> 				<if_element tagname="nom" ref="nom" require_attrs="innerHTML" />
> 				<if_element tagname="chemin" ref="chemin" require_attrs="innerHTML" />
> 				<media url="rtsp://videozones.francetv.fr/${chemin.innerHTML}${nom.innerHTML}" title="${origtitle.innerHTML}" />
> 			</download>
> 		</rule>
diff --new-file --recursive --suppress-common-lines --exclude changes.txt --exclude diff.txt releases/unplug-2.034/source/chrome/content/search/rules.js releases/unplug-2.035/source/chrome/content/search/rules.js
184a185,189
> 					
> 					// although we can force it to be required sometimes, like <if_re string="..." />
> 					if (rule.enforce && rule.enforce.indexOf(attrname) >= 0) {
> 						throw "If set, attribute " + attrname + " must be valid.";
> 					}
272a278
> 		enforce   : ["string"],
301a308
> 		enforce   : ["string"],
316a324
> 				var k = 0;
318a327,330
> 					if (++k > 100) {
> 						UnPlug2.log("Baling out of each_re in rules.js because hit limit of " + k + ". Error is with " + data.toSource() + " on text " + texts[i].substring(100))
> 						break;
> 					}
diff --new-file --recursive --suppress-common-lines --exclude changes.txt --exclude diff.txt releases/unplug-2.034/source/chrome/content/search/search.js releases/unplug-2.035/source/chrome/content/search/search.js
384c384
< 				while (parts) {
---
> 				while (parts.length > 0) {
583a584
> 		var hex = "0123456789ABCDEF"
585c586
< 		piece_num = ((parseInt(piece_num) < 10) ? "0" : "") + piece_num;
---
> 		piece_num = hex[Math.floor(piece_num / 16)] + hex[piece_num % 16];
diff --new-file --recursive --suppress-common-lines --exclude changes.txt --exclude diff.txt releases/unplug-2.034/source/install.rdf releases/unplug-2.035/source/install.rdf
8c8
<                    em:maxVersion="4.0b4" />
---
>                    em:maxVersion="4.0b6" />
11c11
<                    em:version="2.034"
---
>                    em:version="2.035"
Binary files releases/unplug-2.034/unplug.xpi and releases/unplug-2.035/unplug.xpi differ