From 90b69d0d218a73a0bbb0114f19d9e97e7caa381a Mon Sep 17 00:00:00 2001 From: prpr Date: Sat, 1 Jul 2023 00:02:48 +0100 Subject: [PATCH] Remove mux database --- webif/cgi-bin/opkg.jim | 3 +-- webif/html/diag/mux.jim | 2 +- webif/lib/pkg.class | 19 ++----------------- 3 files changed, 4 insertions(+), 20 deletions(-) diff --git a/webif/cgi-bin/opkg.jim b/webif/cgi-bin/opkg.jim index fc1ff8f..3ff3bbf 100755 --- a/webif/cgi-bin/opkg.jim +++ b/webif/cgi-bin/opkg.jim @@ -75,8 +75,7 @@ if {$cmd eq "update" || $cmd eq "upgrade"} { putsf "" putsf "Updating diagnostic meta information" pkg fetchdiagmeta - putsf "Updating MUX database" - pkg fetchmuxdb + pkg removemuxdb } putsf "Done." diff --git a/webif/html/diag/mux.jim b/webif/html/diag/mux.jim index 6f9f866..e733f15 100755 --- a/webif/html/diag/mux.jim +++ b/webif/html/diag/mux.jim @@ -12,7 +12,7 @@ if {[catch {set db [sqlite3.open /var/lib/humaxtv/channel.db]} msg]} { exit } -pkg loadmuxdb +pkg removemuxdb proc f2c {frequency} { return $(int((($frequency / 1000) - 303.25) / 8)) diff --git a/webif/lib/pkg.class b/webif/lib/pkg.class index 2c15999..bac3717 100755 --- a/webif/lib/pkg.class +++ b/webif/lib/pkg.class @@ -260,23 +260,8 @@ proc {pkg fetchdiagmeta} {} { $ff close } -proc {pkg loadmuxdb} {} { - if {[llength $::muxdb]} { return } - if {![file exists "/mod/var/mux.db"]} { - catch {pkg fetchmuxdb} - } else { - set meta [open "/mod/var/mux.db" r] - set ::muxdb [read $meta] - $meta close - } -} - -proc {pkg fetchmuxdb} {} { - set ::muxdb [pkg fetchfile mux.db] - - set ff [open "/mod/var/mux.db" w] - puts $ff $::muxdb - $ff close +proc {pkg removemuxdb} {} { + file delete "/mod/var/mux.db" } proc {pkg update} {} {