From 1e9e99d23e3e848f6b44c45ff6583b99b50d1833 Mon Sep 17 00:00:00 2001 From: Matthias Luedtke Date: Tue, 24 Nov 2015 20:58:41 +0100 Subject: [PATCH] Rework /popular sites --- besticon/iconserver/assets/assets.go | 4 +-- besticon/iconserver/assets/popular.html | 8 ++--- besticon/iconserver/server.go | 2 +- besticon/popular_sites.go | 43 ------------------------- 4 files changed, 7 insertions(+), 50 deletions(-) diff --git a/besticon/iconserver/assets/assets.go b/besticon/iconserver/assets/assets.go index 205f6030..0e46fec4 100644 --- a/besticon/iconserver/assets/assets.go +++ b/besticon/iconserver/assets/assets.go @@ -281,7 +281,7 @@ func besticonIconserverAssetsNot_foundHtml() (*asset, error) { return a, nil } -var _besticonIconserverAssetsPopularHtml = []byte("\x1f\x8b\x08\x00\x00\x09\x6e\x88\x00\xff\xac\x56\xdf\x6e\xdb\x36\x17\xbf\xcf\x53\xf0\x23\x8a\xf8\x26\x92\x9c\x7c\x69\x30\x24\x92\x86\x61\x6d\xd3\x0d\xdd\xcd\xd2\x61\xd7\x94\x74\x2c\x11\xa1\x48\x82\xa4\xec\xb8\x46\xde\x6c\x77\x7b\xb1\x1d\x52\xb2\x2d\xc9\x49\x30\x0c\xed\x45\x23\xf3\xfc\xff\x9d\xc3\xdf\x61\xfa\xbf\x4a\x95\x6e\xab\x81\x34\xae\x15\xf9\x59\xba\xff\x03\xac\xca\xcf\x08\x49\x5b\x70\x8c\x94\x0d\x33\x16\x5c\x46\x3b\xb7\x8a\x7e\xa0\x47\x81\x64\x2d\x64\x74\xcd\x61\xa3\x95\x71\x94\x94\x4a\x3a\x90\xa8\xb8\xe1\x95\x6b\xb2\x0a\xd6\xbc\x84\x28\xfc\xb8\x20\x5c\x72\xc7\x99\x88\x6c\xc9\x04\x64\x97\xf1\xf2\xc4\x51\x05\xb6\x34\x5c\x3b\xae\xe4\xc8\xd7\x27\x86\x5e\x94\x24\x1f\x9f\x58\xab\x05\x58\x34\xf3\x76\x8e\x3b\x01\xf9\x5c\x98\x26\xfd\x79\x50\x11\x5c\x3e\x12\x03\x22\xa3\xd6\x6d\x51\xd8\x00\x60\x92\x8d\x81\x55\x46\xe3\x44\x77\x06\xa2\x65\xfc\x3e\x5e\x46\x2d\x97\x71\x69\x6d\x9f\xd0\xdb\x56\xb5\xe1\x95\x8d\x0c\x58\xad\xa4\xe5\xeb\xff\xe0\xa1\x65\x5c\x8e\xf4\x0f\x18\x68\xa3\x34\x18\xb7\xcd\xa8\xaa\x6f\x43\x15\x94\xf4\xff\x0e\x50\x7c\x6d\x80\xec\x2b\xfe\xc4\x65\x05\x86\x92\x24\x7f\xd9\xc3\xbf\x04\xd3\xdb\x4f\x73\xf6\xf2\x7d\xb6\xc9\xaa\xd7\x8f\xf1\xbf\x79\x6d\x4c\xa3\x83\xc8\xa9\xae\x6c\xa2\x89\xcd\x5c\x10\x6b\x59\xa3\x71\x9a\xf4\x53\x75\x96\x16\xaa\xda\x06\x67\x15\x5f\x13\x5e\x65\x54\xb0\xad\xea\x5c\x0f\xc6\xe8\xd8\x23\x15\xa2\x1e\x4e\x4b\xc1\xac\xcd\xa8\x77\x84\xb5\xef\x45\x53\x61\x0f\xdd\x51\x86\xd2\xe6\x32\x4f\xd9\x3e\x3d\x7a\xf0\xa2\x5a\xf0\xe5\xd0\xfc\x14\xd7\x91\x35\xda\xf3\xb6\xde\x1b\x09\x55\x2b\x4a\xac\x29\x7d\x2b\x43\x75\x76\x5d\x53\xc2\x84\xcb\x16\x0f\xdc\x01\xf1\x0a\x8b\x3c\x4d\xd8\x24\x83\x04\x53\x38\x66\x9b\x60\xba\xa3\x9f\xcd\x55\xfe\x13\xb1\x60\xfc\x6d\x21\x2b\x8c\xcf\x65\x4d\xbc\x6f\x4b\x30\xa1\x0d\x14\xc4\xa2\x67\x9c\x6d\x54\x3c\x9b\xb8\x78\x01\x9b\xa1\xd5\xf4\x20\x0c\x01\x66\xd2\xc8\x76\x85\x07\x91\xe6\xbf\x4c\x6f\x8f\x8f\x70\xb4\x5b\x29\xd3\x12\x56\xfa\x19\x42\xe0\xb4\xd2\x9d\x60\x38\x72\x38\x6c\x8d\xc2\xfe\xdc\x7f\xfc\x7a\x00\x33\xdc\x26\xaf\x3f\x45\x7e\xc5\x41\x54\xc8\x1d\xf9\x14\x50\xc1\x0a\x10\x04\xd5\xfb\x71\xb3\xfc\xdb\xb4\x63\x3d\xea\x52\x77\x6e\xa0\x86\x83\x16\xf1\x6c\x95\x51\xd9\xb5\x85\x9f\x7e\x2d\x58\x09\x8d\x12\xd8\xb2\x8c\x86\x5a\x1e\x82\x16\xeb\x9c\x2a\x95\x2f\xca\xa1\xb6\x5a\xad\xf6\x47\xc6\x40\xe9\xfa\x93\x59\xbc\x20\x67\x9a\x3b\x26\xd0\xc5\x60\x64\x35\x08\x51\x36\x50\x3e\x66\x74\xc5\x84\x85\xb9\x55\x98\xb6\x6c\xf1\x59\x49\xb0\x4e\x6c\x2f\x86\xbe\x31\x03\x1e\xb8\x8e\x09\xb1\xc5\xeb\xe2\x47\x0a\x2a\xc2\x1c\xa1\x06\x1c\x97\x8c\xe2\xa1\x55\xa2\xf3\xd0\x12\xc4\x42\x6d\x10\x55\x26\x7d\xe3\x5d\xc3\x2d\xf1\xb5\x92\x84\x5c\xc5\x8b\x59\x3c\x24\x8e\x8c\x2e\xb1\x07\xec\x29\xa3\x97\xcb\x25\x7e\x5a\x07\x3a\xa3\xd7\xf3\xcc\xd6\x4c\x74\x58\xc6\x6e\x17\x7b\x5c\x3c\x2c\xcf\xcf\x33\x90\xd3\x24\x34\x62\xd4\xf2\x70\x5a\x74\xce\x61\x5a\x3d\xd2\x38\x29\x2d\x77\xd3\x3e\x0f\x0a\xa3\xef\x48\x1b\xde\x32\xb3\xa5\xf9\x03\xb8\x80\x41\x28\x21\x4d\x7a\xf1\xf4\x2e\x9c\x0e\x05\x9e\xe1\xe8\x8c\x47\xcf\xb1\x42\xc0\x24\x68\x7f\x72\xfc\x8c\x1a\x65\xf8\x37\x9c\x67\x26\xa6\x33\xe7\xf6\xdb\x6b\x7c\x66\x4e\xc6\xcb\x35\xb9\xbf\xb0\xb8\x31\x9a\x97\x64\x37\xd7\xaf\x49\x2e\xaf\x96\xaf\x89\x76\xbb\x77\x23\xb4\x5f\xd3\x3a\x97\x85\xd5\x77\xa7\x52\x3c\x31\x53\xa4\x4e\x4a\xd9\xed\x0c\x93\x35\x90\x77\x9d\x11\xe4\x36\x23\xf1\x1f\xbf\x7f\xb1\xcf\xcf\x93\xf2\xcd\x00\xdb\xc2\xb7\x61\x31\x07\xa2\xf2\x49\xa2\x75\x48\xef\x04\x26\x9c\x51\xc1\x6b\x99\x2d\x4a\x64\x09\x30\x48\x64\x9e\xfb\x02\xdd\x05\xb6\xfb\x11\x2d\xb3\xbd\x83\x73\x64\x8d\x3b\xdf\xe6\xec\xe6\x7a\xa0\xc0\x05\x09\x2b\x2f\x5b\xe0\x7c\xf6\x8b\xff\x96\xfc\xff\x4a\x3f\x79\x46\xfc\x6e\xd1\xb0\x01\x6f\x84\xbb\x59\x7e\xe7\x70\xd3\xa6\xbe\x11\xd9\x2b\x7e\xe0\x16\x39\x69\xdb\xeb\xbe\x9a\xc8\x68\x1d\x05\xbe\x98\x44\xa6\xf9\x07\xdc\xe6\x5c\x58\xbf\x44\xe6\xe6\xf3\x19\xd9\xed\x90\x5c\x46\x03\x80\x72\x7f\x39\x66\x7b\x62\xf2\x79\xdc\x1d\xe3\xbd\xb1\x52\x0a\x31\x21\x22\x2a\xd4\xd3\x70\x9f\x52\x7d\x70\x33\xa4\xbb\x68\x9c\xd3\xb7\x49\x9f\x74\x5c\x80\x43\x93\x88\x57\xc0\x62\x65\xea\xc5\x0b\x7b\xd4\x97\x40\xce\x2b\x66\x9b\x3b\x7c\x00\xe2\x92\x63\xa6\x6c\x3c\xf1\x0f\x3c\x69\xb9\xc4\x9d\xf7\x2b\x93\x1d\x92\x07\xb9\x5a\x5e\xbe\x8f\x87\x90\x7f\x1a\x8e\xde\xa5\xb7\x9a\x47\xaf\x95\xc0\x4b\xd0\x87\xbc\x57\x3e\xc4\xc5\x60\x64\x55\x67\xd0\x9f\x3a\xda\x50\x6f\x63\xbd\x11\x77\x4d\x57\xc4\xb8\x14\xf0\x05\xe6\x92\x02\xe9\x3a\xbc\x5a\xf2\x7b\xee\x3e\x77\x85\xf7\xb2\x0f\xfd\xb3\x01\xe6\x90\xae\x8b\xed\x49\xe8\xcd\x66\x73\x5a\xf6\x6f\xcc\x21\x69\x33\x4b\xbe\xfc\xfd\x57\xe5\x1e\xe1\xe8\x2b\x4d\xf4\x18\x71\xa4\xc3\xf0\xf4\xc1\x3d\x1b\xde\xd9\xff\x04\x00\x00\xff\xff\x55\x23\xab\xfc\x7f\x0b\x00\x00") +var _besticonIconserverAssetsPopularHtml = []byte("\x1f\x8b\x08\x00\x00\x09\x6e\x88\x00\xff\xac\x56\x4f\x6f\xdb\x36\x14\xbf\xe7\x53\x70\x44\x11\x5f\x22\xc9\x09\x52\x20\x48\x24\x0d\xc3\xda\xa6\x1b\xba\xcb\xd2\x61\x67\x4a\x7a\x96\x88\x50\x24\x41\x52\x76\x5c\x23\xdf\x6c\xb7\x7d\xb1\x3d\x52\xb2\x2d\xc9\x49\x30\x14\xed\xa1\x91\xf9\xfe\xff\xde\xe3\xef\x31\xfd\xa9\x52\xa5\xdb\x6a\x20\x8d\x6b\x45\x7e\x96\xee\xff\x00\xab\xf2\x33\x42\xd2\x16\x1c\x23\x65\xc3\x8c\x05\x97\xd1\xce\xad\xa2\x1b\x7a\x14\x48\xd6\x42\x46\xd7\x1c\x36\x5a\x19\x47\x49\xa9\xa4\x03\x89\x8a\x1b\x5e\xb9\x26\xab\x60\xcd\x4b\x88\xc2\x8f\x0b\xc2\x25\x77\x9c\x89\xc8\x96\x4c\x40\x76\x19\x2f\x4f\x1c\x55\x60\x4b\xc3\xb5\xe3\x4a\x8e\x7c\x7d\x62\xe8\x45\x49\xf2\xf1\x89\xb5\x5a\x80\x45\x33\x6f\xe7\xb8\x13\x90\xcf\x85\x69\xd2\x9f\x07\x15\xc1\xe5\x23\x31\x20\x32\x6a\xdd\x16\x85\x0d\x00\x26\xd9\x18\x58\x65\x34\x4e\x74\x67\x20\x5a\xc6\xef\xe3\x65\xd4\x72\x19\x97\xd6\xf6\x09\xbd\x6d\x55\x1b\x5e\xd9\xc8\x80\xd5\x4a\x5a\xbe\xfe\x0e\x0f\x2d\xe3\x72\xa4\x7f\xc0\x40\x1b\xa5\xc1\xb8\x6d\x46\x55\x7d\x1b\xaa\xa0\xa4\xff\x77\x80\xe2\x6b\x03\x64\x5f\xf1\x27\x2e\x2b\x30\x94\x24\xf9\xcb\x1e\xfe\x27\x98\xde\x7e\x9a\xb3\x97\xef\xb3\x4d\x56\xbd\x7e\x8c\xff\xcd\x6b\x63\x1a\x1d\x44\x4e\x75\x65\x13\x4d\x6c\xe6\x82\x58\xcb\x1a\x8d\xd3\xa4\x9f\xaa\xb3\xb4\x50\xd5\x36\x38\xab\xf8\x9a\xf0\x2a\xa3\x82\x6d\x55\xe7\x7a\x30\x46\xc7\x1e\xa9\x10\xf5\x70\x5a\x0a\x66\x6d\x46\xbd\x23\xac\x7d\x2f\x9a\x0a\x7b\xe8\x8e\x32\x94\x36\x97\x79\xca\xf6\xe9\xd1\x83\x17\xd5\x82\x2f\x87\xe6\xa7\xb8\x8e\xac\xd1\x9e\xb7\xf5\xde\x48\xa8\x5a\x51\x62\x4d\xe9\x5b\x19\xaa\xb3\xeb\x9a\x12\x26\x5c\xb6\x78\xe0\x0e\x88\x57\x58\xe4\x69\xc2\x26\x19\x24\x98\xc2\x31\xdb\x04\xd3\x1d\xfd\x6c\xae\xf2\x5f\x88\x05\xe3\x6f\x0b\x59\x61\x7c\x2e\x6b\xe2\x7d\x5b\x82\x09\x6d\xa0\x20\x16\x3d\xe3\x6c\xa3\xe2\xd9\xc4\xc5\x0b\xd8\x0c\xad\xa6\x07\x61\x08\x30\x93\x46\xb6\x2b\x3c\x88\x34\xff\x6d\x7a\x7b\x7c\x84\xa3\xdd\x4a\x99\x96\xb0\xd2\xcf\x10\x02\xa7\x95\xee\x04\xc3\x91\xc3\x61\x6b\x14\xf6\xe7\xfe\xe3\xd7\x03\x98\xe1\x36\x79\xfd\x29\xf2\x2b\x0e\xa2\x42\xee\xc8\xa7\x80\x0a\x56\x80\x20\xa8\xde\x8f\x9b\xe5\xdf\xa6\x1d\xeb\x51\x97\xba\x73\x03\x35\x1c\xb4\x88\x67\xab\x8c\xca\xae\x2d\xfc\xf4\x6b\xc1\x4a\x68\x94\xc0\x96\x65\x34\xd4\xf2\x10\xb4\x58\xe7\x54\xa9\x7c\x51\x0e\xb5\xd5\x6a\xb5\x3f\x32\x06\x4a\xd7\x9f\xcc\xe2\x05\x39\xd3\xdc\x31\x81\x2e\x06\x23\xab\x41\x88\xb2\x81\xf2\x31\xa3\x2b\x26\x2c\xcc\xad\xc2\xb4\x65\x8b\xcf\x4a\x82\x75\x62\x7b\x31\xf4\x8d\x19\xf0\xc0\x75\x4c\x88\x2d\x5e\x17\x3f\x52\x50\x11\xe6\x08\x35\xe0\xb8\x64\x14\x0f\xad\x12\x9d\x87\x96\x20\x16\x6a\x83\xa8\x32\xe9\x1b\xef\x1a\x6e\x89\xaf\x95\x24\xe4\x2a\x5e\xcc\xe2\x21\x71\x64\x74\x89\x3d\x60\x4f\x19\xbd\x5c\x2e\xf1\xd3\x3a\xd0\x19\xbd\x9e\x67\xb6\x66\xa2\xc3\x32\x76\xbb\xd8\xe3\xe2\x61\x79\x7e\x9e\x81\x9c\x26\xa1\x11\xa3\x96\x87\xd3\xa2\x73\x0e\xd3\xea\x91\xc6\x49\x69\xb9\x9b\xf6\x79\x50\x18\x7d\x47\xda\xf0\x96\x99\x2d\xcd\x1f\xc0\x05\x0c\x42\x09\x69\xd2\x8b\xa7\x77\xe1\x74\x28\xf0\x0c\x47\x67\x3c\x7a\x8e\x15\x02\x26\x41\xfb\x93\xe3\x67\xd4\x28\xc3\xbf\xe1\x3c\x33\x31\x9d\x39\xb7\xdf\x5e\xe3\x33\x73\x32\x5e\xae\xc9\xfd\x85\xc5\x8d\xd1\xbc\x24\xbb\x5e\xbe\x26\xb9\x79\x55\xb2\xdb\xbd\x1b\x81\xfd\x9a\xd6\xb9\x2c\xac\xbe\x3b\x95\xe2\x89\x99\x02\x75\x52\xc9\x6e\x67\x98\xac\x81\xbc\xeb\x8c\x20\xb7\x19\x89\xff\xfa\xf3\x8b\x7d\x7e\x9e\x54\x6f\x06\xd4\x16\xbe\x0b\x8b\x39\x0e\x95\x4f\x12\xad\x43\x7a\x27\x28\xe1\x88\x0a\x5e\xcb\x6c\x51\x22\x49\x80\x41\x1e\xf3\xd4\x17\xd8\x2e\x90\xdd\xcf\x68\x99\xed\x1d\x9c\x23\x69\xdc\xf9\x2e\x67\xd7\xcb\x81\x01\x17\x24\x6c\xbc\x6c\x81\xe3\xd9\xef\xfd\x5b\x72\xb5\xd4\x4f\x9e\x10\x7f\x58\xb4\x9b\xb7\xa2\x5d\xff\xe8\x68\xd3\x9e\xbe\x11\xd9\x2b\x7e\xe0\x16\x19\x69\xdb\xeb\xbe\x9a\xc8\x68\x19\x05\xb6\x98\x44\xa6\xf9\x07\xdc\xe5\x5c\x58\xbf\x42\xe6\xe6\xf3\x11\xd9\xed\x90\x5a\x46\xfd\x47\xb9\xbf\x1a\xb3\x2d\x31\xf9\x3c\x6e\x8e\xf1\xd6\x58\x29\x85\x98\x10\x11\x15\xea\x69\xb8\x4d\xa9\x3e\xb8\x19\xd2\x5d\x34\xce\xe9\xdb\xa4\x4f\x3a\x2e\xc0\xa1\x49\xc4\x2b\x60\xb1\x32\xf5\xe2\x85\x2d\xea\x4b\x20\xe7\x15\xb3\xcd\x1d\x3e\xff\x70\xc5\x31\x53\x36\x9e\xf6\x07\x96\xb4\x5c\xe2\xc6\xfb\x9d\xc9\x0e\xa9\x03\x07\xe5\xf2\x7d\x3c\x84\xfc\xdb\x70\xf4\x2e\xbd\xd5\x3c\x7a\xad\x04\xde\x81\x3e\xe4\xbd\xf2\x21\x2e\x06\x23\xab\x3a\x83\xfe\xd4\xd1\x86\x7a\x1b\xeb\x8d\xb8\x6b\xba\x22\xc6\x95\x80\xef\x2f\x97\x14\x48\xd6\xe1\xcd\x92\xdf\x73\xf7\xb9\x2b\xbc\x97\x7d\xe8\x5f\x0d\x30\x87\x64\x5d\x6c\x4f\x42\x6f\x36\x9b\xd3\xb2\xff\x60\x0e\x29\x9b\x59\xf2\xe5\xdf\x7f\x2a\xf7\x08\x47\x5f\x69\xa2\xc7\x88\x23\x19\x86\x87\x0f\x6e\xd9\xf0\xca\xfe\x2f\x00\x00\xff\xff\xe4\x33\xdb\xba\x7d\x0b\x00\x00") func besticonIconserverAssetsPopularHtmlBytes() ([]byte, error) { return bindataRead( @@ -296,7 +296,7 @@ func besticonIconserverAssetsPopularHtml() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "besticon/iconserver/assets/popular.html", size: 2943, mode: os.FileMode(420), modTime: time.Unix(1448303138, 0)} + info := bindataFileInfo{name: "besticon/iconserver/assets/popular.html", size: 2941, mode: os.FileMode(420), modTime: time.Unix(1448394100, 0)} a := &asset{bytes: bytes, info: info} return a, nil } diff --git a/besticon/iconserver/assets/popular.html b/besticon/iconserver/assets/popular.html index f84d5ed1..f5a8c6ef 100644 --- a/besticon/iconserver/assets/popular.html +++ b/besticon/iconserver/assets/popular.html @@ -53,8 +53,8 @@

Icon Examples

Site - 64 - 120 + 40 + 80 {{$.IconSize}}   @@ -62,8 +62,8 @@

Icon Examples

{{range $url := .URLs}} {{$url}} - - + + Details diff --git a/besticon/iconserver/server.go b/besticon/iconserver/server.go index 8b4cdd4c..6e035845 100644 --- a/besticon/iconserver/server.go +++ b/besticon/iconserver/server.go @@ -99,7 +99,7 @@ func iconHandler(w http.ResponseWriter, r *http.Request) { func popularHandler(w http.ResponseWriter, r *http.Request) { iconSize, err := strconv.Atoi(r.FormValue("iconsize")) if iconSize > 1000 || iconSize < 10 || err != nil { - iconSize = 180 + iconSize = 120 } pageInfo := struct { diff --git a/besticon/popular_sites.go b/besticon/popular_sites.go index 6aabe293..0fe60ca8 100644 --- a/besticon/popular_sites.go +++ b/besticon/popular_sites.go @@ -6,104 +6,61 @@ var PopularSites []string func init() { PopularSites = []string{ "163.com", - "360.cn", "about.com", - "adcash.com", "adobe.com", - "alibaba.com", - "aliexpress.com", "alipay.com", "amazon.com", "amazonaws.com", "ameblo.jp", - "aol.com", "apple.com", - "ask.com", - "baidu.com", - "bankofamerica.com", "bbc.co.uk", "bestbuy.com", "bing.com", - "blogger.com", - "blogspot.com", "bongacams.com", "booking.com", - "bp.blogspot.com", "buzzfeed.com", "chase.com", "china.com", "cnet.com", "cnn.com", - "cntv.cn", "coccoc.com", "craigslist.org", "dailymail.co.uk", "dailymotion.com", - "directrev.com", "dropbox.com", "ebay.com", "espn.go.com", "etsy.com", "ettoday.net", "facebook.com", - "fc2.com", "flickr.com", "flipkart.com", "github.com", "globo.com", - "gmail.com", "gmw.cn", - "go.com", - "google.com", - "googleadservices.com", - "googleusercontent.com", - "hao123.com", - "huffingtonpost.com", "imdb.com", "imgur.com", "indiatimes.com", "instagram.com", - "jd.com", - "life.com.tw", - "linkedin.com", "live.com", "mail.ru", "microsoft.com", "msn.com", - "naver.com", "netflix.com", "nytimes.com", "odnoklassniki.ru", - "onclickads.net", "outbrain.com", "paypal.com", - "pconline.com.cn", - "people.com.cn", "pinterest.com", - "pixnet.net", - "qq.com", "rakuten.co.jp", "reddit.com", "sina.com.cn", - "slideshare.net", - "sogou.com", - "sohu.com", - "soso.com", "stackoverflow.com", "t.co", - "taobao.com", - "target.com", - "thepiratebay.se", - "tmall.com", - "tudou.com", "tumblr.com", - "twitter.com", - "uol.com.br", "vimeo.com", "vk.com", "walmart.com", - "weather.com", - "weibo.com", "wikia.com", "wikipedia.org", "wordpress.com",