icalPal 3.0.0 → 3.1.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 25a711f9e4887a81dafccbc57e0a2fa84530dc8cee81e58f0d5df6041783bec2
4
- data.tar.gz: 698a498065687f7a7d06e6c316d1937bfc3b1a58d7a661b612bb8d39b5429318
3
+ metadata.gz: c3e477a80eaaf8149b68b6c36aa0a5a9422e4ea9d6fdbcf36b11bdb74f8cca7f
4
+ data.tar.gz: 416f7f1afb820b969d887cd15f0a60ae0344ea5433f6b7a145a4672f166286de
5
5
  SHA512:
6
- metadata.gz: 9cf18231c95a94b663e1a41ecd16326f447fb038864677ad05ba2a6fa5f684ae999732401ff30b9df1b0739ff31f78f7b0385e3f7774d5260b9cfbc37a6d2680
7
- data.tar.gz: d3aaf37df004da104518e80463c2bc6933ba87277fc9c913bb73a4653055a93417694fb1de655d1c3776f3d47d45afaf241b5ba59361894bafa7ebd1bf253c29
6
+ metadata.gz: 9818532d5d53e090e7045480455ceb8f989c4530665698382781d59fce4ab380517cd22c9b204b0a556a87ce263e6242c3a11436112b7a32c121477b8afbd7e7
7
+ data.tar.gz: f16c07f9b1e4d113c096dfed547565114352e3c50ea65bbe49ee58ae9753d8bf2edd0362e5447bb2b529a7038e2c2a70797e63a3793f45e02d3a96914d8ea6b1
data/bin/icalPal CHANGED
@@ -65,12 +65,19 @@ end
65
65
  klass = ICalPal::($opts[:cmd])
66
66
 
67
67
  # Get it
68
- if klass == ICalPal::Reminder then
69
- # Load all .sqlite files
70
- Dir.glob("#{$opts[:db]}/*.sqlite").each { |db| $rows += ICalPal.load_data(db, klass::QUERY) }
71
- else
72
- # Load database
73
- $rows += ICalPal.load_data($opts[:db], klass::QUERY)
68
+ $opts[:db].each do |db|
69
+ $log.debug("Trying #{db}")
70
+
71
+ if klass == ICalPal::Reminder then
72
+ # Load all .sqlite files
73
+ $log.debug("Loading *.sqlite in #{db}")
74
+ Dir.glob("#{db}/*.sqlite").each { |d| $rows += ICalPal.load_data(d, klass::QUERY) }
75
+ else
76
+ # Load database
77
+ begin
78
+ $rows += ICalPal.load_data(db, klass::QUERY)
79
+ end
80
+ end
74
81
  end
75
82
 
76
83
  $log.info("Loaded #{$rows.count} #{klass} rows")
data/bin/icalpal CHANGED
@@ -65,12 +65,19 @@ end
65
65
  klass = ICalPal::($opts[:cmd])
66
66
 
67
67
  # Get it
68
- if klass == ICalPal::Reminder then
69
- # Load all .sqlite files
70
- Dir.glob("#{$opts[:db]}/*.sqlite").each { |db| $rows += ICalPal.load_data(db, klass::QUERY) }
71
- else
72
- # Load database
73
- $rows += ICalPal.load_data($opts[:db], klass::QUERY)
68
+ $opts[:db].each do |db|
69
+ $log.debug("Trying #{db}")
70
+
71
+ if klass == ICalPal::Reminder then
72
+ # Load all .sqlite files
73
+ $log.debug("Loading *.sqlite in #{db}")
74
+ Dir.glob("#{db}/*.sqlite").each { |d| $rows += ICalPal.load_data(d, klass::QUERY) }
75
+ else
76
+ # Load database
77
+ begin
78
+ $rows += ICalPal.load_data(db, klass::QUERY)
79
+ end
80
+ end
74
81
  end
75
82
 
76
83
  $log.info("Loaded #{$rows.count} #{klass} rows")
data/lib/defaults.rb CHANGED
@@ -10,7 +10,10 @@ $defaults = {
10
10
  bullet: '•',
11
11
  cf: "#{ENV['HOME']}/.icalpal",
12
12
  color: false,
13
- db: "#{ENV['HOME']}/Library/Calendars/Calendar.sqlitedb",
13
+ db: [
14
+ "#{ENV['HOME']}/Library/Calendars/Calendar.sqlitedb",
15
+ "#{ENV['HOME']}/Library/Group Containers/group.com.apple.calendar/Calendar.sqlitedb",
16
+ ],
14
17
  debug: Logger::WARN,
15
18
  df: '%b %-d, %Y',
16
19
  ec: [],
@@ -36,19 +39,19 @@ $defaults = {
36
39
  },
37
40
  tasks: {
38
41
  dated: 0,
39
- db: ICalPal::Reminder::DB_PATH,
42
+ db: [ ICalPal::Reminder::DB_PATH ],
40
43
  iep: [ 'title', 'notes', 'due', 'priority' ],
41
44
  sort: 'prio',
42
45
  },
43
46
  undatedTasks: {
44
47
  dated: 1,
45
- db: ICalPal::Reminder::DB_PATH,
48
+ db: [ ICalPal::Reminder::DB_PATH ],
46
49
  iep: [ 'title', 'notes', 'due', 'priority' ],
47
50
  sort: 'prio',
48
51
  },
49
52
  datedTasks: {
50
53
  dated: 2,
51
- db: ICalPal::Reminder::DB_PATH,
54
+ db: [ ICalPal::Reminder::DB_PATH ],
52
55
  iep: [ 'title', 'notes', 'due', 'priority' ],
53
56
  sort: 'prio',
54
57
  },
data/lib/icalPal.rb CHANGED
@@ -58,6 +58,9 @@ module ICalPal
58
58
  rescue SQLite3::BusyException => e
59
59
  $log.error("Non-fatal error closing database #{db.filename}")
60
60
 
61
+ rescue SQLite3::CantOpenException => e
62
+ $log.debug("Can't open #{db_file}")
63
+
61
64
  rescue SQLite3::SQLException => e
62
65
  $log.info("#{db_file}: #{e}")
63
66
 
data/lib/version.rb CHANGED
@@ -1,4 +1,4 @@
1
1
  module ICalPal
2
2
  NAME = 'icalPal'
3
- VERSION = '3.0.0'
3
+ VERSION = '3.1.0'
4
4
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: icalPal
3
3
  version: !ruby/object:Gem::Version
4
- version: 3.0.0
4
+ version: 3.1.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Andy Rosen
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2024-09-11 00:00:00.000000000 Z
11
+ date: 2024-11-05 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: sqlite3