timex_datalink_caldav 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e70c9183de68e607682770a4085c86d87ba3cc0d09105c6867b445a702d8808d
-  data.tar.gz: 6f4248f1fc332ce55c3c7b2850a8b49ccc42d6456301235225032fb2aeb1d80e
+  metadata.gz: 8301c0dee4e085d6ebbbebbcd41872211625f6798980f688cf66765550519622
+  data.tar.gz: 30171ce1fcdb85fa57b17121982c85ab5805cdbef1f12106d56561397bd82ee6
 SHA512:
-  metadata.gz: 925f98b03e5797567d02b7640febc98338c0fc9dacffa0c5771d501c266c9ee4dc59667752b489db851a1f8fe9cc4d4349fab0094ceab3f8f3de4e339731be30
-  data.tar.gz: 7b78a3c9ae837604bff285c6584f1dc84ae32279ce3f99ee0e32d8037f37dd3832451f07aeacca2a5e102d4a2a4016c1b5c6bc570e2aa9d31f04167975a79288
+  metadata.gz: 31a43cf2e995bcd29d51ebae9d3a30002239ac0bea6862f97b0f967daf25734409432e75fbced7727ecc2126e6ec509bdb0c09fd6dc7fcbffed87e9c124d73a5
+  data.tar.gz: 5b8b1f14b62a03c6354c2b555651ae6336b6248ddc633b4749b966929c2e8b6e39c8d6f8845cb57329a46a5dc18c35522bd8a193c115efa781922ead52853705

data/Gemfile

@@ -23,4 +23,10 @@ gem "tzinfo", "~> 2.0"
 
 gem "yaml", "~> 0.2.1"
 
-gem "open-uri", "~> 0.3.0"
+gem "text", "~> 1.3"
+
+gem "humanize", "~> 2.5"
+
+gem "down", "~> 5.4"
+
+gem "ruby-progressbar", "~> 1.13"

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    timex_datalink_caldav (0.3.0)
+    timex_datalink_caldav (1.0.0)
 
 GEM
   remote: https://rubygems.org/
@@ -21,10 +21,11 @@ GEM
       nokogiri
     concurrent-ruby (1.2.2)
     crc (0.4.2)
-    date (3.3.3)
     diff-lcs (1.5.0)
     domain_name (0.5.20190701)
       unf (>= 0.0.5, < 1.0.0)
+    down (5.4.1)
+      addressable (~> 2.8)
     ffi (1.15.5)
     ffi-compiler (1.0.1)
       ffi (>= 1.0.0)
@@ -37,6 +38,7 @@ GEM
     http-cookie (1.0.5)
       domain_name (~> 0.5)
     http-form_data (2.3.0)
+    humanize (2.5.1)
     i18n (1.13.0)
       concurrent-ruby (~> 1.0)
     icalendar (2.8.0)
@@ -52,10 +54,6 @@ GEM
     minitest (5.18.0)
     nokogiri (1.14.4-arm64-darwin)
       racc (~> 1.4)
-    open-uri (0.3.0)
-      stringio
-      time
-      uri
     public_suffix (5.0.1)
     racc (1.6.2)
     rake (13.0.6)
@@ -72,11 +70,10 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.12.0)
     rspec-support (3.12.0)
+    ruby-progressbar (1.13.0)
     rubyserial (0.6.0)
       ffi (~> 1.9, >= 1.9.3)
-    stringio (3.0.6)
-    time (0.2.2)
-      date
+    text (1.3.1)
     timex_datalink_client (0.11.0)
       activemodel (~> 7.0.4)
       crc (~> 0.4.2)
@@ -87,7 +84,6 @@ GEM
     unf (0.1.4)
       unf_ext
     unf_ext (0.0.8.2)
-    uri (0.12.1)
     yaml (0.2.1)
 
 PLATFORMS
@@ -96,11 +92,14 @@ PLATFORMS
 DEPENDENCIES
   activesupport (~> 7.0)
   calendav (~> 0.4.0)
+  down (~> 5.4)
+  humanize (~> 2.5)
   icalendar (~> 2.8)
   icalendar-recurrence (~> 1.1)
-  open-uri (~> 0.3.0)
   rake (~> 13.0)
   rspec (~> 3.12)
+  ruby-progressbar (~> 1.13)
+  text (~> 1.3)
   timex_datalink_caldav!
   timex_datalink_client (~> 0.11.0)
   tzinfo (~> 2.0)

data/bin/get_ebrain_db

@@ -0,0 +1,57 @@
+#!/usr/bin/env ruby
+
+require 'down'
+require 'fileutils'
+require 'tmpdir'
+require 'ruby-progressbar'
+
+# Define URL and file names
+url = "https://archive.org/download/ebrain-1.1.6/ebrain-1.1.6.iso"
+iso_file = File.join(Dir.tmpdir, "ebrain-1.1.6.iso")
+msi_file = File.join(Dir.tmpdir, "eBrain.MSI")
+cab_file = File.join(Dir.tmpdir, "Cabs.w4.cab")
+mdb_file1 = File.join(Dir.tmpdir, "pcvocab.mdb1")
+mdb_file = "pcvocab.mdb" # This is in the current directory
+
+# Check if 7zip is installed
+unless system('which 7z > /dev/null 2>&1')
+  puts "7zip is not installed. Please download and install 7zip from https://www.7-zip.org/download.html"
+  exit 1
+end
+
+# Initialize the progress bar
+progressbar = nil
+
+# Download the ISO file
+puts "Downloading ISO file..."
+Down.download(url,
+  destination: iso_file,
+  content_length_proc: ->(content_length) {
+    progressbar = ProgressBar.create(
+      title: 'Download Progress',
+      total: content_length,
+      format: '%a %bᗧ%i %p%% %t, Estimated time: %e'
+    )
+  },
+  progress_proc: ->(progress) {
+    progressbar.progress = progress
+  }
+)
+
+# Extract the MSI file from the ISO
+puts "Extracting MSI file..."
+system("7z e #{iso_file} -o#{File.dirname(msi_file)} #{File.basename(msi_file)}")
+
+# Extract the CAB file from the MSI
+puts "Extracting CAB file..."
+system("7z e #{msi_file} -o#{File.dirname(cab_file)} #{File.basename(cab_file)}")
+
+# Extract the MDB file from the CAB
+puts "Extracting MDB file..."
+system("7z e #{cab_file} -o#{File.dirname(mdb_file1)} #{File.basename(mdb_file1)}")
+
+# Rename and move the MDB file to the current directory
+puts "Renaming and moving MDB file..."
+FileUtils.mv mdb_file1, mdb_file
+
+puts "Done."

data/lib/timex_datalink_caldav/client.rb

@@ -4,6 +4,8 @@ require 'icalendar/recurrence'
 require 'timex_datalink_client'
 require 'active_support/time'
 require 'tzinfo'
+require 'humanize'
+require_relative 'similar_word'
 
 module TimexDatalinkCaldav
   class Client
@@ -15,13 +17,14 @@ module TimexDatalinkCaldav
       @days_forward = days_forward
       @protocol_version = protocol_version.to_i
       @protocol_class = case @protocol_version
-                        when 1 then TimexDatalinkClient::Protocol1
-                        when 3 then TimexDatalinkClient::Protocol3
-                        when 4 then TimexDatalinkClient::Protocol4
-                        else
-                          raise ArgumentError, "Invalid protocol version: #{@protocol_version}"
-                        end
-                      end
+                          when 1 then TimexDatalinkClient::Protocol1
+                          when 3 then TimexDatalinkClient::Protocol3
+                          when 4 then TimexDatalinkClient::Protocol4
+                          when 7 then TimexDatalinkClient::Protocol7
+                          else
+                            raise ArgumentError, "Invalid protocol version: #{@protocol_version}"
+                          end
+    end
 
     def get_localzone
       TZInfo::Timezone.get(TZInfo::Timezone.all_country_zones.detect {|z| z.period_for_local(Time.now).utc_total_offset == Time.now.utc_offset}.identifier)
@@ -59,46 +62,113 @@ module TimexDatalinkCaldav
       anniversaries = []
       appointment_map = {} # Used to avoid duplicate appointments
       anniversary_map = {} # Used to avoid duplicate anniversaries
-      
+    
+      phrase_builder = SimlarWord.new(database: "pcvocab.mdb") if @protocol_version == 7
+    
       events.each do |event|
-        next unless event
-
-        if event.dtstart && event.dtend && (event.dtend.to_date - event.dtstart.to_date == 1) && event.dtstart.to_datetime.hour == 0 && event.dtstart.to_datetime.min == 0 && event.dtend.to_datetime.hour == 0 && event.dtend.to_datetime.min == 0 # Checking if it is an all day event
-          occurrences = event.occurrences_between(Time.now, Time.now + @days_forward*24*60*60)
-          occurrences.each do |occurrence|
-            est_time = occurrence.start_time.in_time_zone(get_localzone)
-            key = "#{est_time}_#{event.summary.to_s}"
-            puts key
-            unless anniversary_map[key] # Check if the event is already in the map
-              puts "Adding anniversary: #{event.summary.to_s} at date #{event.dtstart.to_s}"
-              anniversary = @protocol_class::Eeprom::Anniversary.new(
-                time: event.dtstart.to_time,
-                anniversary: event.summary.to_s
-              )
-              anniversaries << anniversary
-              anniversary_map[key] = true
-            end
+        next unless event && event.dtstart && event.dtend
+    
+        summary_words = parse_summary(event)
+    
+        occurrences = event.occurrences_between(Time.now, Time.now + @days_forward*24*60*60)
+    
+        if @protocol_version == 7
+          if all_day_event?(event)
+            add_anniversary_event(anniversary_map, anniversaries, phrase_builder, summary_words, occurrences)
+          else
+            add_appointment_event(appointment_map, appointments, phrase_builder, summary_words, occurrences)
           end
-        elsif event.dtstart && event.dtend
-          occurrences = event.occurrences_between(Time.now, Time.now + @days_forward*24*60*60)
-          occurrences.each do |occurrence|
-            est_time = occurrence.start_time.in_time_zone(get_localzone)
-            key = "#{est_time}_#{event.summary.to_s}"
-            unless appointment_map[key] # Check if the event is already in the map
-              puts "Adding appointment: #{event.summary.to_s} at time #{est_time}"
-              appointment = @protocol_class::Eeprom::Appointment.new(
-                time: est_time,
-                message: event.summary.to_s
-              )
-              appointments << appointment
-              appointment_map[key] = true
-            end
+        else
+          if all_day_event?(event)
+            add_anniversary(event, anniversary_map, anniversaries, summary_words, occurrences)
+          else
+            add_appointment(event, appointment_map, appointments, summary_words, occurrences)
           end
         end
       end
-      
+    
       [appointments, anniversaries]
     end
+    
+    def all_day_event?(event)
+      (event.dtend.to_date - event.dtstart.to_date == 1) && event.dtstart.to_datetime.hour == 0 && event.dtstart.to_datetime.min == 0 && event.dtend.to_datetime.hour == 0 && event.dtend.to_datetime.min == 0
+    end
+    
+    def parse_summary(event)
+      event.summary.to_s.split.map do |word| 
+        if word =~ /\A[a-zA-Z]+\z/
+          word
+        elsif word =~ /\A\d+\z/ 
+          word.to_i.humanize
+        end
+      end.compact
+    end
+    
+    def add_appointment_event(appointment_map, appointments, phrase_builder, summary_words, occurrences)
+      occurrences.each do |occurrence|
+        est_time = occurrence.start_time.in_time_zone(get_localzone)
+        key = "#{est_time}_#{summary_words}"
+        unless appointment_map[key]
+          puts "Adding appointment event: #{summary_words.join(' ')} at time #{est_time}"
+          event_phrase = phrase_builder.vocab_ids_for(*summary_words)
+          appointment = @protocol_class::Eeprom::Calendar::Event.new(
+            time: est_time,
+            phrase: event_phrase
+          )
+          appointments << appointment
+          appointment_map[key] = true
+        end
+      end
+    end
+    
+    def add_anniversary_event(anniversary_map, anniversaries, phrase_builder, summary_words, occurrences)
+      occurrences.each do |occurrence|
+        est_time = occurrence.start_time.in_time_zone(get_localzone)
+        key = "#{est_time}_#{summary_words.join(' ')}"
+        unless anniversary_map[key]
+          puts "Adding anniversary event: #{summary_words.join(' ')} at date #{event.dtstart.to_s}"
+          event_phrase = phrase_builder.vocab_ids_for(*summary_words)
+          anniversary = @protocol_class::Eeprom::Calendar::Event.new(
+            time: Time.new(est_time.year, est_time.month, est_time.day, 9, 30, 0),
+            phrase: event_phrase
+          )
+          anniversaries << anniversary
+          anniversary_map[key] = true
+        end
+      end
+    end
+    
+    def add_appointment(event, appointment_map, appointments, summary_words, occurrences)
+      occurrences.each do |occurrence|
+        est_time = occurrence.start_time.in_time_zone(get_localzone)
+        key = "#{est_time}_#{summary_words}"
+        unless appointment_map[key]
+          puts "Adding appointment: #{summary_words} at time #{est_time}"
+          appointment = @protocol_class::Eeprom::Appointment.new(
+            time: est_time,
+            message: summary_words
+          )
+          appointments << appointment
+          appointment_map[key] = true
+        end
+      end
+    end
+    
+    def add_anniversary(event, anniversary_map, anniversaries, summary_words, occurrences)
+      occurrences.each do |occurrence|
+        est_time = occurrence.start_time.in_time_zone(get_localzone)
+        key = "#{est_time}_#{summary_words}"
+        unless anniversary_map[key]
+          puts "Adding anniversary: #{summary_words} at date #{event.dtstart.to_s}"
+          anniversary = @protocol_class::Eeprom::Anniversary.new(
+            time: event.dtstart.to_time,
+            anniversary: summary_words
+          )
+          anniversaries << anniversary
+          anniversary_map[key] = true
+        end
+      end
+    end
 
     def write_to_watch(appointments, anniversaries)
       appointments.sort_by! { |appointment| appointment.time }
@@ -125,7 +195,7 @@ module TimexDatalinkCaldav
           zone: 2,
           name: time2.zone
         )
-      else
+      elsif @protocol_version == 3 || @protocol_version == 4
         time_model = @protocol_class::Time.new(
           zone: 1,
           name: time1.zone,
@@ -143,22 +213,41 @@ module TimexDatalinkCaldav
         time_name_model = nil # Not needed for protocol version 3 and 4
         utc_time_name_model = nil # Not needed for protocol version 3 and 4
 
+      else
+        time_model = nil
+        utc_time_model = nil
+        time_name_model = nil
+        utc_time_name_model = nil
+      end
+      
+      if @protocol_version == 7
+        calendar = @protocol_class::Eeprom::Calendar.new(
+          time: time1,
+          events: appointments
+        )
+        models = [
+          @protocol_class::Sync.new,
+          @protocol_class::Start.new,
+          @protocol_class::Eeprom.new(
+            calendar: calendar
+          )
+        ]
+      else
+        models = [
+          @protocol_class::Sync.new,
+          @protocol_class::Start.new,
+          time_model,
+          time_name_model,
+          utc_time_model,
+          utc_time_name_model,
+          @protocol_class::Eeprom.new(
+            appointments: appointments,
+            anniversaries: anniversaries,
+            appointment_notification_minutes: 5
+          ),
+          @protocol_class::End.new
+        ].compact # Remove any nil entries
       end
-
-      models = [
-        @protocol_class::Sync.new,
-        @protocol_class::Start.new,
-        time_model,
-        time_name_model,
-        utc_time_model,
-        utc_time_name_model,
-        @protocol_class::Eeprom.new(
-          appointments: appointments,
-          anniversaries: anniversaries,
-          appointment_notification_minutes: 5
-        ),
-        @protocol_class::End.new
-      ].compact # Remove any nil entries
 
       timex_datalink_client = TimexDatalinkClient.new(
         serial_device: @serial_device,

data/lib/timex_datalink_caldav/similar_word.rb

@@ -0,0 +1,88 @@
+# frozen_string_literal: true
+
+require "mdb"
+require "text"  # import the text gem
+
+
+class SimlarWord
+    class WordNotFound < StandardError; end
+    
+    attr_accessor :database
+    
+    def initialize(database:)
+        @database = database
+    end
+    
+    def vocab_ids_for(*words)
+        words.flat_map do |word|
+            vocab = vocab_for_word(word)
+            
+            # If the word is not found, look for a similar sounding word
+            if vocab.nil?
+                word = find_similar_word(word)
+                vocab = vocab_for_word(word)
+            end
+            
+            raise(WordNotFound, "#{word} is not a valid word!") unless vocab
+            
+            vocab_links = vocab_links_for_vocab(vocab)
+            
+            vocab_links.map do |vocab_link|
+                linked_vocab = vocab_for_vocab_link(vocab_link)
+                
+                linked_vocab[:"PC Index"].to_i
+            end
+        end
+    end
+    
+    private
+    
+    def find_similar_word(word)
+        word_metaphone = Text::Metaphone.double_metaphone(word)
+      
+        # Filter out words that start with '<' before finding the minimum distance
+        filtered_vocab_table = vocab_table.reject { |vocab_word| vocab_word[:Label].start_with?('<') }
+    
+        similar_word = filtered_vocab_table.min_by do |vocab_word|
+          distance = Text::Levenshtein.distance(
+            Text::Metaphone.double_metaphone(vocab_word[:Label]).first, 
+            word_metaphone.first
+          )
+          distance
+        end
+      
+        if similar_word
+            puts "Similar word for '#{word}' is '#{similar_word[:Label]}'"
+            similar_word[:Label]
+        else
+            puts "No similar word found for '#{word}', using original word"
+            word
+        end
+    end
+    
+    def mdb
+        @mdb ||= Mdb.open(database)
+    end
+    
+    def vocab_table
+        @vocab_table ||= mdb["Vocab"]
+    end
+    
+    def vocab_links_table
+        @vocab_links_table ||= mdb["Vocab Links"]
+    end
+    
+    def vocab_for_word(word)
+        vocab_table.detect { |vocab| vocab[:Label].casecmp?(word) }
+    end
+    
+    def vocab_links_for_vocab(vocab)
+        links = vocab_links_table.select { |vocab_link| vocab_link[:"PC Index"] == vocab[:"PC Index"] }
+        
+        links.sort_by { |link| link[:Sequence].to_i }
+    end
+    
+    def vocab_for_vocab_link(vocab_link)
+        vocab_table.detect { |vocab| vocab[:"PC Index"] == vocab_link[:"eBrain Index"] }
+    end
+end

data/lib/timex_datalink_caldav/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module TimexDatalinkCaldav
-  VERSION = "1.0.0"
+  VERSION = "1.1.0"
 end

data/timex_datalink_caldav.gemspec

@@ -28,7 +28,7 @@ Gem::Specification.new do |spec|
   end
   spec.require_paths = ["lib"]
   spec.executables << 'timex_datalink_caldav'
-
+  spec.executables << 'get_ebrain_db'
   # Uncomment to register a new dependency of your gem
   # spec.add_dependency "example-gem", "~> 1.0"
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: timex_datalink_caldav
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Willy Hardy
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-05-19 00:00:00.000000000 Z
+date: 2023-05-26 00:00:00.000000000 Z
 dependencies: []
 description: 'Adds a CLI and a feature to pull your next day of calendar events into
   the Timex Datalink watch. Note: Hardcoded protocol1 and EST timezone. At the moment.'
@@ -16,6 +16,7 @@ email:
 - zpga8gbp@mailer.me
 executables:
 - timex_datalink_caldav
+- get_ebrain_db
 extensions: []
 extra_rdoc_files: []
 files:
@@ -25,11 +26,13 @@ files:
 - LICENSE
 - README.md
 - Rakefile
+- bin/get_ebrain_db
 - bin/timex_datalink_caldav
 - examples/README.md
 - examples/caldav.yaml.sample
 - lib/timex_datalink_caldav.rb
 - lib/timex_datalink_caldav/client.rb
+- lib/timex_datalink_caldav/similar_word.rb
 - lib/timex_datalink_caldav/version.rb
 - sig/timex_datalink_caldav.rbs
 - timex_datalink_caldav.gemspec
@@ -56,7 +59,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.10
+rubygems_version: 3.4.13
 signing_key:
 specification_version: 4
 summary: Allows the Timex Datalink watch to sync with a CalDAV server.