From b780b3dda851c98de9a8f1af687cdd3a9ad5d5b0 Mon Sep 17 00:00:00 2001 From: df Date: Mon, 14 Dec 2020 14:06:48 +0000 Subject: [PATCH 01/12] exists -proc -> exists -command `exists -command` subsumes `exists -proc` This test is generally checking whether the command exists, rather than some proc that is overriding it. Currently `class` is a proc but this may not always be so. --- webif/lib/xml.class | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webif/lib/xml.class b/webif/lib/xml.class index 7cde513..8c3025e 100644 --- a/webif/lib/xml.class +++ b/webif/lib/xml.class @@ -2,7 +2,7 @@ # From https://wiki.tcl-lang.org/page/Parsing+XML # Keith Vetter 2004-03-01 -if {![exists -proc class]} { package require oo } +if {![exists -command class]} { package require oo } class xml { xml "" -- 2.44.0 From b59bead2a2e81fdf079c5366d732b7d9f9c3e1f3 Mon Sep 17 00:00:00 2001 From: df Date: Mon, 14 Dec 2020 14:08:28 +0000 Subject: [PATCH 02/12] exists -proc -> exists -command --- webif/lib/pkg.class | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webif/lib/pkg.class b/webif/lib/pkg.class index edd5e98..0cee525 100755 --- a/webif/lib/pkg.class +++ b/webif/lib/pkg.class @@ -1,5 +1,5 @@ -if {![exists -proc class]} { package require oo } +if {![exists -command class]} { package require oo } class pkg { name "" -- 2.44.0 From 23483c8fa5f59764f4ec5686b257dd5470e006ba Mon Sep 17 00:00:00 2001 From: df Date: Mon, 14 Dec 2020 14:09:32 +0000 Subject: [PATCH 03/12] exists -proc -> exists -command --- webif/lib/browse.class | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webif/lib/browse.class b/webif/lib/browse.class index 31ae38b..cffe0d2 100644 --- a/webif/lib/browse.class +++ b/webif/lib/browse.class @@ -1,7 +1,7 @@ require system.class plugin -if {![exists -proc class]} { package require oo } +if {![exists -command class]} { package require oo } class dir {} class browse {} -- 2.44.0 From 397d38305135ffe1bbc16295fa363171a98f6da3 Mon Sep 17 00:00:00 2001 From: df Date: Mon, 14 Dec 2020 14:12:32 +0000 Subject: [PATCH 04/12] exists -proc -> exists -command `sqlite3.open` is currently a command, so the test for it as a proc fails, presumably not what was intended. --- webif/lib/svc.class | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/webif/lib/svc.class b/webif/lib/svc.class index d2d146a..509043b 100755 --- a/webif/lib/svc.class +++ b/webif/lib/svc.class @@ -1,7 +1,7 @@ source /mod/webif/lib/setup -if {![exists -proc class]} { package require oo } -if {![exists -proc sqlite3.open]} { package require sqlite3 } +if {![exists -command class]} { package require oo } +if {![exists -command sqlite3.open]} { package require sqlite3 } require system.class class svc { -- 2.44.0 From 6fc0acf22fed1ab6f6a4d1afa9883f31697a653d Mon Sep 17 00:00:00 2001 From: df Date: Mon, 14 Dec 2020 14:14:03 +0000 Subject: [PATCH 05/12] exists -proc -> exists -command Test was failing for `sqlite3.open` --- webif/lib/epg.class | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/webif/lib/epg.class b/webif/lib/epg.class index 5c9420f..a3e5bbc 100644 --- a/webif/lib/epg.class +++ b/webif/lib/epg.class @@ -1,7 +1,7 @@ source /mod/webif/lib/setup -if {![exists -proc class]} { package require oo } -if {![exists -proc sqlite3.open]} { package require sqlite3 } +if {![exists -command class]} { package require oo } +if {![exists -command sqlite3.open]} { package require sqlite3 } require settings.class progressbar rsv.class mwildcard svc.class -- 2.44.0 From 1c5698388c094c0f6c51dbdad386eb0a147b459c Mon Sep 17 00:00:00 2001 From: df Date: Mon, 14 Dec 2020 14:15:47 +0000 Subject: [PATCH 06/12] exists -proc -> exists -command Test was failing for `sqlite3.open`. --- webif/lib/queue.class | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/webif/lib/queue.class b/webif/lib/queue.class index 4f8011a..b9811cf 100644 --- a/webif/lib/queue.class +++ b/webif/lib/queue.class @@ -1,6 +1,6 @@ -if {![exists -proc class]} { package require oo } -if {![exists -proc sqlite3.open]} { package require sqlite3 } +if {![exists -command class]} { package require oo } +if {![exists -command sqlite3.open]} { package require sqlite3 } class queue { id -1 -- 2.44.0 From 6ac4216d4464be92ac4676fcac0911959c07afbc Mon Sep 17 00:00:00 2001 From: df Date: Mon, 14 Dec 2020 14:22:56 +0000 Subject: [PATCH 07/12] exists -proc -> exists -command Test was failing for `sqlite3.open`. --- webif/lib/settings.class | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/webif/lib/settings.class b/webif/lib/settings.class index 05361dd..43616bb 100644 --- a/webif/lib/settings.class +++ b/webif/lib/settings.class @@ -1,6 +1,6 @@ -if {![exists -proc class]} { package require oo } -if {![exists -proc sqlite3.open]} { package require sqlite3 } +if {![exists -command class]} { package require oo } +if {![exists -command sqlite3.open]} { package require sqlite3 } if {![file exists /mod/etc/webif.db]} { set ::settingsdb [sqlite3.open /mod/etc/webif.db] -- 2.44.0 From 0f678564b8d09fc8883bb4550c56f91bc5fb48db Mon Sep 17 00:00:00 2001 From: df Date: Mon, 14 Dec 2020 14:27:41 +0000 Subject: [PATCH 08/12] exists -proc -> exists -command Test was failing for `sqlite3.open`. --- webif/lib/tvdb.class | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/webif/lib/tvdb.class b/webif/lib/tvdb.class index 2abc580..c81cd52 100644 --- a/webif/lib/tvdb.class +++ b/webif/lib/tvdb.class @@ -1,8 +1,8 @@ source /mod/webif/lib/setup package require cgi -if {![exists -proc class]} { package require oo } -if {![exists -proc sqlite3.open]} { package require sqlite3 } +if {![exists -command class]} { package require oo } +if {![exists -command sqlite3.open]} { package require sqlite3 } require system.class xml.class set ::tvdb::apikey 1764335F804A5A91 -- 2.44.0 From 9779b82bd14144a387084ac0a2cd447af9171870 Mon Sep 17 00:00:00 2001 From: df Date: Mon, 14 Dec 2020 14:30:02 +0000 Subject: [PATCH 09/12] exists -proc -> exists -command Test was failing for `sqlite3.open`. --- webif/lib/system.class | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/webif/lib/system.class b/webif/lib/system.class index 8fbc763..f492306 100644 --- a/webif/lib/system.class +++ b/webif/lib/system.class @@ -3,9 +3,9 @@ source /mod/webif/lib/setup package require xconv -if {![exists -proc class]} { package require oo } -if {![exists -proc sqlite3.open]} { package require sqlite3 } -if {![exists -proc binary]} { package require binary } +if {![exists -command class]} { package require oo } +if {![exists -command sqlite3.open]} { package require sqlite3 } +if {![exists -command binary]} { package require binary } class system {} -- 2.44.0 From 1d008a1bce8e830c297423b0f719e6142277e232 Mon Sep 17 00:00:00 2001 From: df Date: Mon, 14 Dec 2020 14:32:51 +0000 Subject: [PATCH 10/12] exists -proc -> exists -command Test was failing for `sqlite3.open`. --- webif/lib/rsv.class | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/webif/lib/rsv.class b/webif/lib/rsv.class index f920c44..b18090b 100644 --- a/webif/lib/rsv.class +++ b/webif/lib/rsv.class @@ -1,8 +1,8 @@ source /mod/webif/lib/setup -if {![exists -proc class]} { package require oo } -if {![exists -proc sqlite3.open]} { package require sqlite3 } -if {![exists -proc binary]} { package require binary } +if {![exists -command class]} { package require oo } +if {![exists -command sqlite3.open]} { package require sqlite3 } +if {![exists -command binary]} { package require binary } require settings.class system.class plugin svc.class set binaryfields aulEventToRecordInfo -- 2.44.0 From 954ddf6d8b22222e27fa6fa1509a2707b7830c9d Mon Sep 17 00:00:00 2001 From: df Date: Mon, 14 Dec 2020 14:33:53 +0000 Subject: [PATCH 11/12] exists -proc -> exists -command --- webif/lib/clipboard.class | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webif/lib/clipboard.class b/webif/lib/clipboard.class index 4cf6340..5dc3f51 100644 --- a/webif/lib/clipboard.class +++ b/webif/lib/clipboard.class @@ -1,5 +1,5 @@ -if {![exists -proc class]} { package require oo } +if {![exists -command class]} { package require oo } class clipboard { path "/tmp/webif.cb" -- 2.44.0 From 5f29ab2f4d54ac1b57110a1729aa20b6677cb573 Mon Sep 17 00:00:00 2001 From: df Date: Mon, 14 Dec 2020 14:36:20 +0000 Subject: [PATCH 12/12] exists -proc -> exists -command Test was failing for `sqlite3.open`, `xconv`. --- webif/lib/ts.class | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/webif/lib/ts.class b/webif/lib/ts.class index 34087cf..01b911d 100644 --- a/webif/lib/ts.class +++ b/webif/lib/ts.class @@ -1,7 +1,7 @@ -if {![exists -proc class]} { package require oo } -if {![exists -proc pack]} { package require pack } -if {![exists -proc xconv]} { package require xconv } +if {![exists -command class]} { package require oo } +if {![exists -command pack]} { package require pack } +if {![exists -command xconv]} { package require xconv } source /mod/webif/lib/setup require system.class tvdb.class classdump -- 2.44.0