Changeset 39ff75a2f4b93df255daddc5f7ca14cc135055b8

Show
Ignore:
Timestamp:
03/10/08 00:00:01 (8 months ago)
Author:
KRKeegan <-NOSPAM-kevin@krkeegan.com>
git-committer:
KRKeegan <-NOSPAM-kevin@krkeegan.com> 1205125201 -0700
git-parent:

[ba8fa7f48fcc8623343a8a436e9dfcabe73e52ca]

git-author:
KRKeegan <-NOSPAM-kevin@krkeegan.com> 1205125201 -0700
Message:

Fix transfers for linux

Linux didn't seem to like realms with port information ":80". It worked on windows but not on linux.

Tested and there is no corruption problem with TiVo generated files. Some files transfered from pytivo to Tivo and then back can be a bit sketchy.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • plugins/admin/admin.py

    ra170d60 r39ff75a  
    179179                    entry['Icon'] = link.getElementsByTagName("CustomIcon")[0].getElementsByTagName("Url")[0].firstChild.data 
    180180                if (len(link.getElementsByTagName("Content")) >= 1): 
    181                     entry['Url'] = quote(link.getElementsByTagName("Content")[0].getElementsByTagName("Url")[0].firstChild.data) 
     181                    entry['Url'] = link.getElementsByTagName("Content")[0].getElementsByTagName("Url")[0].firstChild.data 
     182                    parse_url = urlparse(entry['Url']) 
     183                    entry['Url'] = quote('http://' + parse_url[1].split(':')[0] + parse_url[2] + "?" + parse_url[4]) 
    182184                    print entry['Url'] 
    183185                keys = ['SourceSize', 'Duration', 'CaptureDate', 'EpisodeTitle', 'Description', 'SourceChannel', 'SourceStation'] 
    …… 
    267269                    togo_path = "" 
    268270        if tivo_mak != "" and togo_path != "": 
    269             theurl = str(query['Url'][0]) 
     271            parse_url = urlparse(str(query['Url'][0])) 
     272            theurl = 'http://' + parse_url[1].split(':')[0] + parse_url[2] + "?" + parse_url[4] 
    270273            print theurl 
    271274            password = tivo_mak.split(':')[1] #TiVo MAK 
    272             tivoIP = str(query['TiVo'][0]) + ":80" 
    273             name = unquote(urlparse(theurl)[2])[10:300].split('.') 
    274             name.insert(-1," - " + unquote(urlparse(theurl)[4]).split("id=")[1] + ".") 
     275            tivoIP = str(tivo_mak.split(':')[0]) 
     276            name = unquote(parse_url[2])[10:300].split('.') 
     277            name.insert(-1," - " + unquote(parse_url[4]).split("id=")[1] + ".") 
    275278            outfile = os.path.join(togo_path, "".join(name)) 
    276279