Changeset 1388

Timestamp:

02/12/08 10:59:36 (9 months ago)

Author:

JensDiemer

Message:

-add a multiple base_path support, not tested well!
-Note: You must insert FILEMANAGER_BASEPATHS to your settings.py

Location:

trunk/pylucid/PyLucid

Files:

• plugins_internal/filemanager/filemanager.py (modified) (9 diffs)
• plugins_internal/filemanager/filemanager_cfg.py (modified) (1 diff)
• plugins_internal/filemanager/internal_pages/filelist.html (modified) (1 diff)
• plugins_internal/filemanager/internal_pages/select_basepath.html (added)
• settings_example.py (modified) (1 diff)

trunk/pylucid/PyLucid/plugins_internal/filemanager/filemanager.py

@@ -34 +34 @@
 from PyLucid.system.BasePlugin import PyLucidBasePlugin
 
-
-ABS_PATH = os.path.abspath(settings.MEDIA_ROOT)
-
+BASE_PATHS = [
+    (str(no),path) for no,path in enumerate(settings.FILEMANAGER_BASEPATHS)
+]
+BASE_PATHS_DICT = dict(BASE_PATHS)
 
 def make_dirlist(path, result=[]):
@@ -72 +73 @@
 
 class EditFileForm(forms.Form):
+    """ Edit a text file form """
     content = forms.CharField()
 
+class SelectBasePathForm(forms.Form):
+    """ change the base path form """
+    base_path = forms.ChoiceField(choices=BASE_PATHS)
 
 
 class filemanager(PyLucidBasePlugin):
 
-    def getFilesList(self, rel_dir):
+    def getFilesList(self, base_no, abs_path, rel_path):
         """
         Returns all items in the given directory.
@@ -86 +91 @@
         files = []
 
-        if not rel_dir:
+        if rel_path == ".":
             # current dir it the media Root
             dirs=[]
         else:
             # Add the ".." dir item
-            updir = os.path.split(rel_dir)[0]
+            updir = os.path.split(rel_path)[0]
             dirs = [{
                 "name": "..",
                 "link": self.URLs.methodLink(
-                    method_name="filelist", args=updir
+                    method_name="filelist", args=(base_no, updir)
                 ),
                 "is_dir": True,
@@ -101 +106 @@
             }]
 
-        # convert the relative path to absolute filesystem path
-        abs_fs_path=os.path.join(ABS_PATH, rel_dir)
-
-        if not abs_fs_path.startswith(ABS_PATH):
-            raise WrongDirectory(abs_fs_path)
-
-        link_prefix = self.URLs.methodLink(method_name="filelist")
-
-        for item in sorted(os.listdir(abs_fs_path)):
+        link_prefix = self.URLs.methodLink(method_name="filelist", args=base_no)
+
+        for item in sorted(os.listdir(abs_path)):
             if item.startswith("."):
                 # skip hidden files or directories
                 continue
 
-            item_abs_fs_path = os.path.join(abs_fs_path, item)
-            statinfo = os.stat(item_abs_fs_path)
-
-            link = os.path.join(link_prefix, rel_dir, item)
+            abs_item_path = os.path.join(abs_path, item)
+            statinfo = os.stat(abs_item_path)
+
+            link = os.path.join(link_prefix, rel_path, item)
 
             if stat.S_ISDIR(statinfo[stat.ST_MODE]):
@@ -130 +129 @@
                 "link": link,
                 "is_dir": is_dir,
-                "title": item_abs_fs_path,
+                "title": abs_item_path,
                 "time": strftime("%Y:%m:%M",localtime(statinfo[stat.ST_MTIME])),
                 "size": statinfo[stat.ST_SIZE],
@@ -148 +147 @@
 
 
-    def make_dir_links(self, path):
-        """
-        path: /data/one/two
-
-        return [('/data/one/two','two'), ('/data/one','one'),('/data','data')]
-        """
+    def make_dir_links(self, base_no, base_path, abs_path, rel_path):
+        """
+        Build the context for the path link line.
+        Use the function make_dirlist().
+        """
+#        self.page_msg("base_no:", base_no, "base_path:", base_path)
+#        self.page_msg("abs_path:", abs_path, "rel_path:", rel_path)
+
+        # start with the first base_path entry:
         dir_links = [{
-            # Display only the short relative path:
-            "name": os.path.normpath(settings.MEDIA_ROOT),
-            "title": ABS_PATH,
-            "link": self.URLs.methodLink(method_name="filelist"),
+            "name": base_path, # use only the short relative path
+            "title": abs_path,
+            "link": self.URLs.methodLink(method_name="filelist", args=base_no),
         }]
-        if path:
+        if rel_path != ".":
             # Not in the root
-            dirlist = make_dirlist(path, [])
+            dirlist = make_dirlist(rel_path, [])
             for path, name in dirlist:
+                # append every dir "steps"
                 dir_links.append({
                     "name": name,
-                    "title": os.path.join(ABS_PATH, path),
+                    "title": os.path.join(base_path, path),
                     "link": self.URLs.methodLink(
-                        method_name="filelist", args=path
+                        method_name="filelist", args=(base_no, path)
                     ),
                 })
@@ -201 +203 @@
 
         if self.request.method == 'POST':
-            form = EditFileForm(request.POST)
+            form = EditFileForm(self.request.POST)
             if form.is_valid():
                 self.page_msg("Net implemented yet!!!")
@@ -297 +299 @@
         self._render_template("userinfo", context)#, debug=True)
 
-    def filelist(self, rest=''):
+    def select_basepath(self):
+        """
+        change the basepath, after send the form, we display the filelist
+        """
+#        self.page_msg(self.request.POST)
+
+        if self.request.method == 'POST':
+            form = SelectBasePathForm(self.request.POST)
+            if form.is_valid():
+                path_no = form.cleaned_data["base_path"]
+                new_path = BASE_PATHS_DICT[path_no]
+                if not os.path.isdir(new_path):
+                    self.page_msg.red("Error: Path '%s' doesn't exist" % new_path)
+                else:
+                    self.page_msg("changed to '%s'." % new_path)
+                    # Display the filelist:
+                    return self.filelist(path_no + "/")
+        else:
+            form = SelectBasePathForm()
+
+        self._render_template("select_basepath", {"form": form})#, debug=True)
+
+
+    def filelist(self, path_info=None):
         """
         List dir and file. Some actions.
         rest: path to dir or file
         """
+        if not path_info:
+            self.select_basepath()
+            return
+
+#        try:
+        base_no, rel_path = path_info.split("/", 1)
+        rel_path = os.path.normpath(rel_path)
+        base_path = os.path.normpath(BASE_PATHS_DICT[base_no])
+#        except Exception, e:
+#            self.page_msg.red("Path error:", e)
+#            return
+
+        abs_base_path = os.path.abspath(base_path)
+
+#        self.page_msg("base_no:", base_no, "base_path:", base_path)
+#        self.page_msg("abs_base_path:", abs_base_path, "rel_path:", rel_path)
+
         # Change the global page title:
         self.context["PAGE"].title = _("File list")
-        context = {}
-        dir_list = []
-        files_list = []
-
-        dir_string=''
-
-        if rest!='':
-#            self.page_msg("rest:", rest)
-            dir_string=os.path.normpath(rest)
 
         if self.request.method == 'POST':
 #            self.page_msg(self.request.POST)
-            dir_string=os.path.normpath(self.request.POST['dir_string'])
+#            dir_string=os.path.normpath(self.request.POST['dir_string'])
 
             if self.request.has_key('action'):
@@ -349 +382 @@
                     )
 
-        abs_path = os.path.join(ABS_PATH, dir_string)
-
-#        self.page_msg("read dir '%s'" % dir_string)
-        dir_list = self.getFilesList(dir_string)
+        abs_path = os.path.normpath(os.path.join(abs_base_path, rel_path))
+        if not os.path.isdir(abs_path):
+            self.page_msg.red("Error: Path '%s' doesn't exist" % abs_path)
+            return
+
+        # build the directory+file list:
+        dir_list = self.getFilesList(base_no, abs_path, rel_path)
+
+        # Build the path link line:
+        dir_links = self.make_dir_links(base_no, base_path, abs_path, rel_path)
 
         context = {
             "url": self.URLs.methodLink("filelist"),
-            "dir": dir_string,
-            "dir_links": self.make_dir_links(dir_string),
+            "dir": rel_path,
+            "dir_links": dir_links,
             "writeable": os.access(abs_path, os.W_OK),
             "dir_list": dir_list,
-            "abs_path": ABS_PATH,
+            "abs_path": abs_path,
             "messages": self.page_msg,
             "userinfo_link": self.URLs.methodLink(
-                method_name="userinfo", args=dir_string
+                method_name="userinfo", args=rel_path
             ),
             "edit_link": self.URLs.methodLink(
-                method_name="edit", args=dir_string
+                method_name="edit", args=rel_path
+            ),
+            "change_basepath_link": self.URLs.methodLink(
+                method_name="select_basepath"
             ),
         }

trunk/pylucid/PyLucid/plugins_internal/filemanager/filemanager_cfg.py

@@ -36 +36 @@
         },
     },
+    "select_basepath": {
+        "must_login"    : True,
+        "must_admin"    : True,
+        "internal_page_info" : {
+            "name"              : "select_basepath",
+            "description"       : "Select a base path (set in settings.py)",
+            "markup"            : None
+        },
+    },
     "edit": {
         "must_login"    : True,

trunk/pylucid/PyLucid/plugins_internal/filemanager/internal_pages/filelist.html

@@ -2 +2 @@
 {% for dir in dir_links %}<a href="{{ dir.link }}" title="{{ dir.title }}">{{ dir.name }}</a>/{% endfor %}
 </legend>
+
+<p><a href="{{ change_basepath_link }}">{% trans 'change basepath' %}</a></p>
 
 <table summary="Directory Listing" cellpadding="0" cellspacing="0">

trunk/pylucid/PyLucid/settings_example.py

@@ -189 +189 @@
 #     Examples-3: "http://django.media.your_domain.net/"
 ADMIN_MEDIA_PREFIX = "/django/contrib/admin/media/"
+
+# Base path for the filemanager plugin
+# You can add more path for the plugin.
+FILEMANAGER_BASEPATHS = (
+    MEDIA_ROOT,
+    #"./static/",
+)
 
 """