Merge lp:~cjohnston/ubuntu-classroom/topic-event into lp:~ubuntu-classroom/ubuntu-classroom/classbot

[Chris Johnston]

[Chris Johnston (cjohnston)]

Adds Event Name to /topic dony by nhandler and fix to endless topic cycling by cjohnston

[lp:~cjohnston/ubuntu-classroom/topic-event]

8. By Chris Johnston on 2010-02-19

Commit of /topic cycling fix

[Nathan Handler (nhandler)]

review: Approve

=== modified file 'classbot.pl'
--- classbot.pl	2010-02-18 04:25:19 +0000
+++ classbot.pl	2010-02-19 04:17:13 +0000
@@ -20,7 +20,9 @@
 Irssi::settings_add_str('classroom', 'classroom_questions', '');
 Irssi::settings_add_str('classroom', 'classroom_channel', '');
 Irssi::settings_add_str('classroom', 'classroom_session', '');
-my ($leaders, $qchan, $chan, %leaders, $session, @questions, $review);
+Irssi::settings_add_str('classroom', 'classroom_event', '');
+#Added $current_session
+my ($leaders, $qchan, $chan, %leaders, $session, @questions, $review, $event, $current_session);
 &refresh_settings();
 
 &sessions();
@@ -37,12 +39,16 @@
 	}
 	$qchan = Irssi::settings_get_str('classroom_questions');
 	$chan = Irssi::settings_get_str('classroom_channel');
-	$session = Irssi::settings_get_str('classroom_session');
+	#changed $session to $current_session
+	$current_session = Irssi::settings_get_str('classroom_session');
+	$event = Irssi::settings_get_str('classroom_event');
 
 	Irssi::print("Leaders: " . lc($leaders));
 	Irssi::print("qchan: $qchan");
 	Irssi::print("chan: $chan");
+	#I don't know if this needs to be changed or not...
 	Irssi::print("Session: $session");
+	Irssi::print("Event: $event");
 }
 
 sub sessions {
@@ -51,31 +57,35 @@
 	my $content = get($url);
 	return unless defined $content;
 	my @events = $content =~ m/BEGIN:VEVENT.*?END:VEVENT/isg;
-	EVENT: foreach my $event (@events) {
-		my($dtstart) = $event=~m/DTSTART[;:](.*?)\n/i;
+	EVENT: foreach my $session (@events) {
+		my($dtstart) = $session=~m/DTSTART[;:](.*?)\n/i;
 		$dtstart=~s/[\n\r]//g;
 		my($dt_start) = DateTime::Format::ICal->parse_datetime($dtstart);
-		my($dtend) = $event=~m/DTEND[;:](.*?)\n/i;
+		my($dtend) = $session=~m/DTEND[;:](.*?)\n/i;
 		$dtend=~s/[\n\r]//g;
 		my($dt_end) = DateTime::Format::ICal->parse_datetime($dtend);
-		my($location) = $event=~m/LOCATION:(.*?)\n/i;
+		my($location) = $session=~m/LOCATION:(.*?)\n/i;
 		$location=~s/[\n\r]//g;
 		next EVENT if $location !~ m/\#ubuntu-classroom/i;
-		my($summary) = $event=~m/SUMMARY:(.*?)\n/i;
+		my($summary) = $session=~m/SUMMARY:(.*?)\n/i;
 		$summary=~s/[\n\r]//g;
-		my($description) = $event=~m/DESCRIPTION:(.*?)\n\S/i;
+		my($description) = $session=~m/DESCRIPTION:(.*?)\n\S/i;
 		$description=~s/[\n\r]//g;
 		my($instructors) = $description =~ m/Instructors?:\s*(.*?)$/i;
 		$instructors=~s/[\n\r]//g;
 		$instructors=~s/\\n.*?$//;
 		$instructors=~s/\s*\\?,\s*/, /g;
+		my($event) = $description =~ m/Event:\s*(.*?)$/i;
+		$event =~ s/[\n\r]//g;
+		$event =~ s/\\n.*?$//;
 
 		my $now = DateTime->now();
 		if ($now >= $dt_start && $now < $dt_end) {
 			Irssi::print("Session Currently In Progress.");
-			my %event=();
-			$event{'summary'}=$summary;
-			$event{'instructors'}=$instructors;
+			my %session=();
+			$session{'summary'}=$summary;
+			$session{'instructors'}=$instructors;
+			$session{'event'}=$event;
 			if($leaders ne $instructors) {	#If the instructors have changed
 				Irssi::print("New Instructors: $instructors");
 				Irssi::settings_set_str('classroom_leaders', $instructors);
@@ -89,44 +99,72 @@
 				&moderate($chan,1);
 				Irssi::print("Session: $summary (instructors changed).");
 				Irssi::settings_set_str('classroom_session', $summary);
+				Irssi::settings_set_str('classroom_event', $event);
 				&refresh_settings();
 				@questions=();
 				$review='';
 				if(keys(%leaders) > 1) {	#If there is more than 1 instructor
-					&topic($chan,"Welcome to the Ubuntu Classroom - http://wiki.ubuntu.com/Classroom || Support in #ubuntu || Upcoming Schedule: http://is.gd/8rtIi || Current Session: $summary - Instructors: $leaders || Questions in #ubuntu-classroom-chat");
-					&topic($qchan,"Sessions in #ubuntu-classroom, chat and questions related to sessions here || Upcoming Schedule in #ubuntu-classroom: http://is.gd/8rtIi || Current Session: $summary - Instructors: $leaders");
+					if($event !~ m/^\s*$/) {	#If an event is going on
+						&topic($chan,"Welcome to the Ubuntu Classroom - http://wiki.ubuntu.com/Classroom || Support in #ubuntu || Upcoming Schedule: http://is.gd/8rtIi || Event: $event - Current Session: $summary - Instructors: $leaders || Questions in #ubuntu-classroom-chat");
+						&topic($qchan,"Sessions in #ubuntu-classroom, chat and questions related to sessions here || Upcoming Schedule in #ubuntu-classroom: http://is.gd/8rtIi || Event: $event - Current Session: $summary - Instructors: $leaders");
+					}
+					else {
+						&topic($chan,"Welcome to the Ubuntu Classroom - http://wiki.ubuntu.com/Classroom || Support in #ubuntu || Upcoming Schedule: http://is.gd/8rtIi || Current Session: $summary - Instructors: $leaders || Questions in #ubuntu-classroom-chat");
+						&topic($qchan,"Sessions in #ubuntu-classroom, chat and questions related to sessions here || Upcoming Schedule in #ubuntu-classroom: http://is.gd/8rtIi || Current Session: $summary - Instructors: $leaders");
+					}
 				}
 				else {
-					&topic($chan,"Welcome to the Ubuntu Classroom - http://wiki.ubuntu.com/Classroom || Support in #ubuntu || Upcoming Schedule: http://is.gd/8rtIi || Current Session: $summary - Instructor: $instructors || Questions in #ubuntu-classroom-chat");
-					&topic($qchan,"Sessions in #ubuntu-classroom, chat and questions related to sessions here || Upcoming Schedule in #ubuntu-classroom: http://is.gd/8rtIi || Current Session: $summary - Instructor: $instructors");
+					if($event !~ m/^\s*$/) {	#If an event is going on
+						&topic($chan,"Welcome to the Ubuntu Classroom - http://wiki.ubuntu.com/Classroom || Support in #ubuntu || Upcoming Schedule: http://is.gd/8rtIi || Event: $event - Current Session: $summary - Instructor: $instructors || Questions in #ubuntu-classroom-chat");
+						&topic($qchan,"Sessions in #ubuntu-classroom, chat and questions related to sessions here || Upcoming Schedule in #ubuntu-classroom: http://is.gd/8rtIi || Event: $event - Current Session: $summary - Instructor: $instructors");
+					}
+					else {
+						&topic($chan,"Welcome to the Ubuntu Classroom - http://wiki.ubuntu.com/Classroom || Support in #ubuntu || Upcoming Schedule: http://is.gd/8rtIi || Current Session: $summary - Instructor: $instructors || Questions in #ubuntu-classroom-chat");
+						&topic($qchan,"Sessions in #ubuntu-classroom, chat and questions related to sessions here || Upcoming Schedule in #ubuntu-classroom: http://is.gd/8rtIi || Current Session: $summary - Instructor: $instructors");
+					}
 				}
 			}
-			elsif($session ne $summary) {	#If the session has changed, we need to update the /topic
+			#Changed $session to $current_session
+			elsif($current_session ne $summary) {	#If the session has changed, we need to update the /topic
 				Irssi::print("New Session: $summary");
 				Irssi::settings_set_str('classroom_session', $summary);
+				Irssi::settings_set_str('classroom_event', $event);
 				&refresh_settings();
 				@questions=();
 				$review='';
 				if(keys(%leaders) > 1) {	#If there is more than 1 instructor
-					&topic($chan,"Welcome to the Ubuntu Classroom - http://wiki.ubuntu.com/Classroom || Support in #ubuntu || Upcoming Schedule: http://is.gd/8rtIi || Current Session: $summary - Instructors: $leaders || Questions in #ubuntu-classroom-chat");
-					&topic($qchan,"Sessions in #ubuntu-classroom, chat and questions related to sessions here || Upcoming Schedule in #ubuntu-classroom: http://is.gd/8rtIi || Current Session: $summary - Instructors: $leaders");
+					if($event !~ m/^\s*$/) {	#If an event is going on
+						&topic($chan,"Welcome to the Ubuntu Classroom - http://wiki.ubuntu.com/Classroom || Support in #ubuntu || Upcoming Schedule: http://is.gd/8rtIi || Event: $event - Current Session: $summary - Instructors: $leaders || Questions in #ubuntu-classroom-chat");
+						&topic($qchan,"Sessions in #ubuntu-classroom, chat and questions related to sessions here || Upcoming Schedule in #ubuntu-classroom: http://is.gd/8rtIi || Event: $event - Current Session: $summary - Instructors: $leaders");
+					}
+					else {
+						&topic($chan,"Welcome to the Ubuntu Classroom - http://wiki.ubuntu.com/Classroom || Support in #ubuntu || Upcoming Schedule: http://is.gd/8rtIi || Current Session: $summary - Instructors: $leaders || Questions in #ubuntu-classroom-chat");
+						&topic($qchan,"Sessions in #ubuntu-classroom, chat and questions related to sessions here || Upcoming Schedule in #ubuntu-classroom: http://is.gd/8rtIi || Current Session: $summary - Instructors: $leaders");
+					}
 				}
 				else {
-					&topic($chan,"Welcome to the Ubuntu Classroom - http://wiki.ubuntu.com/Classroom || Support in #ubuntu || Upcoming Schedule: http://is.gd/8rtIi || Current Session: $summary - Instructor: $instructors || Questions in #ubuntu-classroom-chat");
-					&topic($qchan,"Sessions in #ubuntu-classroom, chat and questions related to sessions here || Upcoming Schedule in #ubuntu-classroom: http://is.gd/8rtIi || Current Session: $summary - Instructor: $instructors");
+					if($event !~ m/^\s*$/) {	#If an event is going on
+						&topic($chan,"Welcome to the Ubuntu Classroom - http://wiki.ubuntu.com/Classroom || Support in #ubuntu || Upcoming Schedule: http://is.gd/8rtIi || Event: $event - Current Session: $summary - Instructor: $instructors || Questions in #ubuntu-classroom-chat");
+						&topic($qchan,"Sessions in #ubuntu-classroom, chat and questions related to sessions here || Upcoming Schedule in #ubuntu-classroom: http://is.gd/8rtIi || Event: $event - Current Session: $summary - Instructor: $instructors");
+					}
+					else {
+						&topic($chan,"Welcome to the Ubuntu Classroom - http://wiki.ubuntu.com/Classroom || Support in #ubuntu || Upcoming Schedule: http://is.gd/8rtIi || Current Session: $summary - Instructor: $instructors || Questions in #ubuntu-classroom-chat");
+						&topic($qchan,"Sessions in #ubuntu-classroom, chat and questions related to sessions here || Upcoming Schedule in #ubuntu-classroom: http://is.gd/8rtIi || Current Session: $summary - Instructor: $instructors");
+					}
 				}
 				&moderate($chan,1);
 			}
 			return;
 		}
 	}
-	#If an event is not going on
+	#If a session is not going on
 	Irssi::print("No Session Is In Progress.");
 	if($leaders=~m/^$/ && $session=~m/^$/) {	#No session was going on
 	}
 	else {
 		Irssi::settings_set_str('classroom_leaders', '');
 		Irssi::settings_set_str('classroom_session', '');
+		Irssi::settings_set_str('classroom_event', '');
 		&refresh_settings();
 		@questions=();
 		$review='';