From 1a88f6fa31f08f003b7ff4ebde849c8238f24775 Mon Sep 17 00:00:00 2001 From: Brian Hornsby Date: Sat, 7 Feb 2015 13:05:41 +1100 Subject: [PATCH] Updated plugin to use Kodi name. Updated copyright date. --- .gitignore | 17 +- README.md | 20 +- addon.xml | 9 +- default.py | 11 +- resources/images/index.html | 371 ------------------ .../lib/{xbmcsettings.py => kodisettings.py} | 6 +- resources/lib/{xbmcutils.py => kodiutils.py} | 4 +- resources/lib/openvpn.py | 4 +- 8 files changed, 34 insertions(+), 408 deletions(-) delete mode 100644 resources/images/index.html rename resources/lib/{xbmcsettings.py => kodisettings.py} (96%) rename resources/lib/{xbmcutils.py => kodiutils.py} (98%) diff --git a/.gitignore b/.gitignore index 58f94ea..b12d79d 100644 --- a/.gitignore +++ b/.gitignore @@ -1,16 +1,3 @@ - -resources/__init__.pyo - -resources/__init__.pyc - -xbmcsettings.pyc - -xbmcsettings.pyo - -xbmcutils.pyc - -xbmcutils.pyo - -resources/lib/__init__.pyc - +resources/*.pyc +resources/lib/*.pyc *.pyc diff --git a/README.md b/README.md index 81cd446..83e5d2b 100644 --- a/README.md +++ b/README.md @@ -1,10 +1,10 @@ -OpenVPN for XBMC +OpenVPN for Kodi ========== -A script that allows you to control OpenVPN from within XBMC. +A script that allows you to control OpenVPN from within Kodi. Features ----- -- Start and stop OpenVPN from with XBMC. +- Start and stop OpenVPN from with Kodi. - Setup multiple VPN connections. - Display current geo-location. @@ -15,7 +15,7 @@ Screenshots Installation ------ -Download the latest zip file and install the addon. See [http://wiki.xbmc.org/?title=Add-ons#How_to_install_from_a_ZIP_file][1] for more details on installing addons from zip file. +Download the latest zip file and install the addon. See [http://kodi.wiki/view/HOW-TO:Install_an_Add-on_from_a_zip_file][1] for more details on installing addons from zip file. Usage ------ @@ -51,9 +51,17 @@ The following settings are available. **Password is required**: Set to true if a password is required when using sudo. Default: true +FAQ +--- + +**Is this plugin available in a Kodi addons repository?** No + +**I can't get the OpenVPN plugin to work on Raspberry Pi?** Before asking me for help I suggest reading the following [guide][3]. + License ------ -OpenVPN for XBMC is licensed under the [GPL 3.0 license][2]. +OpenVPN for Kodi is licensed under the [GPL 3.0 license][2]. -[1]: http://wiki.xbmc.org/?title=Add-ons#How_to_install_from_a_ZIP_file +[1]: http://kodi.wiki/view/HOW-TO:Install_an_Add-on_from_a_zip_file [2]: http://www.gnu.org/licenses/gpl-3.0.html +[3]: http://forums.tvaddons.ag/threads/24769-How-to-set-up-your-VPN-on-raspberry-pi-using-Brain-Hornsby-Openvpn-for-XBMC diff --git a/addon.xml b/addon.xml index 7d29e06..1a7119b 100644 --- a/addon.xml +++ b/addon.xml @@ -7,8 +7,11 @@ all - OpenVPN addon for XBMC. - This addon allows you to set up a number of OpenVPN configurations, which you can then run from XBMC. -For more information on setting up this addon see http://brianhornsby.com/xbmc_plugins/openvpn + OpenVPN addon for Kodi. + This addon allows you to set up a number of OpenVPN configurations, which you can then run from Kodi. +For more information on setting up this addon see http://brianhornsby.com/kodi_plugins/openvpn + GNU GENERAL PUBLIC LICENSE. Version 3, 29 June 2007 + http://brianhornsby.com/kodi_addons/openvpn + https://github.com/brianhornsby/script.openvpn diff --git a/default.py b/default.py index 01084ec..54694a9 100644 --- a/default.py +++ b/default.py @@ -1,8 +1,8 @@ #/* # * -# * OpenVPN for XBMC. +# * OpenVPN for Kodi. # * -# * Copyright (C) 2013 Brian Hornsby +# * Copyright (C) 2015 Brian Hornsby # * # * This program is free software: you can redistribute it and/or modify # * it under the terms of the GNU General Public License as published by @@ -30,15 +30,14 @@ from BeautifulSoup import BeautifulSoup import resources.lib.openvpn as vpn -import resources.lib.xbmcsettings as settings -import resources.lib.xbmcutils as utils +import resources.lib.kodisettings as settings +import resources.lib.kodiutils as utils # Set some global values. -_xbmcrevision = xbmc.getInfoLabel('System.BuildVersion') _addonid = 'script.openvpn' # Initialise settings. -_settings = settings.XBMCSettings(_addonid, sys.argv) +_settings = settings.KodiSettings(_addonid, sys.argv) # Get addon information. _addonname = _settings.get_name() diff --git a/resources/images/index.html b/resources/images/index.html deleted file mode 100644 index 410b897..0000000 --- a/resources/images/index.html +++ /dev/null @@ -1,371 +0,0 @@ - - - - - res-128x128 - - - - - - - - -

res-128x128

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameSizeLast Modified
..  
ad.png5.3 KB2013-09-27 18:41:55
ae.png1.9 KB2013-09-27 18:43:23
af.png9.3 KB2013-09-27 18:42:13
ag.png4.6 KB2013-09-27 18:41:40
ai.png5.4 KB2013-09-27 18:42:04
al.png6.8 KB2013-09-27 18:42:25
am.png1.9 KB2013-09-27 18:43:18
ao.png3.6 KB2013-09-27 18:42:33
aq.png4.1 KB2013-09-27 18:42:18
ar.png4.5 KB2013-09-27 18:43:41
as.png8.4 KB2013-09-27 18:43:02
at.png1.9 KB2013-09-27 18:43:35
au.png7.0 KB2013-09-27 18:41:31
aw.png2.9 KB2013-09-27 18:43:15
ax.png2.2 KB2013-09-27 18:43:40
az.png3.3 KB2013-09-27 18:43:44
ba.png5.0 KB2013-09-27 18:41:54
bb.png3.0 KB2013-09-27 18:42:20
bd.png2.9 KB2013-09-27 18:43:42
be.png1.9 KB2013-09-27 18:41:36
bf.png2.7 KB2013-09-27 18:42:54
bg.png2.0 KB2013-09-27 18:43:12
bh.png3.4 KB2013-09-27 18:42:39
bi.png5.2 KB2013-09-27 18:41:34
bj.png1.9 KB2013-09-27 18:43:23
bl.png1.9 KB2013-09-27 18:42:46
bm.png7.9 KB2013-09-27 18:41:43
bn.png8.3 KB2013-09-27 18:43:41
bo.png1.8 KB2013-09-27 18:42:32
bq.png1.9 KB2013-09-27 18:43:13
br.png5.5 KB2013-09-27 18:41:59
bs.png3.2 KB2013-09-27 18:42:32
bt.png10.5 KB2013-09-27 18:42:53
bv.png2.2 KB2013-09-27 18:42:54
bw.png2.0 KB2013-09-27 18:43:02
by.png8.1 KB2013-09-27 18:43:12
bz.png9.8 KB2013-09-27 18:43:36
ca.png3.5 KB2013-09-27 18:43:37
cc.png7.0 KB2013-09-27 18:42:34
cd.png3.9 KB2013-09-27 18:43:46
cf.png2.7 KB2013-09-27 18:43:30
cg.png2.2 KB2013-09-27 18:43:26
ch.png2.0 KB2013-09-27 18:42:09
ci.png1.9 KB2013-09-27 18:43:19
ck.png6.8 KB2013-09-27 18:43:17
cl.png2.6 KB2013-09-27 18:43:32
cm.png2.6 KB2013-09-27 18:41:35
cn.png3.1 KB2013-09-27 18:43:16
co.png1.9 KB2013-09-27 18:41:58
cr.png1.9 KB2013-09-27 18:43:20
cu.png4.0 KB2013-09-27 18:41:47
cv.png4.3 KB2013-09-27 18:42:21
cw.png2.7 KB2013-09-27 18:42:56
cx.png5.5 KB2013-09-27 18:42:15
cy.png4.6 KB2013-09-27 18:43:33
cz.png2.4 KB2013-09-27 18:42:30
de.png1.8 KB2013-09-27 18:43:40
dj.png2.8 KB2013-09-27 18:41:38
dk.png2.1 KB2013-09-27 18:41:52
dm.png5.8 KB2013-09-27 18:43:45
do.png4.2 KB2013-09-27 18:42:43
dz.png4.0 KB2013-09-27 18:43:00
ec.png7.0 KB2013-09-27 18:43:24
ee.png1.8 KB2013-09-27 18:42:27
eg.png3.4 KB2013-09-27 18:43:27
eh.png3.2 KB2013-09-27 18:42:55
er.png6.7 KB2013-09-27 18:42:17
es.png5.8 KB2013-09-27 18:42:49
et.png4.8 KB2013-09-27 18:43:29
fi.png2.1 KB2013-09-27 18:42:39
fj.png6.7 KB2013-09-27 18:43:35
fk.png11.0 KB2013-09-27 18:42:11
fm.png3.7 KB2013-09-27 18:43:05
fo.png2.2 KB2013-09-27 18:42:58
fr.png1.9 KB2013-09-27 18:42:26
ga.png1.9 KB2013-09-27 18:42:01
gb.png3.1 KB2013-09-27 18:42:10
gd.png4.5 KB2013-09-27 18:42:05
ge.png2.8 KB2013-09-27 18:42:56
gf.png1.9 KB2013-09-27 18:43:31
gg.png2.5 KB2013-09-27 18:42:03
gh.png2.7 KB2013-09-27 18:42:28
gi.png6.5 KB2013-09-27 18:43:47
gl.png3.3 KB2013-09-27 18:43:48
gm.png2.0 KB2013-09-27 18:42:20
gn.png1.8 KB2013-09-27 18:42:24
gp.png1.9 KB2013-09-27 18:42:26
gq.png3.7 KB2013-09-27 18:42:07
gr.png2.5 KB2013-09-27 18:42:25
gs.png11.5 KB2013-09-27 18:42:22
gt.png3.8 KB2013-09-27 18:42:17
gu.png5.3 KB2013-09-27 18:43:31
gw.png2.5 KB2013-09-27 18:43:40
gy.png6.0 KB2013-09-27 18:41:48
hk.png5.0 KB2013-09-27 18:41:46
hm.png5.6 KB2013-09-27 18:42:50
hn.png3.3 KB2013-09-27 18:43:26
hr.png4.7 KB2013-09-27 18:41:33
ht.png1.9 KB2013-09-27 18:43:22
hu.png1.9 KB2013-09-27 18:42:02
id.png1.9 KB2013-09-27 18:42:28
ie.png1.9 KB2013-09-27 18:41:47
il.png4.0 KB2013-09-27 18:41:55
im.png6.9 KB2013-09-27 18:42:36
in.png4.8 KB2013-09-27 18:42:01
io.png13.6 KB2013-09-27 18:43:25
iq.png4.0 KB2013-09-27 18:43:32
ir.png6.4 KB2013-09-27 18:41:45
is.png2.2 KB2013-09-27 18:41:54
it.png1.9 KB2013-09-27 18:42:19
je.png6.0 KB2013-09-27 18:41:34
jm.png2.7 KB2013-09-27 18:42:00
jo.png2.6 KB2013-09-27 18:43:46
jp.png3.2 KB2013-09-27 18:41:32
ke.png5.4 KB2013-09-27 18:42:14
kg.png8.2 KB2013-09-27 18:43:10
kh.png5.2 KB2013-09-27 18:42:58
ki.png8.4 KB2013-09-27 18:43:43
km.png4.9 KB2013-09-27 18:43:08
kn.png5.0 KB2013-09-27 18:42:12
kp.png3.8 KB2013-09-27 18:41:32
kr.png7.8 KB2013-09-27 18:41:42
kw.png2.5 KB2013-09-27 18:43:38
ky.png10.4 KB2013-09-27 18:42:37
kz.png11.5 KB2013-09-27 18:43:11
la.png2.8 KB2013-09-27 18:43:37
lb.png5.2 KB2013-09-27 18:43:14
lc.png4.2 KB2013-09-27 18:41:50
li.png3.2 KB2013-09-27 18:41:49
lk.png4.8 KB2013-09-27 18:41:57
lr.png3.0 KB2013-09-27 18:42:06
ls.png4.5 KB2013-09-27 18:43:07
lt.png1.9 KB2013-09-27 18:43:17
lu.png1.9 KB2013-09-27 18:42:15
lv.png1.9 KB2013-09-27 18:42:55
ly.png3.0 KB2013-09-27 18:43:14
ma.png4.1 KB2013-09-27 18:43:06
mc.png1.9 KB2013-09-27 18:41:48
md.png6.1 KB2013-09-27 18:43:08
me.png8.5 KB2013-09-27 18:43:44
mf.png6.1 KB2013-09-27 18:41:52
mg.png2.0 KB2013-09-27 18:43:30
mh.png7.4 KB2013-09-27 18:42:19
mk.png5.0 KB2013-09-27 18:43:24
ml.png1.9 KB2013-09-27 18:42:48
mm.png3.5 KB2013-09-27 18:42:30
mn.png2.8 KB2013-09-27 18:42:57
mo.png4.5 KB2013-09-27 18:43:20
mp.png14.2 KB2013-09-27 18:42:07
mq.png1.9 KB2013-09-27 18:42:31
mr.png3.9 KB2013-09-27 18:42:59
ms.png6.6 KB2013-09-27 18:43:01
mt.png2.6 KB2013-09-27 18:42:06
mu.png1.8 KB2013-09-27 18:43:09
mv.png2.9 KB2013-09-27 18:43:09
mw.png5.1 KB2013-09-27 18:42:40
mx.png6.9 KB2013-09-27 18:42:23
my.png3.9 KB2013-09-27 18:43:13
mz.png4.4 KB2013-09-27 18:43:25
na.png5.9 KB2013-09-27 18:41:56
nc.png1.9 KB2013-09-27 18:41:39
ne.png2.3 KB2013-09-27 18:41:46
nf.png4.6 KB2013-09-27 18:42:47
ng.png1.9 KB2013-09-27 18:43:00
ni.png3.8 KB2013-09-27 18:41:40
nl.png1.9 KB2013-09-27 18:43:43
no.png2.2 KB2013-09-27 18:43:47
np.png5.8 KB2013-09-27 18:43:39
nr.png3.2 KB2013-09-27 18:41:53
nu.png6.5 KB2013-09-27 18:43:05
nz.png6.1 KB2013-09-27 18:42:48
om.png3.1 KB2013-09-27 18:43:03
pa.png3.2 KB2013-09-27 18:42:35
pe.png1.9 KB2013-09-27 18:42:47
pf.png6.1 KB2013-09-27 18:43:39
pg.png4.7 KB2013-09-27 18:43:03
ph.png4.1 KB2013-09-27 18:43:21
pk.png3.5 KB2013-09-27 18:43:01
pl.png1.9 KB2013-09-27 18:43:34
pm.png1.9 KB2013-09-27 18:42:29
pn.png11.3 KB2013-09-27 18:43:10
pr.png3.9 KB2013-09-27 18:41:44
ps.png2.1 KB2013-09-27 18:42:05
pt.png6.8 KB2013-09-27 18:42:02
pw.png3.3 KB2013-09-27 18:42:10
py.png4.0 KB2013-09-27 18:41:38
qa.png3.6 KB2013-09-27 18:43:28
re.png1.9 KB2013-09-27 18:42:34
ro.png2.0 KB2013-09-27 18:43:15
rs.png8.2 KB2013-09-27 18:42:41
ru.png1.9 KB2013-09-27 18:42:38
rw.png4.2 KB2013-09-27 18:41:58
sa.png7.4 KB2013-09-27 18:43:28
sb.png4.2 KB2013-09-27 18:43:22
sc.png3.8 KB2013-09-27 18:42:11
sd.png2.5 KB2013-09-27 18:42:23
se.png2.1 KB2013-09-27 18:42:52
sg.png3.6 KB2013-09-27 18:43:18
sh.png9.1 KB2013-09-27 18:42:18
si.png3.7 KB2013-09-27 18:43:07
sj.png2.2 KB2013-09-27 18:43:27
sk.png3.8 KB2013-09-27 18:43:38
sl.png1.9 KB2013-09-27 18:41:59
sm.png8.6 KB2013-09-27 18:41:35
sn.png2.8 KB2013-09-27 18:43:06
so.png2.8 KB2013-09-27 18:43:29
sr.png2.6 KB2013-09-27 18:42:52
ss.png4.0 KB2013-09-27 18:42:59
st.png3.3 KB2013-09-27 18:42:31
sv.png5.0 KB2013-09-27 18:42:27
sx.png6.1 KB2013-09-27 18:42:16
sy.png2.9 KB2013-09-27 18:41:49
sz.png5.7 KB2013-09-27 18:42:03
tc.png8.3 KB2013-09-27 18:42:08
td.png1.9 KB2013-10-07 13:53:56
tf.png1.9 KB2013-09-27 18:43:16
tg.png2.7 KB2013-09-27 18:42:35
th.png2.0 KB2013-09-27 18:42:24
tj.png3.2 KB2013-09-27 18:41:57
tk.png4.3 KB2013-09-27 18:43:19
tl.png4.4 KB2013-09-27 18:43:48
tm.png8.5 KB2013-09-27 18:42:09
tn.png4.2 KB2013-09-27 18:43:08
to.png2.0 KB2013-09-27 18:42:12
tr.png3.9 KB2013-09-27 18:41:50
tt.png5.3 KB2013-09-27 18:43:15
tv.png5.9 KB2013-09-27 18:42:37
tw.png4.0 KB2013-09-27 18:42:57
tz.png2.8 KB2013-09-27 18:42:08
ua.png1.9 KB2013-09-27 18:42:51
ug.png3.9 KB2013-09-27 18:41:37
um.png8.1 KB2013-09-27 18:43:04
us.png8.1 KB2013-09-27 18:43:34
uy.png5.3 KB2013-09-27 18:42:45
uz.png3.9 KB2013-09-27 18:41:39
va.png5.4 KB2013-09-27 18:42:29
vc.png3.1 KB2013-09-27 18:41:51
ve.png3.1 KB2013-09-27 18:43:36
vg.png9.4 KB2013-09-27 18:41:41
vi.png9.4 KB2013-09-27 18:42:38
vn.png2.9 KB2013-09-27 18:42:16
vu.png5.4 KB2013-09-27 18:42:14
wf.png1.9 KB2013-09-27 18:41:37
ws.png2.4 KB2013-09-27 18:43:49
ye.png1.9 KB2013-09-27 18:43:21
yt.png1.9 KB2013-09-27 18:41:35
za.png5.5 KB2013-09-27 18:41:51
zm.png3.4 KB2013-09-27 18:42:33
zw.png6.5 KB2013-09-27 18:41:31
zz.png1.9 KB2013-09-27 18:42:36
- -
- -
- - \ No newline at end of file diff --git a/resources/lib/xbmcsettings.py b/resources/lib/kodisettings.py similarity index 96% rename from resources/lib/xbmcsettings.py rename to resources/lib/kodisettings.py index 1a78a4d..fe3e23d 100644 --- a/resources/lib/xbmcsettings.py +++ b/resources/lib/kodisettings.py @@ -1,8 +1,8 @@ #/* # * -# * OpenVPN for XBMC. +# * OpenVPN for Kodi. # * -# * Copyright (C) 2013 Brian Hornsby +# * Copyright (C) 2015 Brian Hornsby # * # * This program is free software: you can redistribute it and/or modify # * it under the terms of the GNU General Public License as published by @@ -23,7 +23,7 @@ import xbmc -class XBMCSettings: +class KodiSettings: def __init__(self, addonid, argv): self.__addon__ = xbmcaddon.Addon(id=addonid) self.__argv__ = argv diff --git a/resources/lib/xbmcutils.py b/resources/lib/kodiutils.py similarity index 98% rename from resources/lib/xbmcutils.py rename to resources/lib/kodiutils.py index 74d5d7c..8442d4d 100644 --- a/resources/lib/xbmcutils.py +++ b/resources/lib/kodiutils.py @@ -1,8 +1,8 @@ #/* # * -# * OpenVPN for XBMC. +# * OpenVPN for Kodi. # * -# * Copyright (C) 2013 Brian Hornsby +# * Copyright (C) 2015 Brian Hornsby # * # * This program is free software: you can redistribute it and/or modify # * it under the terms of the GNU General Public License as published by diff --git a/resources/lib/openvpn.py b/resources/lib/openvpn.py index 1bbe9cb..28de63b 100644 --- a/resources/lib/openvpn.py +++ b/resources/lib/openvpn.py @@ -1,8 +1,8 @@ #/* # * -# * OpenVPN for XBMC. +# * OpenVPN for Kodi. # * -# * Copyright (C) 2013 Brian Hornsby +# * Copyright (C) 2015 Brian Hornsby # * # * This program is free software: you can redistribute it and/or modify # * it under the terms of the GNU General Public License as published by