From 415b5251256e9c624c4c6b582be183f7e2707c82 Mon Sep 17 00:00:00 2001 From: atticusmatticus <20863400+atticusmatticus@users.noreply.github.com> Date: Wed, 10 Feb 2021 18:15:24 -0600 Subject: [PATCH] changed autoconnect start screen to show status. --- MullvadVPN.alfredworkflow | Bin 1072710 -> 1072717 bytes src/mullvad.py | 19 ++++++++++++------- src/mullvad.pyc | Bin 17512 -> 17738 bytes src/version | 2 +- 4 files changed, 13 insertions(+), 8 deletions(-) diff --git a/MullvadVPN.alfredworkflow b/MullvadVPN.alfredworkflow index 23966a3bbc8567decef30bc7411eb365f4a095f5..bb27a11c414a53b20d3f6382c818643ae801633f 100644 GIT binary patch delta 3338 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 UT@X(Ja+eEU5H$wwPY?hA03#J8r2qf` delta 3346 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 diff --git a/src/mullvad.py b/src/mullvad.py index 927e7d1..b1bec43 100644 --- a/src/mullvad.py +++ b/src/mullvad.py @@ -222,6 +222,15 @@ def filter_tunnel_protocols(query): return protocols +def set_auto_connect(): + for status in get_auto_connect(): + wf.add_item(status, + 'Current auto-connect status.', + arg='/usr/local/bin/mullvad auto-connect get', + valid=True, + icon='icons/chevron-right-dark.png') + + def set_lan(): for status in get_lan(): if status == 'Local network sharing setting: allow': @@ -420,8 +429,9 @@ def main(wf): protocol_status() set_lan() check_connection() + set_auto_connect() for action in mullvad_actions.ACTIONS: - if action['name'] in ['relay', 'reconnect', 'auto-connect', 'account']: + if action['name'] in ['relay', 'reconnect', 'account']: wf.add_item(action['name'], action['description'], uid=action['name'], autocomplete=action['autocomplete'], @@ -445,12 +455,7 @@ def main(wf): set_lan() elif query and query.startswith('auto-connect'): - for status in get_auto_connect(): - wf.add_item(status, - 'Current auto-connect status.', - arg='/usr/local/bin/mullvad auto-connect get', - valid=True, - icon='icons/chevron-right-dark.png') + set_auto_connect() elif query and query.startswith('reconnect'): set_reconnect() diff --git a/src/mullvad.pyc b/src/mullvad.pyc index a06d5ec651655247e0b1134c7d9e365b09be859c..af31b5a2d3a41c4388aafd466c6f3b3ac842637c 100644 GIT binary patch delta 1639 zcmbVMTWniJ5S>}aZf~52)4bz6>^Ki6aT1y|j-Y8?HAqw_(AywGLTRd8Q`J_SI=+rl zut|ywNn157Y*1($%VgeRE#)ut^ zRyc_eae~nX!7SiZ7eo-E0f=-#v>PHFkVXDs9Kb+0;%~R^;?wnqk)#XhImj*^Az11M z6Ceu^I_ifEfJrI>(rT9>z_5W)045>%bU;?vFi{9$14wcgZJ&_89q`)q01aiya6tBX z_hPj)yeIrF_7E|T9Z#9_$7bi_@yM+C1Fsbk0J=~^2Y;=u#z}#{SSz0A5dX67dEY?+ zXs!6Bh1iYOz1Gu+WmdTTO~kZBPx%`ir^rL1<7@O;W1Zsy{npvQ1+-I|;9*(O^EtjO z@Aic8khQP(CB$=b^Pv<@T5WqRbi6_wJuAQK`vzC#2mL9GSpI#_FzL)dGcDa1xQL6g zFL(`KmtO@Na6@hdo1Lq?YlcC}54(@p*J=2wJT>Sp;bN82W1}Y-lvf8QF(rQ=d_QcK zaY}J10p=cvmQ!+PA%l=cFiN1-=z^F77Mw_Fj^1Bo;~p}W-=|R>Xid;sg&I}Jz<&3# z6BAAhQ(e~p7B-MDS^-8SSDU7$OL>l03O0X+W+hPkFOW_Zyhc^62BQW}2nglQ2Q!Lu zJAPuRg{{0`sS?~mvx-jxnX*)t_(!#CCK&6DaBsaKe!Nm+@% zsLT_2vs;-b#CFo+)5<)TH`5Ezo6QNcM(tjX4=MYlyuDu8FA1|&MagHrPBCuf8B`2X zxFt+y&i~&kb>E8zxoJ?jX#}HwXKsj5lH2ix+HuoH)m)}>W`vs8+PHvqJWkV9X#&#? z(RwgEU^Y;?1ktEWba}{15g5B5RsajnIurlr4D{K;iJQth$$B|}D!#1E z>YDn%#e=NQ z(jJu_!>=Y@FjU*2)0Lr~LBVuFx&EXmRR+f#d$;(|H`PRs2C0{#zis1^wB7xs0{~ZbS zqkOOn;=xtaWo4+(r)kBSrtPN3p%rO%t&F~f3QM&T JZLSEb@IPiCS8V_Q delta 1556 zcma)6T}+!*7=GXLwRH#s28@oDQD_S*{{#nP1{m!+(U>^=ra>7HNKZ8@SsCrug@sl& zF@sF;?*tdN8;$et%8<`wUYHoKrn}L3ftN;uiHUJHXm+7d-}jVGF1)bqd3wI{KIeJg z^PKOT+gI@C74#b0dmnr$6`YE}&c{jrL)6lrZFnzYINl6005bwopJLnzG6-i7;>92v zp?3*ztOeo-iB^cWK%x!eAy`8GVG=+hoC-DBKjG80_6^??0)Mc#8^#gu+9QE?P}~E1 zJ9t`%zrh|kbOCXXeLJ*g+t#u}a-6k`JZS0W88YY9&~K9*og2xTuv;GpMB} zRmst(FsY`GemF8e2i87FR6ukh203IASqe3>9cEmRa$pu9aetJ9l@zSHPZPQ)Xl%dk z?N?I|dlwxz=fF`ibp;@`iiC+ukkxE8JzC{J#$YlkIQ%(URj>^39BI3O)+G;stbykR zMDv@&jJ^386?(>2L9k2lQJW(|Rb@*qeDSc|j*dim;LNf*Wlb2L*@`6bx4$RjW+zj;$DYYKX z)bLedK15(~Z#rh3nN6B~)K&h-yz2^IGB?!QkskG3q^Y=^t{Ip9ma4xZX>3=i<0oD3 zvc&u9*731noj=9Tx=vm3zr|kUfG&m36qr$lM;LTvihF#snIEgO(PbP_zel@O^NCvL ITnSd=KMn&>GXMYp diff --git a/src/version b/src/version index 5712157..5eef0f1 100644 --- a/src/version +++ b/src/version @@ -1 +1 @@ -0.10.1 +0.10.2