This commit is contained in:
Igor Timofeev 2017-01-06 20:06:45 +03:00
parent c42b5e57db
commit cd2ad7cbf7
7 changed files with 5 additions and 27 deletions

BIN
.DS_Store vendored

Binary file not shown.

View File

@ -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",

BIN
Applications/.DS_Store vendored

Binary file not shown.

Binary file not shown.

View File

@ -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

Binary file not shown.

View File

@ -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)