diff --git a/.gitignore b/.gitignore
index fafc987..e31f6dd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,4 +2,5 @@
**/venv/**
databases/**
json/**
-**/static/resources/**
\ No newline at end of file
+**/static/resources/**
+**/test/**
\ No newline at end of file
diff --git a/var/main.py b/var/main.py
index 7a20102..995672f 100644
--- a/var/main.py
+++ b/var/main.py
@@ -44,7 +44,7 @@ async def home(request: Request):
)
@app.get("/resources/")
-@app.get("/resources/{name}")
+@app.get("/resources/{name}/")
async def resources(request: Request, name: str = None):
if not name:
return templates.TemplateResponse(
@@ -71,4 +71,44 @@ async def bbs(request: Request):
"request": request,
"title": "bbs"
},
- )
\ No newline at end of file
+ )
+
+@app.get("/image/")
+@app.get("/image/{name}/")
+async def image(request: Request, name: str = None):
+ if not name:
+ return templates.TemplateResponse(
+ "image/home.html",
+ {
+ "request": request,
+ "title": "image"
+ }
+ )
+ else:
+ return templates.TemplateResponse(
+ "image/test.html",
+ {
+ "request": request,
+ "name": f"{name}"
+ }
+ )
+
+@app.get("/video/")
+@app.get("/video/{name}/")
+async def video(request: Request, name: str = None):
+ if not name:
+ return templates.TemplateResponse(
+ "video/home.html",
+ {
+ "request": request,
+ "title": "video"
+ }
+ )
+ else:
+ return templates.TemplateResponse(
+ "video/test.html",
+ {
+ "request": request,
+ "name": f"{name}"
+ }
+ )
\ No newline at end of file
diff --git a/var/routers/api.py b/var/routers/api.py
index c6925ec..d926715 100644
--- a/var/routers/api.py
+++ b/var/routers/api.py
@@ -1,5 +1,5 @@
from fastapi import APIRouter
-import json, os
+import json, os, datetime
root_url = "greendam.ww3.tw"
@@ -17,6 +17,8 @@ def 用于测试():
"msg": "Hello, World!!"
}
+
+# 根据文件夹列出文件
###########
@router.get('/files/list/')
@router.get('/files/list/{name}/')
@@ -42,12 +44,83 @@ async def 根据文件夹列出文件(name: str = None):
rule_list = []
url = f"https://{root_url}/static/resources/greendam/{name}"
for id, filename in enumerate(files_files, start=1):
- url_path = f"{url}/{filename}/"
+ url_path = f"{url}/{filename}"
rule_list.append({
"id": id,
"filename": filename,
"url_path": url_path
})
return (rule_list)
+###########
+# 展示不同版本的小绿图片
+###########
+@router.get("/image/list/")
+@router.get("/image/list/{name}/")
+async def 展示不同版本的小绿图片(name: str = None):
+ if not name:
+ image_path = "../../var/static/resources/other/image"
+ image_name = os.listdir(image_path)
+ image_files = [f for f in image_name if f.lower().endswith((""))]
+ rule_list = []
+ url = f"https://{root_url}/static/resources/other/image"
+ for id, filename in enumerate(image_files, start=1):
+ url_path = f"{url}/{filename}"
+ rule_list.append({
+ "id": id,
+ "filename": filename,
+ "url_path": url_path
+ })
+ return (rule_list)
+ else:
+ image_path = f"../../var/static/resources/other/image/{name}"
+ image_name = os.listdir(image_path)
+ image_files = [f for f in image_name if f.lower().endswith((""))]
+ rule_list = []
+ url = f"https://{root_url}/static/resources/other/image/{name}"
+ for id, filename in enumerate(image_files, start=1):
+ url_path = f"{url}/{filename}"
+ rule_list.append({
+ "id": id,
+ "filename": filename,
+ "url_path": url_path
+ })
+ return (rule_list)
+
+###########
+
+
+# 展示不同版本的小绿视频合集
+###########
+@router.get("/video/list/")
+@router.get("/video/list/{name}/")
+def 展示不同版本的小绿视频合集(name: str = None):
+ if not name:
+ video_path = "../../var/static/resources/other/video"
+ video_name = os.listdir(video_path)
+ video_files = [f for f in video_name if f.lower().endswith((""))]
+ rule_list = []
+ url = f"https://{root_url}/static/resources/other/video"
+ for id, filename in enumerate(video_files, start=1):
+ url_path = f"{url}/{filename}"
+ rule_list.append({
+ "id": id,
+ "filename": filename,
+ "url_path": url_path
+ })
+ return (rule_list)
+ else:
+ video_path = f"../../var/static/resources/other/video/{name}"
+ video_name = os.listdir(video_path)
+ video_files = [f for f in video_name if f.lower().endswith((""))]
+ rule_list = []
+ url = f"https://{root_url}/static/resources/other/video/{name}"
+ for id,filename in enumerate(video_files, start=1):
+ url_path = f"{url}/{filename}"
+ rule_list.append({
+ "id": id,
+ "filename": filename,
+ "url_path": url_path
+ })
+ return (rule_list)
###########
\ No newline at end of file
diff --git a/var/templates/home.html b/var/templates/home.html
index 6362273..f329e44 100644
--- a/var/templates/home.html
+++ b/var/templates/home.html
@@ -46,6 +46,8 @@
目前firefox是有问题的，但是我个人并不在windows使用firefox，故而不考虑适配
+ 还差一个图片导览暂，做好之后再重定向
+
随机绿坝娘网站
diff --git a/var/templates/image/home.html b/var/templates/image/home.html
new file mode 100644
index 0000000..d3f3efb
--- /dev/null
+++ b/var/templates/image/home.html
@@ -0,0 +1,22 @@
+
+
+ 选择不同版本的小绿
+
+
+
+
+
+
+
diff --git a/var/templates/image/test.html b/var/templates/image/test.html
new file mode 100644
index 0000000..a1ae1d8
--- /dev/null
+++ b/var/templates/image/test.html
@@ -0,0 +1,24 @@
+
+
+ {{ name }}
+
+
+ 图片预览_{{ name }}返回上级../
+
+
+
+
+
\ No newline at end of file
diff --git a/var/templates/resources/home.html b/var/templates/resources/home.html
index 120474c..56673ce 100644
--- a/var/templates/resources/home.html
+++ b/var/templates/resources/home.html
@@ -11,6 +11,10 @@
+
+ 以下还可以预览小绿的图片（本来想做预览图的，结果能力有限，现在正在努力学习javascript）
+
+ 图片导览_视频导览