moved 2 funct, deletion of FileAbstraction pending

core/fileAbstraction.py

@@ -1,44 +1,15 @@
-import troggle.settings as settings
-import os
-import urllib.request, urllib.parse, urllib.error
-from functools import reduce
+# import troggle.settings as settings
+# import os
+# import urllib.request, urllib.parse, urllib.error
+# from functools import reduce
 
-def urljoin(x, y): return x + "/" + y
+# All unused, but kept pending deletion
 
-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) #This seems to be required for os.path.isdir to work...
-        #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:
-        if strippedpath:
-            c = reduce(urljoin, strippedpath)
-        else:
-            c = ""
-        c = c.replace("#", "%23")
-        print(("FILE: ", settings.FILES + "listdir/" + c))
-        return urllib.request.urlopen(settings.FILES + "listdir/" + c).read()
-        
-def dirsAsList(*path):
-    return [d for d in listdir(*path).split("\n") if len(d) > 0 and d[-1] == "/"]
+# def urljoin(x, y): return x + "/" + y
 
-def filesAsList(*path):
-    return [d for d in listdir(*path).split("\n") if len(d) > 0 and d[-1] != "/"]
+# def dirsAsList(*path):
+    # return [d for d in listdir(*path).split("\n") if len(d) > 0 and d[-1] == "/"]
+
+# def filesAsList(*path):
+    # return [d for d in listdir(*path).split("\n") if len(d) > 0 and d[-1] != "/"]
 
-def readFile(*path):
-    try:
-        f = open(os.path.join(settings.FILES, *path))
-    except:
-        f = urllib.request.urlopen(settings.FILES + "download/" + reduce(urljoin, path))
-    return f.read()