Merge lp:~jesuisbenjamin/cairo-dock-plug-ins-extras/Facebook into lp:~cairo-dock-team/cairo-dock-plug-ins-extras/third-party

[benjamin]

Added method for handling session without Internet connection (prior version would exit the applet).

[Matthieu Baerts (matttbe)]

Thank you for this new revision!

I've just changed all absolute paths because the dock can use another config directory and your applet can be launched from another folder (don't forget to launch this command to sync your branch with the trunk: bzr pull ;) )

A request: Can you write your emblem.svg file into the "config" directory? The directory where you read the config file (generally it's ~/.config/cairo-dock/current_theme/plug-ins/Facebook but it's better to use the path of the config file (Facebook.conf) which can be found in CDApplet => self.cConfFile = sys.argv[3] => can you use it and remove "/Facebook.conf" from this variable?). Simply because it's possible that you can't modify a file into the directory of the applet, e.g. if your applet is installed in /usr/share/cairo-dock/plug-ins/Dbus/third-party/Facebook.

A detail: Also, is it possible to move the svg code from the 'Facebook' file to another? Because this is only one line with 32545 characters (it's a bit too long ^^)

review: Approve

[benjamin (jesuisbenjamin)]

Hi Matt,

thanks, i didn't know about the os.abspath() thing.

I can write the emblem with the user configuration file, but i don't understand what you meand with the sefl.cConfFile =sys.arg[3] and removing the /Facebook.conf from the variable. I have not used the file name but referred to it as self.keyfile in the code. (??) Besides i know the usage of sys.arg[3] when arguments are passed in the main function from command line but i don't know in this case what you refer to (i don't know how CD launches the applet exactly).

I can keep the original svg xml in a separate file yes.

[Matthieu Baerts (matttbe)]

> I can write the emblem with the user configuration file, but i don't understand what you meand with the sefl.cConfFile =sys.arg[3] and removing the /Facebook.conf from the variable.
Yes, sorry for my poor English...
In your "Facebook" file, I can see that the svg file (emblem.svg) can be modified. But this file can be protected, it's possible that you can't erase/modify it (e.g. if your applet is installed in "/usr/share/cairo-dock/plug-ins/Dbus/third-party/Facebook" where you've to be 'root' to write something in this directory).
OTOH there is another directory where you can write a file: the directory where the config file (Facebook.conf) is located. And you can have the complete path of your config file by using this variable: self.cConfFile or this command: sys.argv[3]

=== modified file 'Facebook/Facebook'
--- Facebook/Facebook	2011-04-22 19:25:38 +0000
+++ Facebook/Facebook	2011-04-23 22:03:27 +0000
@@ -329,10 +329,29 @@
 			pass
 		# that's it: now the applet waits for the next update :) 
 		
+	def error(self):
+		#signal the applet is in difficulty by adding a [!] emblem to the icon:
+		# reset icon:
+		self.icon.SetIcon("~/.config/cairo-dock/third-party/Facebook/icon")
+		# put warning svg emblem on icon
+		self.icon.SetEmblem("~/.config/cairo-dock/third-party/Facebook/warning.svg", CDApplet.UPPER_RIGHT)
+		
 	def read_fb(self):
+		# reset fblist
+		print "reading facebook"
+		fblist = []
 		# this method fetches information from FaceBook with fbcmd
 		# it runs the "fbcmd NOTIFY" command, returns and parses results in a "fblist" list
-		fblist = os.popen("fbcmd NOTIFY").readlines()
+		result = subprocess.Popen(['fbcmd', 'NOTIFY'], stdout=PIPE).stdout
+		fblist = result.readlines()
+		print fblist
+		# if there is no internet connection, the list will be empty
+		if fblist != []:
+			pass
+		else:
+			print '...Facebook Applet could not connect to the Internet. Trying later.'
+			self.error()
+			return False
 		# then it omits friend request details and feeds the result into a the "self.fb" dictionary
 		for i in fblist:
 			ii = i.split()
@@ -346,7 +365,8 @@
 				pass
 		# next the method runs "fbcmd NOTICES unread", returns and parse results in self.fb
 		# first fetch the data
-		ls = os.popen('fbcmd NOTICES unread').readlines()
+		result = subprocess.Popen(['fbcmd', 'NOTICES', 'unread'], stdout=PIPE).stdout
+		ls = result.readlines()
 		# remove the header if any
 		try:
 			del ls[0]
@@ -361,7 +381,8 @@
 			self.fb['NOTICES_UNREAD'] = count
 		except:
 			self.fb['NOTICES_UNREAD'] = 0
-			
+		return True
+		
 	def update(self):
 		# this method updates the information from Facebook
 		# but first it needs to know whether the cairo-dock process still exists
@@ -372,9 +393,13 @@
 		# since the findcairo() method should have terminated the program
 		# in case cairo-dock does not exist, there is no need to check again
 		# the update method continues asking read_fb() to fetch data from Facebook
-		self.read_fb()
-		# then it checks whether there is any need to alarm the user
-		self.consider()
+		try_read = self.read_fb()
+		if try_read == True:
+			print try_read
+			# then it checks whether there is any need to alarm the user
+			self.consider()
+		else:
+			pass
 		# returning master=True will tell the repeat method to continue
 		return master
 		

=== modified file 'Facebook/Facebook.conf'
--- Facebook/Facebook.conf	2011-04-22 19:25:38 +0000
+++ Facebook/Facebook.conf	2011-04-23 22:03:27 +0000
@@ -1,4 +1,4 @@
-#!en;1.11.04.22
+#!en;1.11.04.23
 
 #[gtk-about]
 [Icon]

=== modified file 'Facebook/auto-load.conf'
--- Facebook/auto-load.conf	2011-04-22 19:25:38 +0000
+++ Facebook/auto-load.conf	2011-04-23 22:03:27 +0000
@@ -9,7 +9,7 @@
 category = 3
 
 # Version of the applet; change it everytime you change something in the config file. Don't forget to update the version both in this file and in the config file.
-version = 1.11.04.22
+version = 1.11.04.23
 
 # Default icon to use if no icon has been defined by the user. If not specified, or if the file is not found, the "icon" file will be used.
 icon =