Merge lp:~minakov/calendar-indicator/all-calendars into lp:calendar-indicator/precise

[Vladimir Minakov]

support all calendars

[lp:~minakov/calendar-indicator/all-calendars]

19. By Vladimir Minakov on 2012-03-01

Fix bugs

Unmerged revisions

19. By Vladimir Minakov on 2012-03-01

Fix bugs

18. By Vladimir Minakov on 2012-03-01

All calendars

17. By Vladimir Minakov on 2012-03-01

All calendars

=== modified file 'src/calendar-indicator.py'
--- src/calendar-indicator.py	2012-02-19 20:33:42 +0000
+++ src/calendar-indicator.py	2012-03-01 20:44:18 +0000
@@ -44,7 +44,7 @@
 #
 import comun
 from configurator import Configuration
-from gcal import GCal
+from googlecalendar import GoogleCalendar
 from preferences_dialog import Preferences
 #
 locale.setlocale(locale.LC_ALL, '')
@@ -52,29 +52,9 @@
 gettext.textdomain(comun.APP)
 _ = gettext.gettext
 
-def internet_on():
-	try:
-		response=urllib2.urlopen('http://google.com',timeout=1)
-		return True
-	except:
-		pass
-	return False
-
-
-def getTimeAndDate(cadena):
-	if cadena.find('T')==-1:
-		date = cadena.split('-')
-		time = datetime.time(0,0,0)
-	else:
-		date = cadena.split('T')[0].split('-')
-		time = cadena.split('T')[1].split(':')
-		time = datetime.time(int(time[0]),int(time[1]),int(time[2][0:2]))
-	date = datetime.date(int(date[0]),int(date[1]),int(date[2]))
-	return date.strftime('%d/%m/%Y')+' - '+time.strftime('%H:%M')
-	
 def check_events(event1,event2):
-	if event1.when[0].start == event2.when[0].start:
-		if event1.when[0].end == event2.when[0].end:
+	if event1.when[0].start_time == event2.when[0].start_time:
+		if event1.when[0].end_time == event2.when[0].end_time:
 			if event1.title.text == event2.title.text:
 				return True
 	return False
@@ -119,6 +99,8 @@
 		self.read_preferences()
 		#
 		self.events = []
+		self.load_events()
+		self.set_icon()
 		self.set_menu()
 		GObject.timeout_add_seconds(60, self.work)
 
@@ -127,7 +109,7 @@
 		while error:
 			try:
 				configuration = Configuration()
-				self.gcal=GCal(configuration.get('user'), configuration.get('password'))
+				self.gcal = GoogleCalendar(configuration.get('user'), configuration.get('password'))
 				self.time = configuration.get('time')
 				self.theme = configuration.get('theme')
 				error = False
@@ -153,45 +135,53 @@
 
 	def work(self):
 		if (time.time()-self.actualization_time) > self.time*60:
-			while internet_on() == False:
-				time.sleep(1)
-			self.actualization_time = time.time()
-			self.set_menu(check=True)
+			try:
+				self.load_events(True)
+			except Exception, e:
+				print e
+				return True
+			self.set_icon()
+			self.set_menu()
 		return True
 
-	def set_menu(self,check=False):
-		#
+	def load_events(self,check=False):
+		new_events = self.gcal.AgendaQuery()
+
+		if check:
+			for event in new_events:
+				if not is_event_in_events(event, self.events):
+					msg = event.s.strftime('%d/%m/%Y - %H:%M') + ' - ' + event.title.text
+					self.notification = Notify.Notification.new(_('New event:'), msg, comun.ICON_NEW_EVENT)
+					self.notification.show()
+			for event in self.events:
+				if not is_event_in_events(event, new_events):
+					msg = event.s.strftime('%d/%m/%Y - %H:%M') + ' - ' + event.title.text
+					self.notification = Notify.Notification.new(_('Event finished:'), msg, comun.ICON_FINISHED_EVENT)
+					self.notification.show()
+
+		self.events = new_events
+		self.actualization_time = time.time()
+
+	def set_icon(self):
 		now = datetime.datetime.now()
-		normal_icon = os.path.join(comun.ICONDIR,'%s-%s-normal.svg'%(now.day,self.theme))
-		starred_icon = os.path.join(comun.ICONDIR,'%s-%s-starred.svg'%(now.day,self.theme))
+		normal_icon = os.path.join(comun.ICONDIR, '%s-%s-normal.svg' % (now.day, self.theme))
+		starred_icon = os.path.join(comun.ICONDIR, '%s-%s-starred.svg' % (now.day, self.theme))
 		#
 		self.indicator.set_icon(normal_icon)
 		self.indicator.set_attention_icon(starred_icon)		
 		#self.indicator.set_icon(comun.ICON_ENABLED)
-		#self.indicator.set_attention_icon(comun.ICON_DISABLED)		
-		#
+		#self.indicator.set_attention_icon(comun.ICON_DISABLED)
+		
+		if self._has_today(now):
+			self.indicator.set_status(appindicator.IndicatorStatus.ATTENTION)
+		else:
+			self.indicator.set_status(appindicator.IndicatorStatus.ACTIVE)
+
+	def set_menu(self):
 		self.menu = Gtk.Menu()
 		#
-		events2 = self.gcal.getFirstTenEventsOnDefaultCalendar()
-		if check and len(self.events)>0:
-			for event in events2:
-				if not is_event_in_events(event,self.events):
-					msg = _('New event:')+'\n'
-					msg += getTimeAndDate(event.when[0].start)+' - '+event.title.text
-					print msg
-					self.notification = Notify.Notification ('Calendar Indicator',msg,comun.ICON_NEW_EVENT)
-					self.notification.show()
-			for event in self.events:
-				if not is_event_in_events(event,events2):
-					msg = _('Event finished:')+'\n'
-					msg += getTimeAndDate(event.when[0].start)+' - '+event.title.text
-					print msg
-					self.notification = Notify.Notification ('Calendar Indicator',msg,comun.ICON_FINISHED_EVENT)
-					self.notification.show()
-
-		self.events = events2
 		for event in self.events:
-			add2menu(self.menu, text = (getTimeAndDate(event.when[0].start)+' - '+event.title.text))
+			add2menu(self.menu, text = (event.s.strftime('%d/%m/%Y - %H:%M') + ' - ' + event.title.text))
 		#
 		add2menu(self.menu)
 		self.menu_show_calendar = add2menu(self.menu, text = _('Show Calendar'), conector_event = 'activate',conector_action = self.menu_show_calendar_response)
@@ -202,29 +192,11 @@
 		add2menu(self.menu)
 		add2menu(self.menu, text = _('Exit'), conector_event = 'activate',conector_action = self.menu_exit_response)
 		#
-		now = datetime.datetime.now()
-		if self.events[0].when[0].start.find('T') != -1:
-			print self.events[0].when[0].start
-			if self.events[0].when[0].start.find('.') != -1:
-				com = datetime.datetime.strptime(self.events[0].when[0].start.split('.')[0],'%Y-%m-%dT%H:%M:%S')
-			else:
-				com = datetime.datetime.strptime(self.events[0].when[0].start,'%Y-%m-%dT%H:%M:%S')
-			
-		else:
-			com = datetime.datetime.strptime(self.events[0].when[0].start,'%Y-%m-%d')
-		if now.year == com.year and now.month == com.month and now.day == com.day and now.hour == com.hour:
-			self.indicator.set_status (appindicator.IndicatorStatus.ATTENTION)
-		else:
-			print now.hour
-			print com.hour
-			print self.events[0].when[0].start
-			self.indicator.set_status (appindicator.IndicatorStatus.ACTIVE)
-		#
 		self.menu.show()
 		self.indicator.set_menu(self.menu)
+		#
 		while Gtk.events_pending():
 			Gtk.main_iteration()
-		
 
 	def get_help_menu(self):
 		help_menu =Gtk.Menu()
@@ -250,7 +222,7 @@
 		while error:
 			try:
 				configuration = Configuration()
-				self.gcal=GCal(configuration.get('user'), configuration.get('password'))
+				self.gcal=GoogleCalendar(configuration.get('user'), configuration.get('password'))
 				self.time = configuration.get('time')
 				self.theme = configuration.get('theme')
 				error = False
@@ -311,6 +283,12 @@
 		ad.run()
 		ad.destroy()
 		self.menu_about.set_sensitive(True)
+		
+	def _has_today(self, today):
+		for event in self.events:
+			if today.year == event.s.year and today.month == event.s.month and today.day == event.s.day and today.hour == event.s.hour:
+				return True
+		return False
 
 if __name__ == "__main__":
 	Notify.init("calendar-indicator")

=== modified file 'src/comun.py'
--- src/comun.py	2012-02-19 20:33:42 +0000
+++ src/comun.py	2012-03-01 20:44:18 +0000
@@ -60,5 +60,5 @@
     APPDIR = os.path.join(ROOTDIR, APP)
     ICONDIR = os.path.join(ROOTDIR, 'data/icons')
 
-ICON_NEW_EVENT = 'event-new'
-ICON_FINISHED_EVENT = 'event-finished'
+ICON_NEW_EVENT = os.path.join(ICONDIR, 'event-new.svg')
+ICON_FINISHED_EVENT = os.path.join(ICONDIR, 'event-finished.svg')

=== added file 'src/googlecalendar.py'
--- src/googlecalendar.py	1970-01-01 00:00:00 +0000
+++ src/googlecalendar.py	2012-03-01 20:44:18 +0000
@@ -0,0 +1,190 @@
+#! /usr/bin/python
+# -*- coding: iso-8859-15 -*-
+#
+__author__='atareao'
+__date__ ='$30/10/2010'
+#
+# Copyright (C) 2010 Lorenzo Carbonell
+# [e-mail]
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+import sys, re, urllib, getopt
+import threading, getpass
+from Queue import Queue
+from gdata.calendar.service import *
+from datetime import *
+from dateutil.tz import *
+from dateutil.parser import *
+
+class GoogleCalendar(object):
+	allCals = None
+	cals = []
+	now = datetime.now(tzlocal())
+	agendaLength = 30
+
+	def __init__(self,email,password):
+		self.email = email
+		self.password = password
+		self.client = CalendarService()
+		self.client.ClientLogin(self.email,self.password, 'calendar-indicator')
+
+		# get the list of calendars
+		self.allCals = self.client.GetAllCalendarsFeed()
+		for cal in self.allCals.entry:
+			cal.gcalcli_altLink = cal.GetAlternateLink().href
+			match = re.match('^https?://www.google.com/calendar/feeds/(.*?)/(.*?)/(.*)$', cal.gcalcli_altLink)
+			cal.gcalcli_username   = urllib.unquote(match.group(1))
+			cal.gcalcli_visibility = urllib.unquote(match.group(2))
+			cal.gcalcli_projection = urllib.unquote(match.group(3))
+			self.cals.append(cal)
+
+	def AgendaQuery(self):
+		start = self.now
+		end = (start + timedelta(days=self.agendaLength))
+		return self._SearchForCalEvents(start, end, None)
+
+	def _SearchForCalEvents(self, start, end, searchText):
+		eventList = []
+		queue = Queue()
+		threads = []
+
+		def worker(cal, query):
+			feed = self.client.CalendarQuery(query)
+			queue.put((cal, feed))
+
+		for cal in self.cals:
+			# see http://code.google.com/apis/calendar/reference.html
+			if not searchText:
+				query = CalendarEventQuery(cal.gcalcli_username, cal.gcalcli_visibility, cal.gcalcli_projection)
+				query.start_min = start.isoformat()
+				query.start_max = end.isoformat()
+			else:
+				query = CalendarEventQuery(cal.gcalcli_username, cal.gcalcli_visibility, cal.gcalcli_projection, searchText)
+				if start: # flagged by --ignore-started
+					# weeds out old but still pulls in started events
+					query.futureevents = 'true'
+
+			query.singleevents = 'true'
+
+			# we sort later after getting events from all calendars
+			#query.orderby = 'starttime'
+			#query.sortorder = 'ascending'
+
+			th = threading.Thread(target=worker, args=(cal, query))
+			threads.append(th)
+			th.start()
+
+		for th in threads:
+			th.join()
+
+		while not queue.empty():
+			cal, feed = queue.get()
+			eventList.extend(self._GetAllEvents(cal, feed, end))
+
+		eventList.sort(lambda x, y: cmp(x.s, y.s))
+
+		return eventList
+
+	def _GetAllEvents(self, cal, feed, end):
+		eventList = []
+
+		while 1:
+			next = feed.GetNextLink()
+
+			for event in feed.entry:
+				event.gcalcli_cal = cal
+	
+				event.s = parse(event.when[0].start_time)
+				if event.s.tzinfo == None:
+				    event.s = event.s.replace(tzinfo=tzlocal())
+	
+				event.e = parse(event.when[0].end_time)
+				if event.e.tzinfo == None:
+				    event.e = event.e.replace(tzinfo=tzlocal())
+	
+				# For all-day events, Google seems to assume that the event time
+				# is based in the UTC instead of the local timezone.  Here we
+				# filter out those events start beyond a specified end time.
+				if end and (event.s >= end):
+				    continue
+	
+				# http://en.wikipedia.org/wiki/Year_2038_problem
+				# Catch the year 2038 problem here as the python dateutil module
+				# can choke throwing a ValueError exception. If either the start
+				# or end time for an event has a year '>= 2038' dump it.
+				if event.s.year >= 2038 or event.e.year >= 2039:
+				    continue
+	
+				eventList.append(event)
+
+			if not next:
+				break
+
+			feed = self.client.GetCalendarEventFeed(next.href)
+
+		return eventList
+
+	def _ValidTitle(self, title):
+		if title == None:
+			return "(No title)"
+		else:
+			return title
+
+	def _CalendarColor(self, cal):
+		if cal != None and hasattr(cal, 'colorSpec') and cal.colorSpec != None:
+			return cal.colorSpec
+		else:
+			return None
+
+if __name__ == '__main__':
+    try:
+        opts, args = getopt.getopt(sys.argv[1:], "", [ "user=","pw=" ])
+    except getopt.error:
+        sys.exit(1)
+    
+    usr = None
+    pwd = None
+
+    for opt, arg in opts:
+        if opt == "--user":
+            usr = arg
+        elif opt == "--pw":
+            pwd = arg
+            
+    if usr == None:
+        sys.stdout.write('Error: must specify a username\n')
+        sys.exit(1)
+
+    try:
+        if pwd == None:
+            pwd = getpass.getpass("Password: ")
+    except Exception, e:
+        sys.stdout.write("Error: " + str(e) + "!\n")
+        sys.exit(1)
+
+    if pwd == None or pwd == '':
+        sys.stdout.write('Error: must specify a password\n')
+        sys.exit(1)
+        
+    try:
+        gcal = GoogleCalendar(usr, pwd)
+    except Exception, e:
+        sys.stdout.write("Error: " + str(e) + "!\n")
+        sys.exit(1)
+        
+    for event in gcal.AgendaQuery():
+        print event.title.text
+    
+    sys.exit(0)