Merge branch 'release/2.1.0'

brianhornsby · May 18, 2014 · 3ef9ac8 · 3ef9ac8
2 parents 286ba6b + a733e92
commit 3ef9ac8
Show file tree

Hide file tree

Showing 256 changed files with 389 additions and 6 deletions.
diff --git a/addon.xml b/addon.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<addon id="script.openvpn" name="OpenVPN" version="2.0.1" provider-name="brianhornsby">
+<addon id="script.openvpn" name="OpenVPN" version="2.1.0" provider-name="brianhornsby">
 	<requires>
-		<import addon="xbmc.python" version="2.0"/>
+		<import addon="xbmc.python" version="2.1.0"/>
 		<import addon="script.module.beautifulsoup" version="3.0.8"/>
 	</requires>
 	<extension point="xbmc.python.script" library="default.py"/>

diff --git a/changelog.txt b/changelog.txt
@@ -1,3 +1,7 @@
+*** 2.1.0 ***
+Updated xbmc.python version. Fixed issue with reading running OpenVPN configuration on OpenELEC. [0e132c6]
+Changed country flag images to https://github.com/koppi/iso-country-flags-svg-collection. [3dc6b7e]
+
 *** 2.0.1 ***
 Fixes for issues #8 and #9.
 

diff --git a/default.py b/default.py
@@ -75,9 +75,9 @@ def log_error(msg):
 
 log_debug('OpenVPN:    [%s]' % _openvpn)
 log_debug('Userdata:   [%s]' % _userdata)
-log_debug('OpenVPN IP: [%s]' % _ip)
-log_debug('OpenVPN Port: [%d]' % _port)
-log_debug('Additional OpenVPN Arguments: [%s]' % _args)
+log_debug('OpenVPN Management Interface IP: [%s]' % _ip)
+log_debug('OpenVPN Management Interface Port: [%d]' % _port)
+log_debug('OpenVPN Additional Arguments: [%s]' % _args)
 log_debug('Sudo: [%s]' % _sudo)
 if _sudo:
     log_debug('Sudo Password Required: [%s]' % _sudopwdrequired)

diff --git a/resources/images/ad.png b/resources/images/ad.png
diff --git a/resources/images/ae.png b/resources/images/ae.png
diff --git a/resources/images/af.png b/resources/images/af.png
diff --git a/resources/images/ag.png b/resources/images/ag.png
diff --git a/resources/images/ai.png b/resources/images/ai.png
diff --git a/resources/images/al.png b/resources/images/al.png
diff --git a/resources/images/am.png b/resources/images/am.png
diff --git a/resources/images/ao.png b/resources/images/ao.png
diff --git a/resources/images/aq.png b/resources/images/aq.png
diff --git a/resources/images/ar.png b/resources/images/ar.png
diff --git a/resources/images/as.png b/resources/images/as.png
diff --git a/resources/images/at.png b/resources/images/at.png
diff --git a/resources/images/au.png b/resources/images/au.png
diff --git a/resources/images/aw.png b/resources/images/aw.png
diff --git a/resources/images/ax.png b/resources/images/ax.png
diff --git a/resources/images/az.png b/resources/images/az.png
diff --git a/resources/images/ba.png b/resources/images/ba.png
diff --git a/resources/images/bb.png b/resources/images/bb.png
diff --git a/resources/images/bd.png b/resources/images/bd.png
diff --git a/resources/images/be.png b/resources/images/be.png
diff --git a/resources/images/bf.png b/resources/images/bf.png
diff --git a/resources/images/bg.png b/resources/images/bg.png
diff --git a/resources/images/bh.png b/resources/images/bh.png
diff --git a/resources/images/bi.png b/resources/images/bi.png
diff --git a/resources/images/bj.png b/resources/images/bj.png
diff --git a/resources/images/bl.png b/resources/images/bl.png
diff --git a/resources/images/bm.png b/resources/images/bm.png
diff --git a/resources/images/bn.png b/resources/images/bn.png
diff --git a/resources/images/bo.png b/resources/images/bo.png
diff --git a/resources/images/bq.png b/resources/images/bq.png
diff --git a/resources/images/br.png b/resources/images/br.png
diff --git a/resources/images/bs.png b/resources/images/bs.png
diff --git a/resources/images/bt.png b/resources/images/bt.png
diff --git a/resources/images/bv.png b/resources/images/bv.png
diff --git a/resources/images/bw.png b/resources/images/bw.png
diff --git a/resources/images/by.png b/resources/images/by.png
diff --git a/resources/images/bz.png b/resources/images/bz.png
diff --git a/resources/images/ca.png b/resources/images/ca.png
diff --git a/resources/images/cc.png b/resources/images/cc.png
diff --git a/resources/images/cd.png b/resources/images/cd.png
diff --git a/resources/images/cf.png b/resources/images/cf.png
diff --git a/resources/images/cg.png b/resources/images/cg.png
diff --git a/resources/images/ch.png b/resources/images/ch.png
diff --git a/resources/images/ci.png b/resources/images/ci.png
diff --git a/resources/images/ck.png b/resources/images/ck.png
diff --git a/resources/images/cl.png b/resources/images/cl.png
diff --git a/resources/images/cm.png b/resources/images/cm.png
diff --git a/resources/images/cn.png b/resources/images/cn.png
diff --git a/resources/images/co.png b/resources/images/co.png
diff --git a/resources/images/cr.png b/resources/images/cr.png
diff --git a/resources/images/cu.png b/resources/images/cu.png
diff --git a/resources/images/cv.png b/resources/images/cv.png
diff --git a/resources/images/cw.png b/resources/images/cw.png
diff --git a/resources/images/cx.png b/resources/images/cx.png
diff --git a/resources/images/cy.png b/resources/images/cy.png
diff --git a/resources/images/cz.png b/resources/images/cz.png
diff --git a/resources/images/de.png b/resources/images/de.png
diff --git a/resources/images/dj.png b/resources/images/dj.png
diff --git a/resources/images/dk.png b/resources/images/dk.png
diff --git a/resources/images/dm.png b/resources/images/dm.png
diff --git a/resources/images/do.png b/resources/images/do.png
diff --git a/resources/images/dz.png b/resources/images/dz.png
diff --git a/resources/images/ec.png b/resources/images/ec.png
diff --git a/resources/images/ee.png b/resources/images/ee.png
diff --git a/resources/images/eg.png b/resources/images/eg.png
diff --git a/resources/images/eh.png b/resources/images/eh.png
diff --git a/resources/images/er.png b/resources/images/er.png
diff --git a/resources/images/es.png b/resources/images/es.png
diff --git a/resources/images/et.png b/resources/images/et.png
diff --git a/resources/images/fi.png b/resources/images/fi.png
diff --git a/resources/images/fj.png b/resources/images/fj.png
diff --git a/resources/images/fk.png b/resources/images/fk.png
diff --git a/resources/images/fm.png b/resources/images/fm.png
diff --git a/resources/images/fo.png b/resources/images/fo.png
diff --git a/resources/images/fr.png b/resources/images/fr.png
diff --git a/resources/images/ga.png b/resources/images/ga.png
diff --git a/resources/images/gb.png b/resources/images/gb.png
diff --git a/resources/images/gd.png b/resources/images/gd.png
diff --git a/resources/images/ge.png b/resources/images/ge.png
diff --git a/resources/images/gf.png b/resources/images/gf.png
diff --git a/resources/images/gg.png b/resources/images/gg.png
diff --git a/resources/images/gh.png b/resources/images/gh.png
diff --git a/resources/images/gi.png b/resources/images/gi.png
diff --git a/resources/images/gl.png b/resources/images/gl.png
diff --git a/resources/images/gm.png b/resources/images/gm.png
diff --git a/resources/images/gn.png b/resources/images/gn.png
diff --git a/resources/images/gp.png b/resources/images/gp.png
diff --git a/resources/images/gq.png b/resources/images/gq.png
diff --git a/resources/images/gr.png b/resources/images/gr.png
diff --git a/resources/images/gs.png b/resources/images/gs.png
diff --git a/resources/images/gt.png b/resources/images/gt.png
diff --git a/resources/images/gu.png b/resources/images/gu.png
diff --git a/resources/images/gw.png b/resources/images/gw.png
diff --git a/resources/images/gy.png b/resources/images/gy.png
diff --git a/resources/images/hk.png b/resources/images/hk.png
diff --git a/resources/images/hm.png b/resources/images/hm.png
diff --git a/resources/images/hn.png b/resources/images/hn.png
diff --git a/resources/images/hr.png b/resources/images/hr.png
diff --git a/resources/images/ht.png b/resources/images/ht.png
diff --git a/resources/images/hu.png b/resources/images/hu.png
diff --git a/resources/images/id.png b/resources/images/id.png
diff --git a/resources/images/ie.png b/resources/images/ie.png
diff --git a/resources/images/il.png b/resources/images/il.png
diff --git a/resources/images/im.png b/resources/images/im.png
diff --git a/resources/images/in.png b/resources/images/in.png
diff --git a/resources/images/index.html b/resources/images/index.html
diff --git a/resources/images/io.png b/resources/images/io.png
diff --git a/resources/images/iq.png b/resources/images/iq.png
diff --git a/resources/images/ir.png b/resources/images/ir.png
diff --git a/resources/images/is.png b/resources/images/is.png
diff --git a/resources/images/it.png b/resources/images/it.png
diff --git a/resources/images/je.png b/resources/images/je.png
diff --git a/resources/images/jm.png b/resources/images/jm.png
diff --git a/resources/images/jo.png b/resources/images/jo.png
diff --git a/resources/images/jp.png b/resources/images/jp.png
diff --git a/resources/images/ke.png b/resources/images/ke.png
diff --git a/resources/images/kg.png b/resources/images/kg.png
diff --git a/resources/images/kh.png b/resources/images/kh.png
diff --git a/resources/images/ki.png b/resources/images/ki.png
diff --git a/resources/images/km.png b/resources/images/km.png
diff --git a/resources/images/kn.png b/resources/images/kn.png
diff --git a/resources/images/kp.png b/resources/images/kp.png
diff --git a/resources/images/kr.png b/resources/images/kr.png
diff --git a/resources/images/kw.png b/resources/images/kw.png
diff --git a/resources/images/ky.png b/resources/images/ky.png
diff --git a/resources/images/kz.png b/resources/images/kz.png
diff --git a/resources/images/la.png b/resources/images/la.png
diff --git a/resources/images/lb.png b/resources/images/lb.png
diff --git a/resources/images/lc.png b/resources/images/lc.png
diff --git a/resources/images/li.png b/resources/images/li.png
diff --git a/resources/images/lk.png b/resources/images/lk.png
diff --git a/resources/images/lr.png b/resources/images/lr.png
diff --git a/resources/images/ls.png b/resources/images/ls.png
diff --git a/resources/images/lt.png b/resources/images/lt.png
diff --git a/resources/images/lu.png b/resources/images/lu.png
diff --git a/resources/images/lv.png b/resources/images/lv.png
diff --git a/resources/images/ly.png b/resources/images/ly.png
diff --git a/resources/images/ma.png b/resources/images/ma.png
diff --git a/resources/images/mc.png b/resources/images/mc.png
diff --git a/resources/images/md.png b/resources/images/md.png
diff --git a/resources/images/me.png b/resources/images/me.png
diff --git a/resources/images/mf.png b/resources/images/mf.png
diff --git a/resources/images/mg.png b/resources/images/mg.png
diff --git a/resources/images/mh.png b/resources/images/mh.png
diff --git a/resources/images/mk.png b/resources/images/mk.png
diff --git a/resources/images/ml.png b/resources/images/ml.png
diff --git a/resources/images/mm.png b/resources/images/mm.png
diff --git a/resources/images/mn.png b/resources/images/mn.png
diff --git a/resources/images/mo.png b/resources/images/mo.png
diff --git a/resources/images/mp.png b/resources/images/mp.png
diff --git a/resources/images/mq.png b/resources/images/mq.png
diff --git a/resources/images/mr.png b/resources/images/mr.png
diff --git a/resources/images/ms.png b/resources/images/ms.png
diff --git a/resources/images/mt.png b/resources/images/mt.png
diff --git a/resources/images/mu.png b/resources/images/mu.png
diff --git a/resources/images/mv.png b/resources/images/mv.png
diff --git a/resources/images/mw.png b/resources/images/mw.png
diff --git a/resources/images/mx.png b/resources/images/mx.png
diff --git a/resources/images/my.png b/resources/images/my.png
diff --git a/resources/images/mz.png b/resources/images/mz.png
diff --git a/resources/images/na.png b/resources/images/na.png
diff --git a/resources/images/nc.png b/resources/images/nc.png
diff --git a/resources/images/ne.png b/resources/images/ne.png
diff --git a/resources/images/nf.png b/resources/images/nf.png
diff --git a/resources/images/ng.png b/resources/images/ng.png
diff --git a/resources/images/ni.png b/resources/images/ni.png
diff --git a/resources/images/nl.png b/resources/images/nl.png
diff --git a/resources/images/no.png b/resources/images/no.png
diff --git a/resources/images/np.png b/resources/images/np.png
diff --git a/resources/images/nr.png b/resources/images/nr.png
diff --git a/resources/images/nu.png b/resources/images/nu.png
diff --git a/resources/images/nz.png b/resources/images/nz.png
diff --git a/resources/images/om.png b/resources/images/om.png
diff --git a/resources/images/pa.png b/resources/images/pa.png
diff --git a/resources/images/pe.png b/resources/images/pe.png
diff --git a/resources/images/pf.png b/resources/images/pf.png
diff --git a/resources/images/pg.png b/resources/images/pg.png
diff --git a/resources/images/ph.png b/resources/images/ph.png
diff --git a/resources/images/pk.png b/resources/images/pk.png
diff --git a/resources/images/pl.png b/resources/images/pl.png
diff --git a/resources/images/pm.png b/resources/images/pm.png
diff --git a/resources/images/pn.png b/resources/images/pn.png
diff --git a/resources/images/pr.png b/resources/images/pr.png
diff --git a/resources/images/ps.png b/resources/images/ps.png
diff --git a/resources/images/pt.png b/resources/images/pt.png
diff --git a/resources/images/pw.png b/resources/images/pw.png
diff --git a/resources/images/py.png b/resources/images/py.png
diff --git a/resources/images/qa.png b/resources/images/qa.png
diff --git a/resources/images/re.png b/resources/images/re.png
diff --git a/resources/images/ro.png b/resources/images/ro.png
diff --git a/resources/images/rs.png b/resources/images/rs.png
diff --git a/resources/images/ru.png b/resources/images/ru.png
diff --git a/resources/images/rw.png b/resources/images/rw.png
diff --git a/resources/images/sa.png b/resources/images/sa.png
diff --git a/resources/images/sb.png b/resources/images/sb.png
diff --git a/resources/images/sc.png b/resources/images/sc.png
diff --git a/resources/images/sd.png b/resources/images/sd.png
diff --git a/resources/images/se.png b/resources/images/se.png
diff --git a/resources/images/sg.png b/resources/images/sg.png
diff --git a/resources/images/sh.png b/resources/images/sh.png
diff --git a/resources/images/si.png b/resources/images/si.png
diff --git a/resources/images/sj.png b/resources/images/sj.png
diff --git a/resources/images/sk.png b/resources/images/sk.png
diff --git a/resources/images/sl.png b/resources/images/sl.png
diff --git a/resources/images/sm.png b/resources/images/sm.png
diff --git a/resources/images/sn.png b/resources/images/sn.png
diff --git a/resources/images/so.png b/resources/images/so.png
diff --git a/resources/images/sr.png b/resources/images/sr.png
diff --git a/resources/images/ss.png b/resources/images/ss.png
diff --git a/resources/images/st.png b/resources/images/st.png
diff --git a/resources/images/sv.png b/resources/images/sv.png
diff --git a/resources/images/sx.png b/resources/images/sx.png
diff --git a/resources/images/sy.png b/resources/images/sy.png
diff --git a/resources/images/sz.png b/resources/images/sz.png
diff --git a/resources/images/tc.png b/resources/images/tc.png
diff --git a/resources/images/td.png b/resources/images/td.png
diff --git a/resources/images/tf.png b/resources/images/tf.png
diff --git a/resources/images/tg.png b/resources/images/tg.png
diff --git a/resources/images/th.png b/resources/images/th.png
diff --git a/resources/images/tj.png b/resources/images/tj.png
diff --git a/resources/images/tk.png b/resources/images/tk.png
diff --git a/resources/images/tl.png b/resources/images/tl.png
diff --git a/resources/images/tm.png b/resources/images/tm.png
diff --git a/resources/images/tn.png b/resources/images/tn.png
diff --git a/resources/images/to.png b/resources/images/to.png
diff --git a/resources/images/tr.png b/resources/images/tr.png
diff --git a/resources/images/tt.png b/resources/images/tt.png
diff --git a/resources/images/tv.png b/resources/images/tv.png
diff --git a/resources/images/tw.png b/resources/images/tw.png
diff --git a/resources/images/tz.png b/resources/images/tz.png
diff --git a/resources/images/ua.png b/resources/images/ua.png
diff --git a/resources/images/ug.png b/resources/images/ug.png
diff --git a/resources/images/uk.png b/resources/images/uk.png
diff --git a/resources/images/um.png b/resources/images/um.png
diff --git a/resources/images/us.png b/resources/images/us.png
diff --git a/resources/images/uy.png b/resources/images/uy.png
diff --git a/resources/images/uz.png b/resources/images/uz.png
diff --git a/resources/images/va.png b/resources/images/va.png
diff --git a/resources/images/vc.png b/resources/images/vc.png
diff --git a/resources/images/ve.png b/resources/images/ve.png
diff --git a/resources/images/vg.png b/resources/images/vg.png
diff --git a/resources/images/vi.png b/resources/images/vi.png
diff --git a/resources/images/vn.png b/resources/images/vn.png
diff --git a/resources/images/vu.png b/resources/images/vu.png
diff --git a/resources/images/wf.png b/resources/images/wf.png
diff --git a/resources/images/ws.png b/resources/images/ws.png
diff --git a/resources/images/ye.png b/resources/images/ye.png
diff --git a/resources/images/yt.png b/resources/images/yt.png
diff --git a/resources/images/za.png b/resources/images/za.png
diff --git a/resources/images/zm.png b/resources/images/zm.png
diff --git a/resources/images/zw.png b/resources/images/zw.png
diff --git a/resources/images/zz.png b/resources/images/zz.png
diff --git a/resources/lib/openvpn.py b/resources/lib/openvpn.py
@@ -80,6 +80,15 @@ def is_running(ip, port):
                 output = cmdline.split('--config')
                 if len(output) > 1:
                     config = output[1].lstrip().split('--')[0].rstrip()
+                else:
+                    cmdline = 'ps | grep -w %d | grep -vw grep' % pid
+                    ps = subprocess.Popen(cmdline, shell=True, stdout=subprocess.PIPE)
+                    cmdline = ps.stdout.read()
+                    ps.stdout.close()
+                    output = cmdline.split('--config')
+                    if len(output) > 1:
+                        config = output[1].lstrip().split('--')[0].rstrip()
+
             data = interface.receive().split(',')
             if len(data) > 1:
                 state = data[1]
@@ -201,4 +210,3 @@ def connect(self):
                 2, 'Unable to connect to OpenVPN management interface')
 
         self._log_debug('Connect OpenVPN successful')
-        # self.interface.send('hold release\n')