Updates to TivoWeb / TivoWebPlus

[spitfires]

Reason:
- Display Episode Numbers on programme rows and details screens.

Versions:
- Tivoweb 1.9.4
- TivoWebPlus 2.1.b3 (oztivo-091208)

Baseline:
- The files are based on the Tivoweb versions released on the AltEPG altepg-1_0b.iso CD

Patch:
- 110722

Installation:
- Option 1) Replace the files on your TiVo with the files attached. Restart TW/TWP with a "Quick Reload".

- Option 2 for 1.9.4 ONLY) If you have a modified tivoweb-1.9.4 then you should probably just apply the patch file or else you WILL lose all your own changes. To apply the patch file "ui.itcl.diff.110722" ftp it across to your TiVo (e.g. to the /var/tmp directory and then run

Code: Select all

 patch -bu  /var/hack/tivoweb-tcl/modules/ui.itcl  /var/tmp/ui.itcl.diff.110722

Then copy the new file "zz_altepg.itcl" to your modules directory. Restart TW/TWP with a "Quick Reload".


Enjoy

(edited to correct error in file)

[spitfires]

Reason:
- Display Actors & Directors Names using AltEPG alpha testing data format.
- Fix bug where single-word names are ignored

Versions:
- Tivoweb 1.9.4
- TivoWebPlus 2.1.b3 (oztivo-091208)

Baseline:
- Patch 110722

Patch:
- 110723

Installation:
- Option 1) Replace the files on your TiVo with the files attached. Restart TW/TWP with a "Quick Reload".

- Option 2 for 1.9.4 ONLY) Alternatively, apply the patch file "ui.itcl.diff.110723"

.
(edited to correct error in file)

[spitfires]

Reason:
- Fix slow running of TivoWebPlus 2.1.b3

Versions:
- TivoWebPlus 2.1.b3 (oztivo-091208)

Baseline:
- 110723

Patch:
- 110723-2

Installation:
- Replace the files on your TiVo with the files attached. Restart TW/TWP with a "Quick Reload".

.

[CarlWalters]

Question for Mr Tickle

I'm running TiVoWeb 1.9.4. Should I apply both patches like this

Code: Select all

patch  /var/hack/tivoweb-tcl/modules/ui.itcl /var/tmp/ui.itcl.diff.110722
patch  /var/hack/tivoweb-tcl/modules/ui.itcl /var/tmp/ui.itcl.diff.110723


or do I only need to apply the last one?

[drgeoff]

My TiVo with original 2.5.5 software doesn't seem to have the patch command or it isn't in the path. Can someone say where it is hiding or point me to a download?

Thanks

[spitfires]

Question for Mr Tickle

????

or do I only need to apply the last one?

Both.

My TiVo with original 2.5.5 software doesn't seem to have the patch command or it isn't in the path.

Try this one. (Remember to make it executable with "chmod +x patch" after you copy it to your tivo)

[CarlWalters]

Question for Mr Tickle

????

My apologies I meant Spitfires of course.

Both.

Thank you I'll give it a go

[drgeoff]

Thankyou spitfires.

However all is not well

Code: Select all

patching file /var/hack/tivoweb-tcl/modules/ui.itcl
Hunk #1 FAILED at 940.
Hunk #2 FAILED at 2077.
Hunk #3 FAILED at 2137.
3 out of 3 hunks FAILED -- saving rejects to file /var/hack/tivoweb-tcl/modules/ui.itcl.rej


[drgeoff]

TW version 1.9.4. Still using original TiVo 2.5.5 software.

I got over the errors above by applying the first patch manually by opening the diff file in a text editor and then cut and paste the 3 changed lines. Not implemented the second patch yet.

Now getting this error when clicking on a show.

Code: Select all

INTERNAL SERVER ERROR
--cut here--
action_showing '/7397501/91' ''
can't read "::rec(Description)": no such variable
    while executing
"regexp {\(((s[0-9]+)?e[0-9]+)\)} $::rec(Description) junk epnum"
    (procedure "expand_epnum" line 16)
    invoked from within
"expand_epnum [dbobj $program get EpisodeNum] [dbobj $program get Description]"
    ("uplevel" body line 93)
    invoked from within
"uplevel $body"
    invoked from within
"transaction {uplevel $body}"
    (procedure "RetryTransaction" line 5)
    invoked from within
"RetryTransaction {
      if { [regexp {([0-9]*)/(.*)} $objectid junk fsid subobjid] } {
         set showing [db $db openidconstruction $fsid $subobjid]
      } els..."
    (procedure "::action_showing" line 47)
    invoked from within
"::action_$action $chan $part $env"
    ("eval" body line 1)
    invoked from within
"eval {::action_$action $chan $part $env}"


I see that the line with $::rec(Description) is in zz_altepg.itcl. Where is this variable supposed to be defined? I also note that zz_altepg.itcl is quite different between the TW and TWP versions.

[spitfires]

D'oh! The scourge of cut & paste! Sorry I goofed up the tivoweb-tcl/zz_altepg.itcl file. I've corrected the attachment in the first post.

To manually fix, replace the line 24 in tivoweb-tcl/modules/zz_altepg.itcl

Code: Select all

regexp {\(((s[0-9]+)?e[0-9]+)\)} $::rec(Description) junk epnum

with

Code: Select all

regexp {\(((s[0-9]+)?e[0-9]+)\)} $description junk epnum

Sorry for the inconvenience.

[spitfires]

p.s. all three hunks failing to patch is strange - this is often caused by you having Windows style line endings in the file rather than Linux. Do you normally edit the ui.itcl file in Windows or do you use TiVo's "joe"?

[gcobb]

spitfires, any chance of making available full tar files of your latest patched versions of TW & TWP? I am running the standard TiVo image and it would be convenient to just install your latest versions instead of finding the original and applying the updates.

[drgeoff]

p.s. all three hunks failing to patch is strange - this is often caused by you having Windows style line endings in the file rather than Linux. Do you normally edit the ui.itcl file in Windows or do you use TiVo's "joe"?

The new zz_altepg.itcl did the trick thanks.

I use TiVo's joe. However I think at one time I downloaded a replacement ui.itcl.

I''m also having problems with the names patch. That also failed the two chunks, but looking inside the diff file and comparing the complete ui.itcl in your tar file and the ui.itcl on my TiVo I'm wondering if you ran diff with the files reversed.

Code: Select all

--- ui.itcl   Sat Jul 23 07:02:21 2011
+++ /hack/diff/ui-110722.itcl   Sat Jul 23 06:59:51 2011
@@ -51,25 +51,13 @@
       set searchby [lindex "3 4" [expr $searchtype - 1]]
    }
    foreach name $names {
-    # [spitfires] [fix for AltEPG actors/directors names format]   
       if { [regexp {(.*)\|(.*)} $name junk last first] } {
-         set nameformat 1
-         set str1 "[expr \"$first\"!=\"\"?\"$first \":\"\"]$last"
-      } elseif { [regexp {(.*) (.*)} $name junk first last] } {   
-         set nameformat 2
          set str1 "$first $last"
-      } else {
-         set first ""
-         set last $name
-         set nameformat 3
-         set str1 $name
-      }
-      if { [info exists nameformat ] } {
          if { $searchtype > 0 } {
             if {$first == ""} {
                set str2 [httpMapReply "$last\t"]
             } else {
-               set str2 [httpMapReply [expr $nameformat == 1?"$last, $first\t":"$first $last\t"]]    ;# [spitfires] [fix for AltEPG actors/directors names format]   
+               set str2 [httpMapReply "$last, $first\t"]
             }
             set str1 [html_link "/search?searchby=$searchby&q=$str2" $str1]


[spitfires]

Oh dear, not having a good day was I!! Yes that patch is reversed. I'll fix the tar file.

[mrtickle]

More haste, less speed