fixed substring comparison in tag service

added tag/* pages to site AC
helper now calls autoRegister after renaming platform directory

Author: buffered

chrome/content/danbooruup/extra/ac-insert.js

@@ -1,4 +1,5 @@
 // insert our prototype and scriptaculous scripts into the page
+// vim:set encoding=utf-8:
 try {
 for(var i=0; i < script_arr.length; i++)
 {
@@ -26,7 +27,12 @@ function tagSelector(instance) {
 	else
 		entry = entry.replace(/\*/g, '%');
 
-	if (instance.options.isSearchField && entry[0] == '-') entry = entry.substr(1);
+	if (instance.options.isSearchField && 
+		(entry[0] == '-' || entry[0] == '~')
+		)
+	{
+		entry = entry.substr(1);
+	}
 
 	tags = danbooruUpSearchTags(entry);
 
@@ -45,7 +51,7 @@ function tagSelector(instance) {
 	return "<ul><li>" + tags.slice(0, instance.options.choices).join('</li><li>') + "</li></ul>";
 }
 
-// get the pixel height of an A element to size things in multiples of lines
+// get the pixel height of the A element after the big danbooru link to size things in multiples of lines
 try {
 var lineHeight = document.getElementsByTagName("a")[1].offsetHeight;
 } catch(e) { lineHeight = 16; }
@@ -58,27 +64,63 @@ style.innerHTML = ".danbooruup-ac { border: 1px solid black; overflow: auto; bac
 		".danbooruup-ac li.selected { background: #ffc; }";
 document.getElementsByTagName("head")[0].appendChild(style);
 
-// create the autocomplete popup
-if(document.getElementById("search"))
+function createAC(elementID, options)
 {
-	var div1 = document.createElement("div");
-	div1.setAttribute("id","danbooruup-autocomplete");
-	div1.setAttribute("class","danbooruup-ac");
-	div1.style.display = 'none';
-	document.body.appendChild(div1);
+	try{
+	var foptions = {tokens:[' ','　'], choices:150, selector:tagSelector};
+	var ac = null;
+
+	options = options || {};
+	for (var p in options) {
+		foptions[p] = options[p];
+	}
 
-	ac = new Autocompleter_DanbooruUp("search","danbooruup-autocomplete",[],{tokens:[' ','　'], choices:150, selector:tagSelector, isSearchField: true});
+	if(document.getElementById(elementID))
+	{
+		var div = document.createElement("div");
+		var divid = "danbooruup-" + elementID + "-autocomplete";
+		div.setAttribute("id", divid);
+		div.setAttribute("class","danbooruup-ac");
+		div.style.display = 'none';
+		document.body.appendChild(div);
+
+		ac = new Autocompleter_DanbooruUp(elementID, divid, [], foptions);
+	}
+	return ac;
+	} catch(ee) { GM_log("danbooruUp: while inserting for " + elementID + ":\n"+ee); }
 }
 
+// create the autocomplete popups
+// for post/list
+if(document.location.href.match(/\/post\/list(\/|$)/))
+{
+	createAC("search", {isSearchField: true});
+}
 // for post/view and post/add
-if(document.getElementById("post_tags"))
+else if(document.location.href.match(/\/post\/(view|add)(\/|$)/))
 {
-	div2 = document.createElement("div");
-	div2.setAttribute("id","danbooruup-pt-autocomplete");
-	div2.setAttribute("class","danbooruup-ac");
-	div2.style.display = 'none';
-	document.body.appendChild(div2);
-
-	ac2 = new Autocompleter_DanbooruUp("post_tags","danbooruup-pt-autocomplete",[],{tokens:[' ','　'], choices:150, selector:tagSelector});
+	createAC("post_tags");
+}
+// for rename, set_type
+else if(document.location.href.match(/\/tag\/(rename|set_type)(\/|$)/))
+{
+	createAC("tag", {isSearchField: true});
+}
+// for mass_edit
+else if(document.location.href.match(/\/tag\/mass_edit(\/|$)/))
+{
+	createAC("start", {isSearchField: true});
+	createAC("result");
+}
+// for alias
+else if(document.location.href.match(/\/tag\/alias(\/|$)/))
+{
+	createAC("name", {isSearchField: true});
+	createAC("alias", {isSearchField: true});
+}
+// for implications
+else if(document.location.href.match(/\/tag\/implications(\/|$)/))
+{
+	createAC("child", {isSearchField: true});
+	createAC("parent", {isSearchField: true});
 }
-

components/danbooru/nsDanbooruTagHistoryService.cpp

@@ -168,16 +168,17 @@ NS_strlen(const PRUnichar *aString)
 }
 
 static PRBool
-Equals(const nsAString &str, const PRUnichar *other, ComparatorFunc c)
+Equals(const nsAString &str, const nsDependentSubstring &other, ComparatorFunc c)
 {
-  const PRUnichar *cself;
+  const PRUnichar *cself, *cother;
   PRUint32 selflen = NS_StringGetData(str, &cself);
-  PRUint32 otherlen = NS_strlen(other);
+  NS_StringGetData(other, &cother);
+  PRUint32 otherlen = other.Length();
 
   if (selflen != otherlen)
     return PR_FALSE;
 
-  return c(cself, other, selflen) == 0;
+  return c(cself, cother, selflen) == 0;
 }
 
 static nsICaseConversion* gCaseConv = nsnull;
@@ -251,8 +252,8 @@ void ReplaceSubstring(nsAString& str,
 }
 
 nsDanbooruTagHistoryService::nsDanbooruTagHistoryService() :
-	mRequest(nsnull),
-	mDB(nsnull)
+	mDB(nsnull),
+	mRequest(nsnull)
 {
 }
 
@@ -944,9 +945,7 @@ nsDanbooruTagHistoryService::AutoCompleteSearch(const nsAString &aInputName,
 			}
 
 			nsDependentSubstring sub = Substring(name, 0, aInputName.Length());
-			const PRUnichar *sd;
-			NS_StringGetData(sub, &sd);
-			if (!Equals(aInputName, sd, CaseInsensitiveCompare))
+			if (!Equals(aInputName, sub, CaseInsensitiveCompare))
 				result->RemoveValueAt(i, PR_FALSE);
 		}
 	} else {

components/danbooruUpHelper.js

@@ -325,7 +325,8 @@ this.log(this.browserWindows.length+' after unregistering');
 				var uri = ioService.newURI(sites[i], null, null);
 				if (winUri.prePath != uri.prePath) continue;
 				//this.log(winUri.spec+' matched ' + uri.spec);
-				if (winUri.path.match(/\/post\/(list|view|add)(\/|$)/)) {
+				if (winUri.path.match(/\/post\/(list|view|add)(\/|$)/) || 
+					winUri.path.match(/\/tag\/(mass_edit|rename|alias|implications|set_type)(\/|$)/)) {
 					this.inject(href, unsafeWin);
 					return;
 				}
@@ -418,6 +419,8 @@ var HelperModule = new Object();
 
 HelperModule.registerSelf = function(compMgr, fileSpec, location, type)
 {
+	var compMgr = compMgr.QueryInterface(Ci.nsIComponentRegistrar);
+
 	if (!this._deferred)
 	{
 		this._deferred = true;
@@ -426,30 +429,37 @@ HelperModule.registerSelf = function(compMgr, fileSpec, location, type)
 	try {
 	if (Cc["@mozilla.org/xre/app-info;1"].getService(Ci.nsIXULRuntime).OS == 'linux-gnu')
 	{
-__log("linux-gnu detected");
+		//__log("linux-gnu detected");
 		// find the extension directory
 		var dirs = Cc["@mozilla.org/file/directory_service;1"].getService(Ci.nsIProperties)
 				.get("XREExtDL", Ci.nsISimpleEnumerator);
 		var dir;
 		while(dirs.hasMoreElements())
 		{
 			dir = dirs.getNext().QueryInterface(Ci.nsILocalFile);
-__log("checking "+dir.path);
+			//__log("checking "+dir.path);
 			if(dir.leafName == '{7209145A-6A2A-42C1-99EB-4DE7293990E1}')
 				break;
 			dir = null;
 		}
 		// rename the platform component directory
 		if (dir)
 		{
-__log("locked on");
+			//__log("locked on");
 			var moveDir;
 			dir.append('platform');
 			moveDir = dir.clone();
 			moveDir.append('Linux_x86-gcc3');
-__log("using "+moveDir.path+(moveDir.exists?" (exists)":" (doesn't exist)"));
+			//__log("using "+moveDir.path+(moveDir.exists?" (exists)":" (doesn't exist)"));
 			if(moveDir.exists())
+			{
 				moveDir.moveTo(dir, 'linux-gnu_x86-gcc3');
+				// moveDir will still point to the old path, so we need to use dir
+				dir.append('linux-gnu_x86-gcc3');
+				dir.append('components');
+				__log("danbooruUpHelper: registering "+dir.path);
+				compMgr.autoRegister(dir);
+			}
 		}
 	}
 	} catch(ex) {
@@ -459,7 +469,6 @@ __log("using "+moveDir.path+(moveDir.exists?" (exists)":" (doesn't exist)"));
 		throw Components.results.NS_ERROR_FACTORY_REGISTER_AGAIN;
 	}
 
-	var compMgr = compMgr.QueryInterface(Ci.nsIComponentRegistrar);
 	compMgr.registerFactoryLocation(DANBOORUUPHELPER_CID,
 			"Danbooru Helper Service",
 			DANBOORUUPHELPER_CONTRACTID,