0x2620/pandora
2
1
Fork 1
Code Issues 1.2k Pull requests Releases Wiki Activity

Compare commits

base: 0x2620:66f9a517690149991f3dab5999b7a75d0341ec60
Branches Tags
0x2620:master
0x2620:stable
...
compare: 0x2620:9e0df969e952cac738b9842153ddf5958d23506c
Branches Tags
0x2620:master
0x2620:stable

2 commits
66f9a51769 ... 9e0df969e9

Author SHA1 Message Date
j
9e0df969e9 pass video source to download selection 2020-02-02 15:33:56 +01:00
j
6b82d7bbf7 use db-ip mmdb 2020-02-02 15:31:32 +01:00
2 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

1
pandora/app/config.py
View file

@ -397,6 +397,7 @@ def update_geoip(force=False):
path = os.path.join(settings.GEOIP_PATH, 'GeoLite2-City.mmdb') path = os.path.join(settings.GEOIP_PATH, 'GeoLite2-City.mmdb')
if not os.path.exists(path) or force: if not os.path.exists(path) or force:
url = 'http://geolite.maxmind.com/download/geoip/database/GeoLite2-City.mmdb.gz' url = 'http://geolite.maxmind.com/download/geoip/database/GeoLite2-City.mmdb.gz'
url = 'https://download.db-ip.com/free/dbip-city-lite-2020-01.mmdb.gz'
print('download', url) print('download', url)
ox.net.save_url(url, "%s.gz" % path) ox.net.save_url(url, "%s.gz" % path)
if os.path.exists(path): if os.path.exists(path):

3
static/js/editor.js
View file

@ -200,7 +200,8 @@ pandora.ui.editor = function(data) {
'in': selection['in'], 'in': selection['in'],
out: selection.out, out: selection.out,
rightsLevel: rightsLevel, rightsLevel: rightsLevel,
title: data.title title: data.title,
video: data.video
}).open(); }).open();
}, },
editannotation: function(data) { editannotation: function(data) {