pyTivo Discussion Forum

[lucasnz]

Finally managed to catch up after being on holiday. I've merged all of wmcbrines updates and some of Iluvatar's...

http://repo.or.cz/w/pyTivo/wmcbrine/lucasnz.git

[wynneth]

Awesome, will have to check that later. Now that I bothered to tweak wmcbrines with your mobile UI to work like I wanted without the extras, I've about decided I may have a use for the extras. LOL.

[lucasnz]

What changes/tweaks did you make to the mobile UI? I'd consider integrating them into my fork.

[wynneth]

Very little actually. I added some Format= tags so my iphone properly displayed the pages instead of blanking out, I believe I moved the checkboxes so they were all at the top, and maybe a couple other things like that. Really very minor changes to get it working smoothly (at least for me). Currently, my branch is literally your mobile ui with wmcbrine's fairly recent commits. I haven't pulled his stuff from this week yet, I need to see what changes he's made to one or two of the page templates.

[philhu]

I vote to merge into lucasnz branch. We dont need yet another branch with special bits, and lucasnz said he would most likely take the changes.

[lucasnz]

Ok, I'll have a look at your "tweaks" with a view of integrating them. But unfortunately my hard drive on my main computer has just crashed so it may take me some weeks to get to it...

There was also talk of some iPad changes (was that you wynneth or was that someone else). I may look at integrating them as well. We should be able to display the iPad pages to iPads and the mobile pages to mobile devices (and of course the normal one to normal browsers).

Luke

[wynneth]

I think the iPad changes you're thinking of are from bradleys see the last post in this thread: http://pytivo.sourceforge.net/forum/move-back-to-the-wmcbrine-branch-t2055.html

Anyway, I've just got time myself to merge wmcbrine's latest commits into mine, and actually have your most recent commits and mine open in meld to see the differences... I've mostly attacked this whole thing just for the UI, so if you want to merge my changes it's really going to be your ballgame. So far I'm mostly seeing minor differences that "tweaked" the mobile pages (such as changing iphonearrow.png to iPhoneArrow.png [linux is case sensitive and couldnt find it], up to transcode.py, where you have some mime type and audiocodec if statements. I think they are mostly still performing the same functions as those coded by wmcbrine, but I'm not 100% on that. There are also several files that reference temp_share, which I removed because pytivo is run on the same machine as all media in my home so I just didn't need it. You know, took something you labored over and hatcheted out pieces willy nilly, LOL. I'm sorry if this post seems a bit run-on, but I'm actually typing it out while I look at meld, so I can try to narrow it down and tell you the major differences I see. There were references in a few files, such as config.py lines 13-42, to some windows registry keys that I didn't see in wmcbrine's code. I don't use windows anyway, so I just hacked those bits out as well. All references to mpegts were removed as well. Hope that narrows things down a bit for ya if you go to take a look!