Moved the database to a separate file, getting ready for mondoDB support. Added a more welcoming flipnote
This commit is contained in:
pbsds committed
1 parent
a5d5a82ef3
commit
7d0b413961
14 files changed
+218
-161
No files matched your search
@@ -2,7 +2,8 @@ from twisted.web import resource
|
||||
from twisted.internet import reactor
|
||||
import time
|
||||
|
||||
from hatena import Database, Log, NotFound
|
||||
from hatena import Log, NotFound
|
||||
from DB import Database
|
||||
from Hatenatools import UGO
|
||||
|
||||
#makes a flipnote list of the most seen ones among the recently uploaded
|
||||
@@ -77,12 +78,9 @@ class PyResource(resource.Resource):
|
||||
ugo.Items.append(("button", 115, "Previous", "http://flipnote.hatena.com/ds/v2-xx/frontpage/hotmovies.uls?page=%i" % (page-1), ("", ""), None))
|
||||
|
||||
#Flipnotes
|
||||
for creatorid, filename in flipnotes:#[i*50 : i*50+50]:
|
||||
for creatorid, filename in flipnotes:
|
||||
stars = str(Database.GetFlipnote(creatorid, filename)[2])
|
||||
|
||||
f = open(Database.FlipnotePath(creatorid, filename+".ppm"), "rb")
|
||||
ugo.Items.append(("button", 3, "", "http://flipnote.hatena.com/ds/v2-xx/movie/%s/%s.ppm" % (creatorid, filename), (stars, "765", "573", "0"), ("bleh", f.read(0x6a0))))
|
||||
f.close()
|
||||
ugo.Items.append(("button", 3, "", "http://flipnote.hatena.com/ds/v2-xx/movie/%s/%s.ppm" % (creatorid, filename), (stars, "765", "573", "0"), (filename+".ppm", Database.GetFlipnoteTMB(creatorid, filename))))
|
||||
|
||||
#next page
|
||||
if next:
|
||||
|
||||
@@ -2,7 +2,8 @@ from twisted.web import resource
|
||||
from twisted.internet import reactor
|
||||
import time
|
||||
|
||||
from hatena import Database, Log, NotFound
|
||||
from hatena import Log, NotFound
|
||||
from DB import Database
|
||||
from Hatenatools import UGO
|
||||
|
||||
#makes a flipnote list of the most seen ones among the recently uploaded
|
||||
@@ -14,7 +15,7 @@ class PyResource(resource.Resource):
|
||||
self.pages = []#10 first pages
|
||||
self.neweststar = None
|
||||
self.newestflip = None
|
||||
reactor.callLater(2, self.Update)#or it'll clash with hotmovies.ugo
|
||||
reactor.callLater(2, self.Update)#or it'll clash with the others in the terminal
|
||||
def render(self, request):
|
||||
page = int(request.args["page"][0]) if "page" in request.args else 1
|
||||
|
||||
@@ -79,10 +80,7 @@ class PyResource(resource.Resource):
|
||||
#Flipnotes
|
||||
for creatorid, filename in flipnotes:#[i*50 : i*50+50]:
|
||||
stars = str(Database.GetFlipnote(creatorid, filename)[2])
|
||||
|
||||
f = open(Database.FlipnotePath(creatorid, filename+".ppm"), "rb")
|
||||
ugo.Items.append(("button", 3, "", "http://flipnote.hatena.com/ds/v2-xx/movie/%s/%s.ppm" % (creatorid, filename), (stars, "765", "573", "0"), ("bleh", f.read(0x6a0))))
|
||||
f.close()
|
||||
ugo.Items.append(("button", 3, "", "http://flipnote.hatena.com/ds/v2-xx/movie/%s/%s.ppm" % (creatorid, filename), (stars, "765", "573", "0"), (filename+".ppm", Database.GetFlipnoteTMB(creatorid, filename))))
|
||||
|
||||
#next page
|
||||
if next:
|
||||
|
||||
@@ -2,7 +2,8 @@ from twisted.web import resource
|
||||
from twisted.internet import reactor
|
||||
import time
|
||||
|
||||
from hatena import Database, Log, NotFound
|
||||
from hatena import Log, NotFound
|
||||
from DB import Database
|
||||
from Hatenatools import UGO
|
||||
|
||||
#makes a flipnote list of the newest flipnotes
|
||||
@@ -13,7 +14,7 @@ class PyResource(resource.Resource):
|
||||
|
||||
self.pages = []#10 first pages
|
||||
self.newestflip = None
|
||||
self.Update()
|
||||
reactor.callLater(4, self.Update)#or it'll clash with the others in the terminal
|
||||
def render(self, request):
|
||||
page = int(request.args["page"][0]) if "page" in request.args else 1
|
||||
|
||||
@@ -73,10 +74,7 @@ class PyResource(resource.Resource):
|
||||
#Flipnotes
|
||||
for creatorid, filename in flipnotes:#[i*50 : i*50+50]:
|
||||
stars = str(Database.GetFlipnote(creatorid, filename)[2])
|
||||
|
||||
f = open(Database.FlipnotePath(creatorid, filename+".ppm"), "rb")
|
||||
ugo.Items.append(("button", 3, "", "http://flipnote.hatena.com/ds/v2-xx/movie/%s/%s.ppm" % (creatorid, filename), (stars, "765", "573", "0"), ("bleh", f.read(0x6a0))))
|
||||
f.close()
|
||||
ugo.Items.append(("button", 3, "", "http://flipnote.hatena.com/ds/v2-xx/movie/%s/%s.ppm" % (creatorid, filename), (stars, "765", "573", "0"), (filename+".ppm", Database.GetFlipnoteTMB(creatorid, filename))))
|
||||
|
||||
#next page
|
||||
if next:
|
||||
|
||||
+15
-11
@@ -1,7 +1,8 @@
|
||||
from twisted.web import resource
|
||||
import os
|
||||
|
||||
from hatena import Database, Log, ServerLog, Silent, NotFound
|
||||
from hatena import Log, ServerLog, Silent, NotFound
|
||||
from DB import Database
|
||||
from Hatenatools import TMB
|
||||
|
||||
#The movie folder:
|
||||
@@ -58,14 +59,12 @@ class CreatorIDFileResource(resource.Resource):
|
||||
Log(request, path)
|
||||
|
||||
#add a view:
|
||||
Database.AddView(creator, file[:4])
|
||||
Database.AddView(creator, file[:-4])
|
||||
|
||||
#read ppm file:
|
||||
f = open(Database.FlipnotePath(creator, file), "rb")
|
||||
data = f.read()
|
||||
f.close()
|
||||
data = Database.GetFlipnotePPM(creator, file[:-4])
|
||||
|
||||
#send file to client:
|
||||
#send file to the client:
|
||||
request.responseHeaders.setRawHeaders('content-type', ['text/plain'])
|
||||
return data
|
||||
elif filetype == "info":
|
||||
@@ -74,7 +73,8 @@ class CreatorIDFileResource(resource.Resource):
|
||||
request.responseHeaders.setRawHeaders('content-type', ['text/plain'])
|
||||
return "0\n0\n"#undocumented what it means
|
||||
elif filetype == "htm":
|
||||
#maybe cache the details page of Database.Newest
|
||||
#maybe cache the details page of Database.Newest?
|
||||
|
||||
if "mode" in request.args:
|
||||
if request.args["mode"][0] == "commentshalfsize":
|
||||
pass
|
||||
@@ -104,9 +104,11 @@ class CreatorIDFileResource(resource.Resource):
|
||||
elif filetype == "dl":
|
||||
path = "/".join(request.path.split("/")[3:])
|
||||
Log(request, path, True)
|
||||
#this is POSTed to when it've been downloaded.
|
||||
#todo: keep count
|
||||
return "Noted ;)"#muhahaha!
|
||||
#this is POSTed to when it've been stored to memory.
|
||||
|
||||
Database.AddDownload(creator, file[:-3])
|
||||
|
||||
return "Noted ;)"
|
||||
else:
|
||||
path = "/".join(request.path.split("/")[3:])
|
||||
ServerLog.write("%s got 403 when requesting %s" % (request.getClientIP(), path), Silent)
|
||||
@@ -118,7 +120,7 @@ class CreatorIDFileResource(resource.Resource):
|
||||
flipnote = Database.GetFlipnote(CreatorID, filename)#flipnote = [filename, views, stars, green stars, red stars, blue stars, purple stars, Channel], all probably strings
|
||||
if not flipnote:
|
||||
return "This flipnote doesn't exist!"
|
||||
tmb = TMB().ReadFile(Database.FlipnotePath(CreatorID, filename+".ppm"))
|
||||
tmb = TMB().Read(Database.GetFlipnoteTMB(CreatorID, filename))
|
||||
if not tmb:
|
||||
return "This flipnote is corrupt!"
|
||||
|
||||
@@ -159,6 +161,8 @@ class CreatorIDFileResource(resource.Resource):
|
||||
#Comments:
|
||||
Comments = "0"
|
||||
|
||||
#doto: add original author info too
|
||||
|
||||
#add the entries to page:
|
||||
return DetailsPageTemplate.replace("%%CreatorID%%", CreatorID).replace("%%Filename%%", filename).replace("%%CommentCount%%", Comments).replace("%%Spinoff%%", Spinnoff).replace("%%PageEntries%%", PageEntrySeparator.join(Entries))
|
||||
|
||||
|
||||
@@ -2,7 +2,8 @@ from twisted.web import resource
|
||||
from twisted.internet import reactor
|
||||
import time
|
||||
|
||||
from hatena import Database, ServerLog, Silent
|
||||
from hatena import ServerLog, Silent
|
||||
from DB import Database
|
||||
from Hatenatools import TMB
|
||||
|
||||
#Handle flipnote uploads
|
||||
|
||||
Reference in new issue
Block a user