From cd2ad7cbf7efc312fa0af3de0682490ecfcaae27 Mon Sep 17 00:00:00 2001
From: Igor Timofeev <Igor@iMac-Igor.local>
Date: Fri, 6 Jan 2017 20:06:45 +0300
Subject: [PATCH] =?UTF-8?q?=D0=A5=D1=83=D0=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .DS_Store                        | Bin 18436 -> 18436 bytes
 Applications.txt                 |  26 +++-----------------------
 Applications/.DS_Store           | Bin 71684 -> 71684 bytes
 Applications/VK/.DS_Store        | Bin 8196 -> 10244 bytes
 Applications/VK/VK.lua           |   3 +--
 Applications/Weather/.DS_Store   | Bin 10244 -> 10244 bytes
 Applications/Weather/Weather.lua |   3 +--
 7 files changed, 5 insertions(+), 27 deletions(-)

diff --git a/.DS_Store b/.DS_Store
index d77f903a2c5e46c7655f5d49797c8673daa79fa7..dc57a8ab31707dad49cfe760f8741bcde8d395b6 100644
GIT binary patch
delta 1081
zcmZXSU2GIp7>3VN)^rAr?rgU$-D%gg1-4ymN&#s=6WY?+mJ|X=`G-Kav(+uzUF=p=
z{3&WRV5AgIK#2&c5ilABvZ4mPFo?Ha5hVt^G2sqw2x<%{XJ=OBXD()PzH`2L&-=a4
z=s2U}oT|3irN*X*d~HG5p_;AJzF?`8>eu?2BNt5bg5L_1RD^7~(divdEX_E{{$#?j
z&KTZKIAq%!@;hxq3H^2q!)>Upv1Ly-xg%lq77j*hrR>?7OgmP#@Y6@@rM)WE8&9Mx
z$Mo77XG?p{_QX&&nMqsSX4tFFYm)ZbzRciYB0Zc9P+vH#BGIaFv({gi*Kc*4yt*+>
z6rO1<b?Rnd=E!C7o46`&h`+=w@wfN~gEFR4L5La}m_;KCSV#-4ETWs`JjF_S*hC)*
z`gxjdyuc1#;$_}sjD74!ahOl}jL$jA*PP>f&hrC5@-r7b?IH?y=oCU7Zg_C&FM2&m
zq(oB0Q`zm?;;Bqrh@vq)_449K*Wxa}Y}bRIP`iTzYM?Ia*YmEdu94Cb0dxlHXx-+r
z_S%TFFwDCh9xHu(q=Cn@gATg%{g<$m)vRR$8?}dio?(Ekq<D_!dC~PT%3JJWH*aen
z2Y8qFIK+p1#BomWF{jCKhA;Vw@9uPVkFV~6KlkGkf{Qt)?8M}KJIixZ9{IpGDcB)Z
ztFKK(g7Z~$#;pH=x~j7;u>yXn4VoIFyP$G+?2sKXj60F?8fxt6riRId%B$4Mn5kiM
zq4HYmWrLwv@}Tlcv*lbvlT?5zoc5|sa=wuV=|8I6vN{{6D!U)3mV;lY<<UibKZ#4?
zinu1Oi{Hf`;!mIm9}iGMB~^rpF^9R#qlqVI=SezsAo(!Xu#WX?A*rKCF{q<>l@VU&
z4c^fK9CQQ75B?jzRX3soROPnRPDWi1M*Wo`yW(FC^ypMwY227%YRJ7iEmWPc@|7_S
z@dBDP!fjf&gJrDH0I$-@o3(1(1vyQIXBlFcSG4+0UUSv=u$OTS^!pm<BOGOdPdu=5
ar(!pKxpNOM#*MUb;-SK#Bv;&WtN1nxOa$8i

delta 1027
zcmZwFTWl0n9LMqV4UL`Yp3vE)Y}u)}w%zP@Lp24VfC~0Px7;tGf^reI-GOXvx7aO>
zibB*X7mcYLE+Ig;h(HLT$U=lZfq_?EY+~dI!V4h*5)4F)M9<D_1QTB-ng5w{{=fO3
z&%hu9gPg6jQ0j6ZSZp`XY6;3#l`NmC?nkDnGgecPER#X?usphD#B9qXyPc6z%O8*-
zyTY_C7^_mrK4(EsD!nf4q}&xdWQPr7Wxn3r>*%LfmQ{Adw30?!HvMtoh?tC<R@Q8L
zKb<LTt(C7DR?2+4E7|UJd8bX3uNl@nb9uj0*_%!GWV~v<oM!l`HQ(vz>F#zieOb4x
z!qFGU>i&&}@ov6<V=CpOjOvE|2DLa^uAcZKJvYQnaaTMNkHr)5r}!HK6CaWgRa6t9
zj_JJ4o6MkzdCX@ai)dpt@3EF7>)F5uWa;A*zT_*mvjfEe4swXY3~`Z540DxhT<2GA
za!V1bE*>SiL|U|~8L{dYX3v>hDihDmcaqvXrc-s+L`%o%k;*C=G5w5~mQaUk+Dj6q
zVe#w__LfavT}M3)Bxq%>PPl+&EN2BPb;fl%Uz$$3*hoJg@)4UD&^foV&CR)sJ?v#4
zNBN!~IL=9a<Q(U@z)xJ}3O{pI4aX<smW(}ClJmWMuxL~;Ays2hv!<~A8H0NT1_8^T
z&n*8#K$9>>@+;#*w*5Q;!*I)$Rkm~qXbRqk(U_Dj0ZqZHOsJK%M?hQfw$)9PwkD7l
zP?^yjyy}#CY5yxA&%rCJVgLU!*t1JBXzKVy{3dRT`{IFkD1H}z0Hd++6QF_^HN=_3
zRF}aU%wmqqAV20+8o?UPAYCA^k<EIvJNTM!*v&CL&=ZA`=G3ETC*j=MSPAORm}qH5
z$R1a?+I#t{9bdM_=Zl4<Vd}eeW6e~p@!--Jujtlq(Wo1@=sRA-VwP%u%XH%;9i(u`
zXoJ13!B5%3XMD~VI>5IK@*O+bU$A(DQ=H}uL%Fl@zlu~K9Lf#7lpyD;J2JZP)<mwj
H;c4+dEC2|=

diff --git a/Applications.txt b/Applications.txt
index b2bee09a..e32c20d6 100644
--- a/Applications.txt
+++ b/Applications.txt
@@ -292,7 +292,7 @@
     url="IgorTimofeev/OpenComputers/master/lib/ECSAPI.lua",
     type="Library",
     preLoadFile=true,
-    version=1.06,
+    version=1.07,
   },
   {
     name="lib/colorlib.lua",
@@ -314,12 +314,6 @@
     type="Library",
     version=1.05,
   },
-  {
-    name="lib/internet.lua",
-    url="IgorTimofeev/OpenComputers/master/lib/internet.lua",
-    type="Library",
-    version=1.01,
-  },
   {
     name="lib/GUI.lua",
     url="IgorTimofeev/OpenComputers/master/lib/GUI.lua",
@@ -475,20 +469,6 @@
     forceDownload=true,
     version=1.0,
   },
-  {
-    name="bin/wget.lua",
-    url="IgorTimofeev/OpenComputers/master/Applications/wget.lua",
-    type="Script",
-    forceDownload=true,
-    version=1.01,
-  },
-  {
-    name="bin/pastebin.lua",
-    url="IgorTimofeev/OpenComputers/master/Applications/pastebin.lua",
-    type="Script",
-    forceDownload=true,
-    version=1.01,
-  },
   {
     name="bin/clear.lua",
     url="IgorTimofeev/OpenComputers/master/Applications/clear.lua",
@@ -624,7 +604,7 @@
     type="Application",
     icon="IgorTimofeev/OpenComputers/master/Applications/VK/Icon.pic",
     createShortcut="dock",
-    version=1.23,
+    version=1.24,
     resources={
       {
         name="VKLogo.pic",
@@ -639,7 +619,7 @@
     type="Application",
     icon="IgorTimofeev/OpenComputers/master/Applications/Weather/Icon.pic",
     createShortcut="desktop",
-    version=1.11,
+    version=1.12,
     resources={
       {
         name="Cloudy.pic",
diff --git a/Applications/.DS_Store b/Applications/.DS_Store
index 3489783da3cd7b7bdc5229b5f87e3caaa571b05d..3eb967673b5265fb796e9aeb982548eb1edf6311 100644
GIT binary patch
delta 479
zcmXYu-%C?r7{||-CcW<)(|5eA<1}>^OVp*zqF*w^%p`S4Fq_kEX6G$Wxy^aj#2}2E
zK_C=7dE-@o!eDe?bY&M^WF$m_*L4-;jUagD>E?U!d3e5jc%E{_SFZRfe-<eHdYs|~
zMZdR#P=wFxZoV7qUir%SH(B4{7p4kv`JUagGDV%pTlNE6TgMY+susp(YJ6x>yXj#O
zR%f})u%u%@)m}wJba3hL<YPPcf3-_QnY8%id}db9du_cU#^e}JmGq)x=fgRVUJ{pC
z08u`5KcCI&T+#9HHAU?dqz@sVjGIcOYZ8N&r7gy&usn3<hw;<cHGUa?jeo{I0D)8R
zqaF%p(1JFE5kU`n5knuYVh}fQ6T?X0E>f7r3@l`k!vYF;j#nVOr9@vheR3joO~ZaM
zLUKJtZ`KsaizOP^INuO58&9`|n}jq1a4$!D&9f&sXY?@`qjO&ZNmt<{0x;2tW>=vV
z9q2?97hH)euE2HlBaT}b!EKCU9Fwld6w=2c8V@mtM{rO?2}@YU3#?)dFRO=7`ceB|
VwY;=bN0se4nmCA6zd!5QJOUDjdAk4r

delta 72
zcmV-O0Jr~yumps#1hDaN2Q@S?EFd#9lOcCVlR$A0v)p8J0tEs9Rsc(rfifbqNqR&A
evk-O)0h6!1PqS%v)CH5y(@K+1`Z2TCeJ+};U>qj^

diff --git a/Applications/VK/.DS_Store b/Applications/VK/.DS_Store
index 8de1fd0de72507a2fca2518ab0008b84134a3bbe..101570baff064cde626b0bc93d5ee1ea1d313d28 100644
GIT binary patch
delta 456
zcmZp1XbF&DU|?W$DortDU{C-uIe-{M3-C-V6q~50$jG-bU^hP_-)0^G4fgtik|dwf
z;*uhu0xO14hGK?Ph9V%T&)~_B&X5me>od3j>12jdhFqXr9zzLO)}0{}$npS+CIMCW
zGZcX3oPjEHf$UPC9LyX?Aisbi2dF-oArUB^2~?8@HY1F|n?X|_XfYcDh^YruRLYPD
zbdVp^K`7#r1H`v)Y$#zDWCrR00tId$;R^EB#=`H+llf%=MVKI-)c{E|GB6l`=*a~#
Oy_*?DjhTj&Pc;B=X;#Vr

delta 158
zcmZn(XmOBWU|?W$DortDU;r^WfEYvza8E20o2aMA$h$FMH$NlqW*z|zb{Wr{{N$vZ
z{3MV9AU*@c8bHkW|33r6<U8Wq1(|_7Aduh&60RUqHWq$op3JWj$iWCPn_+T1&(zI-
LMa-E98MXxgLLnfU

diff --git a/Applications/VK/VK.lua b/Applications/VK/VK.lua
index 3f1dd932..83019009 100755
--- a/Applications/VK/VK.lua
+++ b/Applications/VK/VK.lua
@@ -6,7 +6,6 @@ local json = require("json")
 local serialization = require("serialization")
 local event = require("event")
 local ecs = require("ECSAPI")
-local internet = require("internet")
 local fs = require("filesystem")
 local buffer = require("doubleBuffering")
 local context = require("context")
@@ -143,7 +142,7 @@ end
 
 --Банальный URL-запрос, декодирующийся через ЖУСОН в случае успеха, епты
 local function request(url)
-	local success, response = internet.request(url)
+	local success, response = ecs.internetRequest(url)
 	if success then response = json:decode(response) end
 	return success, response
 end
diff --git a/Applications/Weather/.DS_Store b/Applications/Weather/.DS_Store
index 485f8040e1abb769a0a368a441c1979537d4fd63..d9e02563b4888a5e8485bf8f9750e4eec0b4bc0a 100644
GIT binary patch
delta 28
kcmZn(XbG6$&nUDpU^hRb&}JTiPL7RbMeLi|75=gV0Ey}eR{#J2

delta 78
zcmZn(XbG6$&nUbxU^hRb@Ma!?P7XtEhH!>dhD3%Eh72HG#GuEJ!%)hQ=$VtBoRpKF
e#K6EHz`(#51f(^9nDzhvjfIZvo7olqvI77CAQMvn

diff --git a/Applications/Weather/Weather.lua b/Applications/Weather/Weather.lua
index 3fee97fc..b3bf03d5 100755
--- a/Applications/Weather/Weather.lua
+++ b/Applications/Weather/Weather.lua
@@ -13,7 +13,6 @@ local image = require("image")
 local unicode = require("unicode")
 local component = require("component")
 local GUI = require("GUI")
-local internet = require("internet")
 
 ---------------------------------------------------- Константы ----------------------------------------------------------------
 
@@ -88,7 +87,7 @@ local weatherIcons = {
 --Запрос на получение погоды
 local function weatherRequest(city)
 	local url = "https://query.yahooapis.com/v1/public/yql?q=select%20*%20from%20weather.forecast%20where%20woeid%20in%20(select%20woeid%20from%20geo.places(1)%20where%20text%3D%22" .. city .. "%2C%20ak%22)&format=json&env=store%3A%2F%2Fdatatables.org%2Falltableswithkeys"
-	local success, response = internet.request(url)
+	local success, response = ecs.internetRequest(url)
 
 	if success then
 		response = json:decode(response)