[svn r8182] Changes to file abstraction, that seemed to make it work by magic

This commit is contained in:
julian 2009-01-18 18:07:01 +01:00
parent d03d7c2d1c
commit ffe7d51c40

View File

@ -1,25 +1,32 @@
import troggle.settings as settings
import os
def urljoin(x, y): return x + "/" + y
def listdir(*path):
try:
l = ""
root = os.path.join(settings.FILES, *path)
for p in os.listdir(root):
if os.path.isdir(os.path.join(root, p)):
l += p + "/\n"
elif os.path.isfile(os.path.join(root, p)):
l += p + "\n"
#Ignore non-files and non-directories
return l
except:
return urllib.urlopen(settings.FILES + "listdir/" + reduce(urljoin, path))
def readFile(*path):
try:
f = open(os.path.join(settings.FILES, *path))
except:
f = urllib.urlopen(settings.FILES + "download/" + reduce(urljoin, path))
import troggle.settings as settings
import os
import urllib
def urljoin(x, y): return x + "/" + y
def listdir(*path):
try:
strippedpath = [p for p in path if p]
root = os.path.join(settings.FILES, *strippedpath )
l = ""
#l = root + "\n"
#isdir = os.path.isdir(root)
#l += str(isdir) + "\n"
for p in os.listdir(root):
if os.path.isdir(os.path.join(root, p)):
l += p + "/\n"
elif os.path.isfile(os.path.join(root, p)):
l += p + "\n"
#Ignore non-files and non-directories
return l
except:
return urllib.urlopen(settings.FILES + "listdir/" + reduce(urljoin, strippedpath))
def readFile(*path):
try:
f = open(os.path.join(settings.FILES, *path))
except:
f = urllib.urlopen(settings.FILES + "download/" + reduce(urljoin, path))
return f.read()