diff --git a/database/Creators/913304C0CC74CC1F/flipnotes.dat b/database/Creators/913304C0CC74CC1F/flipnotes.dat index bb5f7e2..9952495 100644 --- a/database/Creators/913304C0CC74CC1F/flipnotes.dat +++ b/database/Creators/913304C0CC74CC1F/flipnotes.dat @@ -1 +1 @@ -74CC1F_0D376FC60C9DC_000 1 5 0 0 0 0 \ No newline at end of file +74CC1F_0D376FC60C9DC_000 4 5 0 0 0 0 \ No newline at end of file diff --git a/hatena.py b/hatena.py index c1face4..876cee3 100644 --- a/hatena.py +++ b/hatena.py @@ -182,7 +182,7 @@ def LoadHatenaStructure(Resource, path="hatenadir/ds/v2-xx", root = True): folder = FolderResource() LoadHatenaStructure(folder, os.path.join(path, os.path.basename(i)), False) Resource.putChild(os.path.basename(i), folder) - + #Flipnote handler: class Database: def __init__(self): diff --git a/hatenadir/ds/v2-xx/en/confirm/delete.txt b/hatenadir/ds/v2-xx/en/confirm/delete.txt index 5c00cb2..ad4930a 100644 Binary files a/hatenadir/ds/v2-xx/en/confirm/delete.txt and b/hatenadir/ds/v2-xx/en/confirm/delete.txt differ diff --git a/hatenadir/ds/v2-xx/en/confirm/download.txt b/hatenadir/ds/v2-xx/en/confirm/download.txt index 75a7208..9850b6a 100644 Binary files a/hatenadir/ds/v2-xx/en/confirm/download.txt and b/hatenadir/ds/v2-xx/en/confirm/download.txt differ diff --git a/hatenadir/ds/v2-xx/en/confirm/upload.txt b/hatenadir/ds/v2-xx/en/confirm/upload.txt index 6344c8e..96a3d1a 100644 Binary files a/hatenadir/ds/v2-xx/en/confirm/upload.txt and b/hatenadir/ds/v2-xx/en/confirm/upload.txt differ diff --git a/hatenadir/ds/v2-xx/en/confirm/upload_bak.txt b/hatenadir/ds/v2-xx/en/confirm/upload_bak.txt deleted file mode 100644 index d0768fb..0000000 Binary files a/hatenadir/ds/v2-xx/en/confirm/upload_bak.txt and /dev/null differ diff --git a/hatenadir/ds/v2-xx/en/eula.txt b/hatenadir/ds/v2-xx/en/eula.txt index f09fdbb..097b982 100644 Binary files a/hatenadir/ds/v2-xx/en/eula.txt and b/hatenadir/ds/v2-xx/en/eula.txt differ diff --git a/hatenadir/ds/v2-xx/help/info.htm b/hatenadir/ds/v2-xx/help/info.htm new file mode 100644 index 0000000..d5baee7 --- /dev/null +++ b/hatenadir/ds/v2-xx/help/info.htm @@ -0,0 +1 @@ + Info
pbsds's Hatena Server

This is a work in progress! There's not much functionality yet because it's still in early stages. Please enjoy your stay.

\ No newline at end of file diff --git a/hatenadir/ds/v2-xx/inbox.ugo b/hatenadir/ds/v2-xx/inbox.ugo deleted file mode 100644 index 65d9942..0000000 Binary files a/hatenadir/ds/v2-xx/inbox.ugo and /dev/null differ diff --git a/hatenadir/ds/v2-xx/inbox.ugoxml b/hatenadir/ds/v2-xx/inbox.ugoxml new file mode 100644 index 0000000..76b19e1 --- /dev/null +++ b/hatenadir/ds/v2-xx/inbox.ugoxml @@ -0,0 +1,20 @@ + + + + 2 + 1 + + + <label>Inbox</label> + <label /> + <label /> + <label /> + <label /> + <num>0</num> + + + diff --git a/hatenadir/ds/v2-xx/index.ugoxml b/hatenadir/ds/v2-xx/index.ugoxml index 1890ad7..f7a3f5f 100644 --- a/hatenadir/ds/v2-xx/index.ugoxml +++ b/hatenadir/ds/v2-xx/index.ugoxml @@ -12,61 +12,18 @@ 0 - - - - - - diff --git a/hatenadir/ds/v2-xx/information.ugo b/hatenadir/ds/v2-xx/information.ugo deleted file mode 100644 index 4210d2d..0000000 Binary files a/hatenadir/ds/v2-xx/information.ugo and /dev/null differ diff --git a/hatenadir/ds/v2-xx/movie.py b/hatenadir/ds/v2-xx/movie.py index 644092b..326530f 100644 --- a/hatenadir/ds/v2-xx/movie.py +++ b/hatenadir/ds/v2-xx/movie.py @@ -135,7 +135,7 @@ class CreatorIDFile(resource.Resource): #Stars: name = "Stars" - content = '? %s' % (CreatorID, filename, flipnote[2])#yellow stars + content = u'\u2605 %s' % (CreatorID, filename, flipnote[2])#yellow stars #todo: add other stars Entries.append(PageEntryTemplate.replace("%%Name%%", name).replace("%%Content%%", content)) diff --git a/hatenadir/ds/v2-xx/movies.ugo b/hatenadir/ds/v2-xx/movies.ugo deleted file mode 100644 index fd25ca2..0000000 Binary files a/hatenadir/ds/v2-xx/movies.ugo and /dev/null differ diff --git a/logs/2014/January/26 January activity.log b/logs/2014/January/26 January activity.log index 0070253..9dd6978 100644 --- a/logs/2014/January/26 January activity.log +++ b/logs/2014/January/26 January activity.log @@ -148,3 +148,75 @@ [16:32:20] 192.168.0.2 added 30 stars to 9EEDCBF0AA42BE29/42BE29_0A52A7C3273AE_000.ppm [16:32:26] 192.168.0.2 requested frontpage/hotmovies.ugo page 1 [16:32:33] Server shutdown +[16:32:33] Server startup... + +[16:32:35] 192.168.0.2 requested frontpage/likedmovies.ugo page 1 +[16:32:56] 192.168.0.2 requested movie/9EEDCBF0AA42BE29/42BE29_0A52A7C3273AE_000.info +[16:32:57] 192.168.0.2 requested movie/9EEDCBF0AA42BE29/42BE29_0A52A7C3273AE_000.ppm +[16:56:49] Server shutdown +[21:57:30] Server startup... + +[21:57:50] 192.168.0.2 requested en/eula.txt +[21:57:51] 192.168.0.2 requested en/confirm/upload.txt +[21:57:51] 192.168.0.2 requested en/confirm/download.txt +[21:57:52] 192.168.0.2 requested en/confirm/delete.txt +[21:57:53] 192.168.0.2 requested index.ugo +[22:00:39] 213.138.175.204 requested en/eula.txt +[22:00:40] 213.138.175.204 requested en/confirm/upload.txt +[22:00:40] 213.138.175.204 requested en/confirm/download.txt +[22:00:41] 213.138.175.204 requested en/confirm/delete.txt +[22:00:41] 213.138.175.204 requested index.ugo +[22:01:35] 213.138.175.204 requested frontpage/hotmovies.ugo page 1 +[22:01:38] 213.138.175.204 requested movie/913304C0CC74CC1F/74CC1F_0D376FC60C9DC_000.info +[22:01:39] 213.138.175.204 requested movie/913304C0CC74CC1F/74CC1F_0D376FC60C9DC_000.ppm +[22:03:20] Server shutdown +[22:03:26] Server startup... + +[22:03:29] 213.138.175.204 requested movie/913304C0CC74CC1F/74CC1F_0D376FC60C9DC_000.info +[22:03:30] 213.138.175.204 requested movie/913304C0CC74CC1F/74CC1F_0D376FC60C9DC_000.ppm +[22:12:05] Server shutdown +[22:12:05] Server startup... + +[22:12:26] 213.138.175.204 requested index.ugo +[22:12:31] 213.138.175.204 requested help/info.htm +[22:12:37] Server shutdown +[22:12:37] Server startup... + +[22:12:39] 213.138.175.204 requested help/info.htm +[22:12:49] Server shutdown +[22:12:49] Server startup... + +[22:12:51] 213.138.175.204 requested help/info.htm +[22:13:14] Server shutdown +[22:13:15] Server startup... + +[22:13:18] 213.138.175.204 requested help/info.htm +[22:13:21] 213.138.175.204 requested inbox.ugo +[22:13:23] 213.138.175.204 requested help/info.htm +[22:15:15] Server shutdown +[22:15:15] Server startup... + +[22:15:24] 213.138.175.204 requested frontpage/hotmovies.ugo page 1 +[22:15:27] 213.138.175.204 requested movie/913304C0CC74CC1F/74CC1F_0D376FC60C9DC_000.info +[22:15:28] 213.138.175.204 requested movie/913304C0CC74CC1F/74CC1F_0D376FC60C9DC_000.ppm +[22:15:33] 213.138.175.204 requested help/post_howto.htm +[22:18:05] Server shutdown +[22:18:05] Server startup... + +[22:18:40] 213.138.175.204 requested en/eula.txt +[22:18:41] 213.138.175.204 requested en/confirm/upload.txt +[22:18:42] 213.138.175.204 requested en/confirm/download.txt +[22:18:42] 213.138.175.204 requested en/confirm/delete.txt +[22:18:43] 213.138.175.204 requested eula_list.tsv +[22:19:30] 213.138.175.204 requested index.ugo +[22:19:37] 213.138.175.204 requested help/info.htm +[22:19:46] 213.138.175.204 requested frontpage/hotmovies.ugo page 1 +[22:19:53] 213.138.175.204 requested inbox.ugo +[22:19:54] 213.138.175.204 requested help/info.htm +[22:20:26] Server shutdown +[22:20:27] Server startup... + +[22:21:08] Server shutdown +[22:21:08] Server startup... + +[22:22:34] Server shutdown diff --git a/logs/2014/January/26 January error.log b/logs/2014/January/26 January error.log index e69de29..680dbbe 100644 --- a/logs/2014/January/26 January error.log +++ b/logs/2014/January/26 January error.log @@ -0,0 +1,14 @@ +Error in atexit._run_exitfuncs: +Traceback (most recent call last): + File "C:\Python27\lib\atexit.py", line 24, in _run_exitfuncs + func(*targs, **kargs) + File "C:\Users\pbsds\Desktop\Programming\python\hatena server\hatena.py", line 219, in write + f = open("database/Creators/%s/flipnotes.dat" % ID, "wb") +IOError: [Errno 2] No such file or directory: 'database/Creators/9EEDCBF0AA42BE29/flipnotes.dat' +Error in sys.exitfunc: +Traceback (most recent call last): + File "C:\Python27\lib\atexit.py", line 24, in _run_exitfuncs + func(*targs, **kargs) + File "C:\Users\pbsds\Desktop\Programming\python\hatena server\hatena.py", line 219, in write + f = open("database/Creators/%s/flipnotes.dat" % ID, "wb") +IOError: [Errno 2] No such file or directory: 'database/Creators/9EEDCBF0AA42BE29/flipnotes.dat'