Changeset 1408

Timestamp:

02/14/08 10:52:20 (9 months ago)

Author:

JensDiemer

Message:

filemanager updates:
- display the file date using datetime and the django filter date:_("DATE_WITH_TIME_FULL") - But the time is wrong :(
- insert count of directory subitems
- change the page titles
- some code cleanup / add some DocStrings?

Location:

trunk/pylucid/PyLucid/plugins_internal/filemanager

Files:

• filemanager.py (modified) (28 diffs)
• internal_pages/filelist.css (modified) (1 diff)
• internal_pages/filelist.html (modified) (1 diff)

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

@@ -1 +1 @@
 #!/usr/bin/python
 # -*- coding: UTF-8 -*-
-
 
 """
@@ -48 +47 @@
 __version__= "$Rev: $"
 
-import os, cgi, sys, stat
-from time import localtime, strftime
+import os, cgi, sys, stat, dircache
+from datetime import datetime
 
 from django.http import Http404
@@ -60 +59 @@
 from PyLucid.system.BasePlugin import PyLucidBasePlugin
 
-# -----------------------------------------------------------------------------
+#______________________________________________________________________________
+# Build a list and a dict from the basepaths
+# The dict key is a string, not a integer. (GET/POST Data always returned
+# numbers as strings)
 
 BASE_PATHS = [
@@ -67 +69 @@
 BASE_PATHS_DICT = dict(BASE_PATHS)
 
-# -----------------------------------------------------------------------------
+#______________________________________________________________________________
 # We use more than one html form in a filelist page. So we need some unique
 # action values for a easier distinguish the POST data.
@@ -75 +77 @@
 ACTION_DELETEFILE = "3"
 
-# -----------------------------------------------------------------------------
+#______________________________________________________________________________
 
 def make_dirlist(path, result=[]):
     """
+    Helper function for building a directory link line.
+    used in filemanager.make_dir_links()
+
     >>> make_dirlist("/data/one/two")
     [('data/one/two', 'two'), ('data/one', 'one'), ('data', 'data')]
@@ -94 +99 @@
         return result
 
-# -----------------------------------------------------------------------------
-
-BAD_DIR_CHARS = ("..", "//", "\\")
-BAD_FILE_CHARS = ("..", "/", "\\")
+#______________________________________________________________________________
+
+BAD_DIR_CHARS = ("..", "//", "\\") # Bad characters in directories
+BAD_FILE_CHARS = ("..", "/", "\\") # Bad characters in a filename
 
 def contains_char(text, chars):
@@ -133 +138 @@
 class DirnameField(BadCharField):
     """
-    Verify a dirname
+    newforms field for verify a dirname.
     """
     bad_chars = BAD_DIR_CHARS
@@ -139 +144 @@
 class FilenameField(BadCharField):
     """
-    Verify a filename
+    newforms field for verify a filename.
     """
     bad_chars = BAD_FILE_CHARS
 
-# -----------------------------------------------------------------------------
+#______________________________________________________________________________
 
 class EditFileForm(forms.Form):
     """ Edit a text file form """
     filename = FilenameField(
-        help_text="Change the filename, if you want to save the content into a new file."
+        help_text=_(
+            u"Change the filename,"
+            " if you want to save the content into a new file."
+        )
     )
     content = forms.CharField(
@@ -158 +166 @@
     base_path = forms.ChoiceField(choices=BASE_PATHS)
 
-# -----------------------------------------------------------------------------
+#______________________________________________________________________________
 
 class ActionField(forms.CharField):
@@ -181 +189 @@
         return value
 
-# -----------------------------------------------------------------------------
+#______________________________________________________________________________
 
 class CreateDirForm(forms.Form):
@@ -218 +226 @@
     item_name = FilenameField()
 
-# -----------------------------------------------------------------------------
+#______________________________________________________________________________
 
 class Path(dict):
     """
-    Analyse, check and store the html GET path information.
+    Helper class for analyse, check and store the html GET path information.
+    Used in filemanager()
 
     base_no       = BASE_PATHS_DICT key (Note: it's a String!)
@@ -273 +282 @@
             raise Http404(_("Error: Path '%s' doesn't exist.") % abs_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)
-
         self["base_no"] = base_no
         self["base_path"] = base_path
@@ -304 +310 @@
         self["abs_file_path"] = abs_file_path
 
-    #__________________________________________________________________________
+    #--------------------------------------------------------------------------
 
     def get_abs_link(self, item=""):
@@ -312 +318 @@
         return os.path.join("/", self["base_path"], self["rel_path"], item)
 
-    #__________________________________________________________________________
+    #--------------------------------------------------------------------------
 
     def debug(self):
@@ -322 +328 @@
             self.page_msg(" - %15s: '%s'" % (k,v))
 
-# -----------------------------------------------------------------------------
+#______________________________________________________________________________
 
 class filemanager(PyLucidBasePlugin):
-
+    """
+    The PyLucid plugin class.
+    """
     def __init__(self, context, response):
         super(filemanager, self).__init__(context, response)
         self.path = Path(context)
 
-    #__________________________________________________________________________
+    #--------------------------------------------------------------------------
 
     def get_filelist(self):
@@ -341 +349 @@
 
         if self.path["rel_path"] == "":
-            # current dir it the media Root
+            # current dir is the media root
             dirs=[]
         else:
@@ -367 +375 @@
             statinfo = os.stat(abs_item_path)
 
-            if stat.S_ISDIR(statinfo[stat.ST_MODE]):
+            if stat.S_ISDIR(statinfo.st_mode):
                 # Is a directory
                 is_dir = True
                 link = os.path.join(link_prefix, item) + "/"
+                size = len(dircache.listdir(
+                    os.path.join(self.path["abs_path"], item)
+                ))-1
             else:
                 is_dir = False
                 link = self.path.get_abs_link(item)
+                size = statinfo.st_size
+
+            print item, datetime.fromtimestamp(statinfo.st_mtime)
 
             item_dict={
@@ -380 +394 @@
                 "is_dir": is_dir,
                 "title": abs_item_path,
-                "time": strftime("%Y:%m:%M",localtime(statinfo[stat.ST_MTIME])),
-                "size": statinfo[stat.ST_SIZE],
-                "mode": statinfo[stat.ST_MODE],
-                "uid": statinfo[stat.ST_UID],
-                "gid": statinfo[stat.ST_GID],
+                "time": datetime.fromtimestamp(statinfo.st_mtime),
+                "size": size,
+                "mode": statinfo.st_mode,
+                "uid": statinfo.st_uid,
+                "gid": statinfo.st_gid,
                 "deletable": True,
             }
@@ -426 +440 @@
         return dir_links
 
-    #__________________________________________________________________________
+    #--------------------------------------------------------------------------
     # html GET actions:
 
@@ -476 +490 @@
         form_link += self.path["filename"]
 
+        file_path = self.path.get_abs_link()
+
+        # Change the global page title:
+        self.context["PAGE"].title = _("Edit file - %s" % file_path)
+
         context = {
             "form_link": form_link,
@@ -481 +500 @@
                 method_name="filelist", args=self.path["url_path"]
             ),
-            "file_path": self.path.get_abs_link(),
+            "file_path": file_path,
             "filename": self.path["filename"],
             "form": form,
@@ -488 +507 @@
         self._render_template("edit_file", context)#, debug=True)
 
-    #__________________________________________________________________________
+    #--------------------------------------------------------------------------
     # html POST actions:
 
@@ -541 +560 @@
             self.page_msg.green("File '%s' deleted successfull." % filename)
 
-    #__________________________________________________________________________
+    #--------------------------------------------------------------------------
 
     def userinfo(self, old_path=""):
@@ -547 +566 @@
         Display some user information related to the filemanager functionality.
         """
+        # Change the global page title:
+        self.context["PAGE"].title = _(
+            "Filemanager - Display some user information"
+        )
+
         import pwd, grp
 
@@ -571 +595 @@
         change the basepath, after send the form, we display the filelist
         """
+        # Change the global page title:
+        self.context["PAGE"].title = _("Filemanager - Change the basepath")
 #        self.page_msg(self.request.POST)
 
@@ -579 +605 @@
                 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)
+                    self.page_msg.red(
+                        "Error: Path '%s' doesn't exist" % new_path
+                    )
                 else:
-                    self.page_msg("changed to '%s'." % new_path)
+                    self.page_msg("change base path to '%s'." % new_path)
                     # Display the filelist:
                     return self.filelist(path_no + "/")
@@ -589 +617 @@
         self._render_template("select_basepath", {"form": form})#, debug=True)
 
-    #__________________________________________________________________________
+    #--------------------------------------------------------------------------
 
     def filelist(self, path_info=None):
@@ -605 +633 @@
 
         # Change the global page title:
-        self.context["PAGE"].title = _("File list - %s" % self.path["rel_path"])
+        path = os.path.join(self.path["base_path"], self.path["rel_path"])
+        self.context["PAGE"].title = _("File list - %s" % path)
 
         # We init all forms before we check the POST, because we only need

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

@@ -56 +56 @@
     float:left;
 }
-.filemanager .o, .filemanager .u, .filemanager .g {
-    /* mode + uid + gid */
+.filemanager .s, .filemanager .m, .filemanager .o, .filemanager .u, .filemanager .g {
+    /* size + mtime + mode + uid + gid */
     font-size:0.8em;
     font-weight:lighter;

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

@@ -24 +24 @@
     </td>
     {% if item.is_dir %}
-        <td class="s"><i>&lt;dir&gt;</i></td>
+        <td class="s">
+            {% if item.size %}
+            <i>{{ item.size }} object{{ item.size|pluralize }}</i>
+            {% endif %}
+        </td>
     {% else %}
         <td class="s">{{ item.size|filesizeformat }}</td>
     {% endif %}
-    <td class="m">{{ item.time }}</td>
+    <td class="m">{{ item.time|date:_("DATE_WITH_TIME_FULL") }}</td>
     <td class="o" title="octal mode: {{ item.mode|get_oct }}">{{ item.mode|chmod_symbol }}</td>
     <td class="u">{{ item.uid }}</td>