Calendar

.gitattributes

@@ -0,0 +1 @@
+* text=auto

bin/dir_to_file.bat

@@ -1,3 +1,3 @@
-@echo off
-dir %1:\ > .\%2
-
+@echo off
+dir %1:\ > .\%2
+

bin/get_areacodes.pl

@@ -0,0 +1,38 @@
+#!/usr/bin/perl
+use strict;
+use warnings;
+use HTML::TableExtract;
+use LWP::Simple;
+
+use Time::Local;
+
+my $url = "http://www-cse.ucsd.edu/users/bsy/area.html";
+my $html = get($url);
+my $table = HTML::TableExtract->new;
+my $row;
+print "# Downloaded from $url\n";
+print "# On ". (localtime) . "\n";
+print "#\n";
+$table->parse($html);
+# Table parsed, extract the data.
+ foreach $row ($table->rows) {
+ next unless @$row[0] =~ m/^[\-|\d]/;
+ my $ac = @$row[0];
+ my $prov = @$row[1];
+ my $tz = @$row[2]; 
+ my $description = @$row[3];
+ $description =~ s/^\s+//g;
+ if ($description =~ m/^canada\:/ig) {
+ $description =~ s/^canada\:\s+//i;
+ $description =~ s/\(.*\)$//;
+ $description =~ s/^.+\:\s+//; #remove additional province details
+ $description =~ s/[\-\-|\;].*//;
+ #my $place;
+ #($place) = $description =~ /\:(.*)\(.*\)$/i; #get rid of the end stuff
+ print "$ac $prov $tz $description\n";
+ #print "\t\t$place\n";
+ } else {
+ print "$ac $prov $tz $description\n";
+ }
+# print join(',', @$row), "\n";
+ }

bin/get_earthquakes.bat

@@ -1 +1 @@
-@mh -run get_earthquakes %1 %2 %3 %4 %5 %6 %7 %8 %9
+@mh -run get_earthquakes %1 %2 %3 %4 %5 %6 %7 %8 %9

bin/holical.bat

@@ -1,2 +1,2 @@
-@mh -run holical %1 %2 %3
-@rem perl -S holical %1 %2 %3
+@mh -run holical %1 %2 %3
+@rem perl -S holical %1 %2 %3

bin/ical2vsdb

@@ -9,13 +9,19 @@ use strict;
 ##
 ## Date::Calc
 ## DateTime::TimeZone
+## Crypt::SSLeay is required if using https
 ##
 ## All other libs should exist w/i the core mh lib/site dir structure
 ##
 
 ## Changelog 3.4 10-04-06: for some reason ical parser is adding an 'ical' level in the
 ## ical parse hash from a Darwin Calendar Server. Added a dcsfix option
-
+##
+## v4.0 01-2014: Date bugfix, added https method, added control calendar, and made sync_dtstamp
+## and dcsfix defaults. Added in nosync_dtstamp and nodcsfix option to override.
+## NOTE: v4 requires the update 2014 vsdb calendar schema (adding a control attribute). 
+## Common module organizer 2014 and vsdb calendar.pl 1.6.0-3 required.
+##
 
 use lib '../lib', '../lib/site';
 use iCal::Parser;
@@ -33,12 +39,11 @@ use vsLock;
 # verify todos (uninitialized string message?)
 # verify locking works as expected
 
-
 my $progname = "ical2vsdb";
-my $progver = "v3.4 10-04-06";
+my $progver = "v4 01-2014";
 my $DB = 0;
 
-my $days_before = 180; # defaults to avoid large vsdb databases, can be overriden
+my $days_before = -180; # defaults to avoid large vsdb databases, can be overriden
 my $days_after = 180; #
 
 my $config_file= "";
@@ -55,6 +60,7 @@ $config_file = $ARGV[0] if $ARGV[0];
 &help if ((lc $config_file eq "-h") or (lc $config_file eq "--h") or ($config_file eq ""));
 
 print "iCal to vsDB Misterhouse import ($progname $progver) starting...\n";
+print "Debug Level $DB\n" if ($DB);
 
 &purge_icals if ($config_file eq "--purge-ical-info");
 
@@ -120,10 +126,12 @@ while (1) {
  print "done\n";
  $process = 1;
 
- } elsif ((lc $ical_data[$loop]->{method} eq "http") or (lc $ical_data[$loop]->{method} eq "webcal")) {
- print "Fetching via LWP...";
+ } elsif ((lc $ical_data[$loop]->{method} eq "http") or (lc $ical_data[$loop]->{method} eq "https") or (lc $ical_data[$loop]->{method} eq "webcal")) {
  my $ua = new LWP::UserAgent;
- my $req = new HTTP::Request GET => "http://" . $calendar_loc;
+ my $method = "http";
+ $method .= "s" if (lc $ical_data[$loop]->{method} eq "https");
+ print "Fetching via LWP:$method...";
+ my $req = new HTTP::Request GET => $method . "://" . $calendar_loc;
  if ($ical_data[$loop]->{username}) {
  $req->authorization_basic($ical_data[$loop]->{username},$ical_data[$loop]->{password});
  }
@@ -162,7 +170,7 @@ while (1) {
 
  if ($process) {
 
- if ($ical_data[$loop]->{options}->{sync_dtstamp}) {
+ unless ($ical_data[$loop]->{options}->{nosync_dtstamp}) {
  print "Syncing DTSTAMP attributes from CREATED...\n";
  $data =~ s/DTSTAMP:(.*)\n//g;
  $data =~ s/CREATED:(.*)\n/CREATED:$1\nDTSTAMP:$1\n/g;
@@ -178,7 +186,7 @@ while (1) {
 # print "Debug: Hash=$ical_data[$loop]->{hash}\n" if (defined $ical_data[$loop]->{hash});
 
  if (!(defined $ical_data[$loop]->{hash}) or ($ical_data[$loop]->{hash} ne $digest)) {
- print "New Calendar entries. Processing iCal...";
+ print "New Calendar entries. Processing iCal.";
  if ($ical_data[$loop]->{method} ne "dir") {
  eval {$parser->parse_strings($data); };
  }
@@ -299,14 +307,16 @@ sub parse_cal {
  my $opt_speak_todo = 0;
  my $opt_holiday = 0;
  my $opt_vacation = 0;
+ my $opt_control = 0;
 
  $opt_speak_cal = 1 if (exists $options->{speak_cal});
  $opt_speak_todo = 1 if (exists $options->{speak_todo});
  $opt_holiday = 1 if (exists $options->{holiday});
  $opt_vacation = 1 if (exists $options->{vacation});
+ $opt_control = 1 if (exists $options->{control});
+
  my ($opt_sourcename) = $options->{name} if (defined $options->{name});
- $cal = $cal->{ical} if (exists $options->{dcsfix});
- print "Fixing Darwin Calendar Server Settings...\n" if ($DB and (exists $options->{dcsfix}));
+ $cal = $cal->{ical} unless (exists $options->{nodcsfix});
  my $calname = $cal->{cals}->[0]->{'X-WR-CALNAME'};
  $calname = $opt_sourcename if $opt_sourcename;
 
@@ -334,16 +344,17 @@ sub parse_cal {
  print "."; #give some progress
  while (my $uid = each %{$cal->{events}->{$year}->{$month}->{$day}}) {
  my $delta;
-
  #is this event in range?
  if ($days_before or $days_after) {
  $delta = Delta_Days($lyear,$lmon,$lday, $year,$month,$day);
  }
+ print "EventID:$uid, before=$days_before after=$days_after delta=$delta\n" if ($DB>2);
 
  #if not then skip the item
  next if ((($days_before) and ($days_before > $delta)) or
- (($days_after) and ($days_after < $delta))); 
-
+ (($days_after) and ($days_after < $delta))); 
+
+ print "Processing EventID:$uid\n" if ($DB >2);
  my $event_ref = $cal->{events}->{$year}->{$month}->{$day}->{$uid};
  my $starttime = "12:00 am"; # starttime and endtime are initialized the same if all day
  my $endtime = "12:00 am";
@@ -380,6 +391,8 @@ sub parse_cal {
  $holiday = "on" if $opt_holiday;
  my $vacation = "off";
  $vacation = "on" if $opt_vacation;
+ my $control = "off";
+ $control = "on" if $opt_control;
 
  my $description = $event_ref->{DESCRIPTION} || '';
  if ($description) {
@@ -399,6 +412,7 @@ sub parse_cal {
  $out_cals[$count]->{DETAILS} = $description;
  $out_cals[$count]->{HOLIDAY} = $holiday;
  $out_cals[$count]->{VACATION} = $vacation;
+ $out_cals[$count]->{CONTROL} = $control;
  $out_cals[$count]->{SOURCE} = $source;
  $out_cals[$count]->{REMINDER} = $reminder;
  $out_cals[$count]->{ENDTIME} = $endtime;
@@ -542,7 +556,8 @@ sub init {
  $ical_data[$count]->{options}->{$key} = $value;
  }
  $ical_data[$count]->{hash} = "none";
-
+ print "Applying second level ical parsing (set nodscfix if this breaks anything) ...\n" unless (exists $ical_data[$count]->{options}->{nodcsfix});
+
  my ($method, $loc) = split(/:\/\//,$url);
  if ($loc) {
  my ($username, $password, $uri) = $loc =~ /^(\S+):(\S+)@(\S+)/i;
@@ -593,12 +608,14 @@ sub help {
 
  print "usage\t$progname CONFIGURATION_FILE OUTPUT_DIR\n";
  print " or\t$progname --purge-ical-info OUTPUT_DIR\n";
+ print "version $progver\n";
  print "\n\n";
  print " -- CONFIG FILE SYNTAX -- \n";
  print "TYPE<tab>VALUE<tab>option\n\n";
  print "TYPE = cfg_version|ical|days_before|days_after|sleep\n";
  print "VALUE = parameter value or ical location (http://, file://, dir://)\n";
- print "OPTION = comma delimited values (holiday,name=Joe User,speak_todos,vacation,sync_dtstamp)\n";
+ print "OPTION = comma delimited values (holiday,name=Joe User,speak_todos,vacation,\n";
+ print " control, nodcsfix, nosync_dtstamp)\n";
  print "\n";
 
  die;

bin/ical2vsdb.bat

@@ -1,2 +1,2 @@
-@mh -run ical2vsdb %1 %2 %3
-@rem perl -S ical2vsdb %1 %2 %3
+@mh -run ical2vsdb %1 %2 %3
+@rem perl -S ical2vsdb %1 %2 %3

bin/mh

@@ -70,6 +70,14 @@ BEGIN {
  $Version = $autover || 'unknown';
  $Version .= " (compiler: $Info{Perl_compiled})" if $Info{Perl_compiled};
 
+ #Create a build number if this is unstable version
+ if (lc $Version eq 'unstable'){
+ my $build = lc `git describe --long`;
+ $build =~ /(\S+)-(\d+)-g([0-9a-f]+)/;
+ $Version = "$1 Build $2 ($3)" if ($1 && defined($2) && $3);
+ }
+
+
 # $Pgm_Path = '.';
 
  $usage = <<"eof";
@@ -213,9 +221,23 @@ BEGIN {
 
  sub print_version {
 
- $Version_date = localtime((stat $0)[9]);
+ $Version_date = localtime((stat $0)[9]); #this script as default
  $Version_date = localtime((stat "$Pgm_Path/bin/$0.exe")[9]) if $PerlApp::BUILD;
  $Version_date = localtime((stat $ENV{sourceExe})[9]) if $ENV{sourceExe}; # Older 3.x perl2exe
+ $Version_date = localtime((stat '../VERSION')[9]) if (-e '../VERSION'); #if VERSION file exists use that
+
+ #Get version date for unstable branch
+ my $autover;
+ if (-e '../VERSION') {
+ open (VERSION, '../VERSION');
+ $autover = <VERSION>;
+ chomp $autover;
+ close (VERSION);
+ }
+ if (lc $autover eq 'unstable'){
+ my $build_date = `git show -s --format="%ci"`;
+ $Version_date = $build_date if ($build_date=~/^\d\d\d\d-\d\d-\d\d/);
+ }
 
  $Pgm_PathU = '.'; # Since we now chdir, this is obsolete, but still used in some user code :(
  $Pgm_Root = './..';
@@ -249,7 +271,7 @@ BEGIN {
 
  print "\nCommand: $Pgm_Name @ARGV\n";
  print "Pgm path : $Pgm_Path\n";
- print "Pgm version: $Version Last updated: $Version_date\n";
+ print "Pgm version: $Version \nLast updated: $Version_date\n";
  $Info{Perl_version} = $];
  # Use eval to avoid problems with earlier version (e.g. build 502)
  $Info{Perl_version} .= " Build " . eval "&Win32::BuildNumber()" if $OS_win;
@@ -736,7 +758,7 @@ sub setup {
  # Make various directories, if missing
  mkdir ("$config_parms{data_dir}/logs", 0777) unless -d "$config_parms{data_dir}/logs";
  mkdir ("$config_parms{data_dir}/web", 0777) unless -d "$config_parms{data_dir}/web";
- mkdir ("$config_parms{data_dir}/cache", 0777) unless -d "$config_parms{data_dir}/cache";
+ mkdir ("$config_parms{html_alias_cache}", 0777) unless -d "$config_parms{html_alias_cache}";
  mkdir ("$config_parms{html_dir}/tv", 0777) unless -d "$config_parms{html_dir}/tv";
  mkdir ("$config_parms{html_dir}/tv/clicktv", 0777) unless -d "$config_parms{html_dir}/tv/clicktv";
 
@@ -3819,7 +3841,7 @@ sub play {
  # Let the speak code push the wav file
  # For speak (TTS), this gets done in Voice_Text.pm
  if ($parms{address}) {
- copy $file, "$config_parms{data_dir}/cache/speak_address.$Second.wav";
+ copy $file, "$config_parms{html_alias_cache}/speak_address.$Second.wav";
  for my $address (split ',', $parms{address}) {
  my $address_code = $config_parms{voice_text_address_code};
  $address_code =~ s|\$address|$address|;
@@ -4775,6 +4797,10 @@ sub read_table_files {
  print "Error in &read_table_$format: $@\n" if $@;
  }
  }
+ if (defined(&{"read_table_finish_$format"})) {
+ print TABLE_OUT eval "&read_table_finish_$format()";
+ print "Error in &read_table_finish_$format: $@\n" if $@;
+ }
  close TABLE_IN;
  close TABLE_OUT;
  if ($format =~/xml/) { $/="\n"; }
@@ -4963,8 +4989,8 @@ sub read_user_code {
  $record =~ /->\s*hidden/ or
  $record =~ /^\s*set_(authority|icon|info|order|fp_location)\s/ or
  $record =~ /->\s*set_(authority|icon|info|order|fp_location)/ or
- $record =~ /^\s{0,3}\S+\s*->\s*add[\s\(]/ or
- $record =~ /^\s{0,3}add\s/) {
+ $record =~ /^\ {0,3}\S+\s*->\s*add[\s\(]/ or
+ $record =~ /^\ {0,3}add\s/) {
  $noloop_statement_flag = 1 unless $pod_flag; # Allow for multi-record statements
  }
 

bin/mh.ini

@@ -1085,9 +1085,9 @@ ipaddress_xpl_broadcast =
 @ See the mh/docs/install.html on how to install various speech engines.
 
 
-@ voice_text can be MS, MSV4, MSV5, festival, flite, theta or swift (for the  Cepstral engine on Linux),
-@ viavoice, vv_tts (for IBM's viavoice Outloud), NaturalVoice, NaturalVoiceWine, or
-@ program xyz (for a stand alone xyz program),
+@ voice_text can be MS, MSV4, MSV5, festival, flite, google (for the Google TTS API, requires ffmpeg),
+@ theta or swift (for the Cepstral engine on Linux), viavoice, vv_tts (for IBM's viavoice Outloud),
+@ NaturalVoice, NaturalVoiceWine, or program xyz (for a stand alone xyz program),
 @ Set to blank to disable.
 @ Use voice_text = MS on windows for all Microsoft SAPI compatible TTS engines, including AT&T NaturalVoice.
 @ Other parms specify paths to various TTS engines on unix systems.
@@ -2058,7 +2058,7 @@ eib_errata=2
 
 @ These are the states displayed on the tk and web menus
 @ French: insteon_menu_states=on,off,normal,eco,plus,moins,plus2,moins2,plus3,moins3,+40,-40,5%,30%,60%,100%
-insteon_menu_states=on,off,+40,-40,5%,30%,60%,100%
+insteon_menu_states=off,20%,40%,50%,60%,80%,on
 
 ******************************************************************************
 # Category = Misc
@@ -2451,4 +2451,4 @@ owfs_uom_temp = F
 # - add net parms. add cm11_serial parm.
 #
 
-#
+#

bin/mythnotify

@@ -0,0 +1,33 @@
+#!/usr/bin/perl
+
+use IO::Socket;
+use Getopt::Long;
+
+$MH_ADDRESS = '192.168.0.51';
+$MH_PORT = '5252';
+$username = 'mythtv_mh';
+$password = 'mythtv_mh';
+
+GetOptions("h" => \$help, "c=s" => \$chanid, "s=s" => \$starttime, "e=s" => \$endtime, "t=s" => \$title, "st=s" => \$subtitle, "d=s" => \$description );
+
+
+# Try to create a TCP socket to Misterhouse to establish communications with MisterHouse.
+$remote = IO::Socket::INET->new(Proto => "tcp", PeerAddr => "$MH_ADDRESS", PeerPort => "$MH_PORT",)
+ or die "cannot connect to misterhouse on port $MH_PORT at $MH_ADDRESS";
+
+# Do a simple login to Misterhouse. Not really needed if you are behind a firewall but just in case you are not
+# it is included. Keep in mind this is all plain text so if you are worried about that you should be aware.
+print $remote "Login: $username\n";
+print $remote "Secret: $password\n";
+
+print $remote "chanid: $chanid\n";
+print $remote "starttime: $starttime\n";
+print $remote "endtime: $endtime\n";
+print $remote "title: $title\n";
+print $remote "subtitle: $subtitle\n";
+print $remote "description: $description\n";
+print $remote ":done:\n";
+
+close($remote);
+
+system qq [echo $chanid,$starttime,$endtime,$title,$subtitle,$description >> /tmp/mynotify.txt];