[Themis-devcvs] SF.net SVN: themis:[732] trunk/themis/modules/CSSParser

[CVS C. to T. <the...@li...>]

Revision: 732
          http://sourceforge.net/p/themis/code/732
Author:   mark_hellegers
Date:     2016-06-26 20:38:51 +0000 (Sun, 26 Jun 2016)
Log Message:
-----------
Be more resilient if no CSS file has been set yet in the preferences.

Modified Paths:
--------------
    trunk/themis/modules/CSSParser/CSSParserPlugin.cpp
    trunk/themis/modules/CSSParser/CSSParserPlugin.hpp

Modified: trunk/themis/modules/CSSParser/CSSParserPlugin.cpp
===================================================================
--- trunk/themis/modules/CSSParser/CSSParserPlugin.cpp	2016-05-02 20:23:12 UTC (rev 731)
+++ trunk/themis/modules/CSSParser/CSSParserPlugin.cpp	2016-06-26 20:38:51 UTC (rev 732)
@@ -219,9 +219,11 @@
 	int32 siteId = 0;
 	int32 urlId = 0;
 	int32 domId = 0;
-	aOriginalMessage->FindInt32("site_id", &siteId);
-	aOriginalMessage->FindInt32("url_id", &urlId);
-	aOriginalMessage->FindInt32("dom_id", &domId);
+	if (aOriginalMessage != NULL) {
+		aOriginalMessage->FindInt32("site_id", &siteId);
+		aOriginalMessage->FindInt32("url_id", &urlId);
+		aOriginalMessage->FindInt32("dom_id", &domId);
+	}
 
 	/* Get an unique ID from the app for the DOM entry */
 	int32 cssId = ((App *)be_app)->GetNewID();
@@ -243,46 +245,51 @@
 
 }
 
+void CSSParserPlugin :: LoadCSSFile(BMessage * aMessage) {
+
+	if (appSettings != NULL) {
+		BString path;
+		appSettings->FindString(kPrefsActiveCSSPath, &path);
+		if (path == NULL) {
+			// No path set, try to find the first css file and set it.
+			BString cssDir;
+			AppSettings->FindString(kPrefsSettingsDirectory, &cssDir);
+			cssDir.Append("/css/");
+					
+			BDirectory dir(cssDir.String());
+			if(dir.InitCheck() != B_OK) {
+				printf("CSS directory (%s) not found!\n", cssDir.String());
+				printf("Setting CSSToUsePath to \"none\"\n");
+				AppSettings->AddString(kPrefsActiveCSSPath, kNoCSSFoundString);
+			}
+			else {
+				BEntry entry;
+				if (dir.GetNextEntry(&entry, false) != B_ENTRY_NOT_FOUND) {
+					BPath cssPath;
+					entry.GetPath(&cssPath);
+					path = cssPath.Path();
+					AppSettings->AddString(kPrefsActiveCSSPath, path);
+				}
+			}
+		}
+	
+		if (path.String() != NULL) {
+			string cssLoad = "Loading new CSS file: ";
+			cssLoad += path.String();
+			Debug(cssLoad.c_str(), PlugID());
+			CSSStyleSheetPtr document = mParser->parse(path.String());
+			mDocuments.push_back(document);
+			NotifyParseFinished(document, "cssdom", aMessage);
+		}
+	}
+
+}
+
 void CSSParserPlugin :: MessageReceived(BMessage * aMessage) {
 
 	switch (aMessage->what) {
 		case CSS_CHANGED_PARSER: {
-			Debug("Request to change base css file", PlugID());
-			if (appSettings != NULL) {
-				BString path;
-				appSettings->FindString(kPrefsActiveCSSPath, &path);
-				if (path == NULL) {
-					// No path set, try to find the first css file and set it.
-					BString cssDir;
-					AppSettings->FindString(kPrefsSettingsDirectory, &cssDir);
-					cssDir.Append("/css/");
-							
-					BDirectory dir(cssDir.String());
-					if(dir.InitCheck() != B_OK) {
-						printf("CSS directory (%s) not found!\n", cssDir.String());
-						printf("Setting CSSToUsePath to \"none\"\n");
-						AppSettings->AddString(kPrefsActiveCSSPath, kNoCSSFoundString);
-					}
-					else {
-						BEntry entry;
-						if (dir.GetNextEntry(&entry, false) != B_ENTRY_NOT_FOUND) {
-							BPath cssPath;
-							entry.GetPath(&cssPath);
-							path = cssPath.Path();
-							AppSettings->AddString(kPrefsActiveCSSPath, path);
-						}
-					}
-				}
-
-				if (path.String() != NULL) {
-					string cssLoad = "Loading new CSS file: ";
-					cssLoad += path.String();
-					Debug(cssLoad.c_str(), PlugID());
-					CSSStyleSheetPtr document = mParser->parse(path.String());
-					mDocuments.push_back(document);
-					NotifyParseFinished(document, "cssdom", aMessage);
-				}
-			}
+			LoadCSSFile(aMessage);
 			break;
 		}
 		default: {
@@ -369,17 +376,7 @@
 						// Check if we already have the base css file loaded.
 						if (mDocuments.size() == 0) {
 							// Not loaded yet. Load it now.
-							if (appSettings != NULL) {
-								const char * path;
-								appSettings->FindString(kPrefsActiveCSSPath, &path);
-								string cssLoad = "Loading new CSS file: ";
-								cssLoad += path;
-								printf("%s\n", cssLoad.c_str());
-								Debug(cssLoad.c_str(), PlugID());
-								CSSStyleSheetPtr document = mParser->parse(path);
-								mDocuments.push_back(document);
-								NotifyParseFinished(document, "cssdom", aMessage);
-							}
+							LoadCSSFile(aMessage);
 						}
 						else {
 							// Assuming the default stylesheet is parsed first!!!

Modified: trunk/themis/modules/CSSParser/CSSParserPlugin.hpp
===================================================================
--- trunk/themis/modules/CSSParser/CSSParserPlugin.hpp	2016-05-02 20:23:12 UTC (rev 731)
+++ trunk/themis/modules/CSSParser/CSSParserPlugin.hpp	2016-06-26 20:38:51 UTC (rev 732)
@@ -76,6 +76,8 @@
 		CSSParser * mParser;
 		// List of mimetypes supported.
 		vector<string> mMimeTypes;
+		
+		void LoadCSSFile(BMessage * aMessage);
 
 		// Function to find out if a message was sent by the cache.
 		bool MessageSentByCache(BMessage * aMessage);

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.