summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--cgi-bin/display.py18
-rw-r--r--cgi-bin/link.py24
2 files changed, 25 insertions, 17 deletions
diff --git a/cgi-bin/display.py b/cgi-bin/display.py
index 990158a..72d2589 100644
--- a/cgi-bin/display.py
+++ b/cgi-bin/display.py
@@ -1,5 +1,5 @@
# -*- coding: utf8 -*-
-import link, os, config
+import link, os, config, re
from datetime import datetime
class Body:
@@ -29,15 +29,15 @@ class Body:
print ("</nav>")
print ("</header>")
print ("<article id=\"prev\">")
- print (self.a.imglink(self.a.delta('+m'),'prev'))
+ print (self.a.imglink(self.a.delta('+m'), '180', 'prev'))
print ("<p>"+self.a.timestamp(self.a.delta('+m'))+"</p>")
print ("</article>")
print ("<article id=\"now\">")
- print (self.a.imglink(self.a.img, 'now'))
+ print (self.a.imglink(self.a.img, '440', 'now'))
print ("<p>"+self.a.timestamp(self.a.img)+"</p>")
print ("</article>")
print ("<article id=\"next\">")
- print (self.a.imglink(self.a.delta('-m'), 'next'))
+ print (self.a.imglink(self.a.delta('-m'), '180', 'next'))
print ("<p>"+self.a.timestamp(self.a.delta('-m'))+"</p>")
print ("</article>")
print ("<footer>")
@@ -47,9 +47,15 @@ class Body:
def index(self, page):
index=os.listdir(os.path.realpath(self.datadir))
remove=("latest.jpeg", "notfound.jpeg")
+ #print index
+ for p in index[:]:
+ if re.match("[0-9]{12}-(180|440).jpeg", p):
+ index.remove(p)
for r in remove:
index.remove(r)
+ #print index
index.sort()
+ #print index
count=len(index)
pnum=count/config.pagination+1
if int(page) > int(pnum):
@@ -73,8 +79,8 @@ class Body:
while f <= rngend and f <= count-1:
#print f
print("<li>")
- print(self.a.imglink(index[f], ""))
- print("<p>"+self.a.link(index[f], self.a.timestamp(index[f]))+"</p>")
+ print(self.a.imglink(index[f][:12], "180"))
+ print("<p>"+self.a.link(index[f][:12], self.a.timestamp(index[f][:12]))+"</p>")
print("</li>")
f = f + 1
print ("</ul>")
diff --git a/cgi-bin/link.py b/cgi-bin/link.py
index a8e9bc4..9678f6e 100644
--- a/cgi-bin/link.py
+++ b/cgi-bin/link.py
@@ -12,25 +12,26 @@ class Link:
exit()
if not filename or filename == "latest":
self.img=os.path.split(os.path.realpath(self.datadir+"latest.jpeg"))[1]
+ self.img=self.img[:12]
else:
- self.img=filename+".jpeg"
+ self.img=filename
- def src(self, target):
+ def src(self, target, size=""):
if self.detect(self.src_datadir+target):
src=os.path.split(target)
- return os.path.relpath(self.src_datadir + src[1])
+ return os.path.relpath(self.src_datadir + src[1]+"-"+size+".jpeg")
else:
return os.path.relpath(self.src_datadir + "notfound.jpeg")
- def imglink(self, target, order=""):
+ def imglink(self, target, size, order=""):
if order:
cssclass="class=\""+order+"\""
else:
cssclass=""
if self.detect(target):
- return "<a href=\""+self.href(target)+"\"><img src=\""+self.src(target)+"\""+cssclass+"/></a>"
+ return "<a href=\""+self.href(target)+"\"><img src=\""+self.src(target, size)+"\""+cssclass+"/></a>"
else:
- return "<img src=\""+self.src(target)+cssclass+"\"/>"
+ return "<img src=\""+self.src(target)+"\""+cssclass+"\"/>"
def timestamp(self, date):
if self.detect(date):
@@ -48,11 +49,11 @@ class Link:
return "?f=" + target[:12]
def detect(self, filename):
- if os.path.exists(os.path.realpath(self.datadir+filename)):
- #print os.path.realpath(filename)
+ if os.path.exists(os.path.realpath(self.datadir+filename+"-full.jpeg")):
+ #print os.path.realpath(self.datadir+filename+"-full.jpeg")
return True
else:
- #print os.path.realpath(filename)
+ #print os.path.realpath(self.datadir+filename+"-full.jpeg")
return False
def first(self):
@@ -61,7 +62,8 @@ class Link:
for r in remove:
index.remove(r)
index.sort()
- return index[0]
+ first=index[0]
+ return first[:12]
def link(self, target, link):
#print target
@@ -89,4 +91,4 @@ class Link:
targetdate=curdate-datetime.timedelta(hours=num)
if delta.endswith('m'):
targetdate=curdate-datetime.timedelta(minutes=num)
- return datetime.datetime.strftime(targetdate, "%Y%m%d%H%M")+".jpeg"
+ return datetime.datetime.strftime(targetdate, "%Y%m%d%H%M")