Merge branch 'master' of github.com:BruceZhang1993/index-generator

BruceZhang1993 · BruceZhang1993 · commit 0de035b8f65a · 2019-06-04T10:29:37.000+08:00
diff --git a/index_generator/__main__.py b/index_generator/__main__.py
@@ -3,6 +3,10 @@
 import sys
 import time
 
+import os
+import os.path as path
+from datetime import datetime
+
 import jinja2
 import argparse
 import os
@@ -11,8 +15,11 @@
 from index_generator.models.exceptions import IndexGeneratorException
 from . import *
 
+indexIgnore=['index.html', 'templates']
 
 def main():
+    global template
+    global arguments
     parser = argparse.ArgumentParser()
     parser.add_argument('--version', '-V', action='store_true', default=False,
                         help='Print version infomation and quit.')
@@ -63,6 +70,45 @@ def generate_once(template_dir, path='.', name='index.html', if_print=False):
         raise IndexGeneratorException(IndexGeneratorException.NOT_IMPLEMENTED)
 
 
+def generate(currentDir=''):
+    filelist=[]
+    dirlist=[]
+    for file in os.listdir():
+        if file in indexIgnore:
+            continue
+        if path.isdir(file):
+            dirlist.append({
+                'name': file,
+                'modified': datetime.fromtimestamp(path.getmtime(file)).strftime('%Y-%m-%d %H:%M')
+                })
+        else:
+            filelist.append({
+                'name': file,
+                'modified': datetime.fromtimestamp(path.getmtime(file)).strftime('%Y-%m-%d %H:%M'),
+                'size': path.getsize(file)
+                })
+    
+    index = template.render(ig={
+            'currentPath': currentDir,
+            'dirs': dirlist,
+            'files': filelist
+            })
+    if arguments.print:
+        print(index)
+
+    with open('index.html', 'w') as f:
+        print(index, file=f)
+
+    if not arguments.no_recursive and dirlist:
+        for file in dirlist:
+            if arguments.print:
+                print('------------------------------------------------')
+            os.chdir(file['name'])
+            generate(currentDir+'/'+file['name'])
+    
+    os.chdir('..')
+
+
 if __name__ == '__main__':
     try:
         main()
diff --git a/index_generator/templates/default/index.html b/index_generator/templates/default/index.html
@@ -14,9 +14,21 @@
         <th align="left">Last modified</th>
         <th align="left">Size</th>
     </tr>
+    <tr>
+        <td><a href="../">Parent directory/</a></td>
+        <td>-</td>
+        <td>-</td>
+    </tr>
+    {% for dir in ig.dirs %}
+    <tr>
+        <td><a href="{{ ig.currentPath }}/{{ dir.name }}">{{ dir.name }}/</a></td>
+        <td>{{ dir.modified }}</td>
+        <td>-</td>
+    </tr>
+    {% endfor %}
     {% for file in ig.files %}
     <tr>
-        <td><a href="{{ file.path }}">{{ file.name }}</a></td>
+        <td><a href="{{ ig.currentPath }}/{{ file.name }}">{{ file.name }}</a></td>
         <td>{{ file.modified }}</td>
         <td>{{ file.size }}</td>
     </tr>
diff --git a/index_generator/templates/default/layout.html b/index_generator/templates/default/layout.html
@@ -2,12 +2,12 @@
 <html lang="en">
 <head>
     <meta charset="UTF-8">
-    <title>{% block title %}Files: {{ ig.currentPath }}{% endblock %}</title>
+    <title>{% block title %}Files: {{ ig.currentPath }}/{% endblock %}</title>
     {% block extra %}{% endblock %}
 </head>
 <body>
 {% block head %}
-<h1>Index of {{ ig.currentPath }}</h1>
+<h1>Index of {{ ig.currentPath }}/</h1>
 <hr>
 {% block files %}
 {% endblock %}
