vishapoberon/vipak
1
0
Fork 0
mirror of https://github.com/vishapoberon/vipak.git synced 2026-04-05 20:42:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Opium works, end to end

Browse source
This commit is contained in:
Ruben Shekspir 2019-05-12 12:47:40 +04:00
parent 70e1e1efe4
commit 7e0050c496
5 changed files with 44 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

38
DependencyResolver.Mod
View file

@ -39,7 +39,7 @@ BEGIN
dependencies.GetTerminalKeys(dependencies, keys); dependencies.GetTerminalKeys(dependencies, keys);
FOR i := 0 TO dependencies.TerminalNumber - 1 DO (* TODO: rewrite this logic to work with key count *) FOR i := 0 TO dependencies.TerminalNumber - 1 DO (* TODO: rewrite with working getter everywhere*)
keyFound := dependencies.GetTerminal(dependencies, keys[i], version); keyFound := dependencies.GetTerminal(dependencies, keys[i], version);
IF ~keyFound THEN Logger.Log('ERROR while searching key'); Logger.Log(keys[i]); END; IF ~keyFound THEN Logger.Log('ERROR while searching key'); Logger.Log(keys[i]); END;
@ -60,7 +60,6 @@ BEGIN
Settings.port, Settings.port,
filePath, filePath,
keys[i], keys[i],
version,
Settings.packageFileName, Settings.packageFileName,
returnedJSON returnedJSON
); );
@ -90,30 +89,27 @@ END ResolveVersionFiles;
PROCEDURE ResolvePackages*(); PROCEDURE ResolvePackages*();
VAR VAR
i, j: LONGINT; i: LONGINT;
keyFound: BOOLEAN; keyFound: BOOLEAN;
jsonRecord, filesRecord: JsonParser.JsonTypePointer; jsonRecord, filesRecord: JsonParser.JsonTypePointer;
values: ARRAY ArrayMaxNumber OF JsonParser.TString; values: ARRAY 10 OF JsonParser.TString;
host, port, path, packageName, version: JsonParser.TString; host, port, path, packageName, version: ARRAY 50 OF CHAR;
BEGIN BEGIN
FOR i := 0 TO j - 1 DO FOR i := 0 TO j - 1 DO
IF ~Strings.Match(moduleNames[i], "") THEN jsonRecord := JsonParser.Create(moduleJson[i]);
jsonRecord := JsonParser.Create(moduleJson[i]); filesRecord := jsonRecord.GetNonTerminal(jsonRecord, "Files");
filesRecord := jsonRecord.GetNonTerminal(jsonRecord, "Files");
IF filesRecord = NIL THEN
IF filesRecord = NIL THEN Logger.Log("Error: no files section found");
Logger.Log("Error: no files section found");
END;
ASSERT(filesRecord # NIL);
keyFound := jsonRecord.GetTerminal(jsonRecord, "Remote", host);
keyFound := jsonRecord.GetTerminal(jsonRecord, "Port", port);
keyFound := jsonRecord.GetTerminal(jsonRecord, "Path", path);
keyFound := jsonRecord.GetTerminal(jsonRecord, "Package", packageName);
keyFound := jsonRecord.GetTerminal(jsonRecord, "Version", version);
filesRecord.GetTerminalValues(filesRecord, values);
PackageResolver.Resolve(host, port, path, packageName, version, values);
END; END;
ASSERT(filesRecord # NIL);
keyFound := jsonRecord.GetTerminal(jsonRecord, "Remote", host);
keyFound := jsonRecord.GetTerminal(jsonRecord, "Port", port);
keyFound := jsonRecord.GetTerminal(jsonRecord, "Path", path);
keyFound := jsonRecord.GetTerminal(jsonRecord, "Package", packageName);
keyFound := jsonRecord.GetTerminal(jsonRecord, "Version", version);
PackageResolver.Resolve(host, port, path, packageName, version, filesRecord.TerminalValues); (* TODO: filesRecord.TerminalValues create working getter for this*)
END; END;
END ResolvePackages; END ResolvePackages;

4
JsonParser.Mod
View file

@ -26,7 +26,7 @@ TYPE
GetNonTerminalNumber* : PROCEDURE(self : JsonTypePointer): LONGINT; GetNonTerminalNumber* : PROCEDURE(self : JsonTypePointer): LONGINT;
TerminalKeys : ARRAY ArrayMaxNumber OF TString; TerminalKeys : ARRAY ArrayMaxNumber OF TString;
TerminalValues : ARRAY ArrayMaxNumber OF TString; TerminalValues* : ARRAY ArrayMaxNumber OF TString;
TerminalNumber* : LONGINT; TerminalNumber* : LONGINT;
NonTerminalKeys : ARRAY ArrayMaxNumber OF TString; NonTerminalKeys : ARRAY ArrayMaxNumber OF TString;
@ -113,7 +113,7 @@ PROCEDURE GetTerminalValues(self : JsonTypePointer; VAR destination : ARRAY OF T
VAR VAR
i: LONGINT; i: LONGINT;
BEGIN BEGIN
FOR i := 0 TO LEN(self.TerminalValues) - 1 DO FOR i := 0 TO self.TerminalNumber - 1 DO
Empty(destination[i]); Empty(destination[i]);
COPY(self.TerminalValues[i], destination[i]); COPY(self.TerminalValues[i], destination[i]);
END; END;

4
PackageFileParser.Mod
View file

@ -23,6 +23,10 @@ BEGIN
DependencyResolver.ResolveVersionFiles(jsonData); DependencyResolver.ResolveVersionFiles(jsonData);
DependencyResolver.ResolvePackages(); DependencyResolver.ResolvePackages();
Logger.Log("======================");
Logger.Log("======================");
Logger.Log("Installation complete");
Logger.Log("Thanks for using OPIUM!");
END install; END install;
BEGIN BEGIN

21
PackageResolver.Mod
View file

@ -3,16 +3,24 @@ IMPORT FileManager, http, Strings, Logger, Settings, JsonParser;
CONST ArrayMaxNumber = 1000; CONST ArrayMaxNumber = 1000;
PROCEDURE ResolveFile *(host, port, path, packageName, version, fileName : ARRAY OF CHAR; VAR returnValue : ARRAY OF CHAR); PROCEDURE ResolveFile *(host, port, path, packageName, fileName : ARRAY OF CHAR; VAR returnValue : ARRAY OF CHAR);
VAR VAR
localPath: ARRAY ArrayMaxNumber OF CHAR; localPath: ARRAY ArrayMaxNumber OF CHAR;
isSuccessfull: BOOLEAN; isSuccessfull: BOOLEAN;
BEGIN BEGIN
Logger.Log('path');
Logger.Log(path);
http.get(host, port, path, returnValue); http.get(host, port, path, returnValue);
http.getClean(returnValue, returnValue); http.getClean(returnValue, returnValue);
isSuccessfull := FileManager.CreateDirectory(packageName, Settings.installPath); isSuccessfull := FileManager.CreateDirectory(packageName, Settings.installPath);
IF ~isSuccessfull THEN Logger.Log("Something went wrong, while downloading files") END;
ASSERT(isSuccessfull);
Logger.Log(path);
Logger.Log(packageName);
COPY(Settings.installPath, localPath); COPY(Settings.installPath, localPath);
Strings.Append("/", localPath); Strings.Append("/", localPath);
Strings.Append(packageName, localPath); Strings.Append(packageName, localPath);
Strings.Append("/", localPath); Strings.Append("/", localPath);
@ -25,11 +33,16 @@ END ResolveFile;
PROCEDURE Resolve *(host, port, path, packageName, version: ARRAY OF CHAR; files: ARRAY OF JsonParser.TString); PROCEDURE Resolve *(host, port, path, packageName, version: ARRAY OF CHAR; files: ARRAY OF JsonParser.TString);
VAR VAR
i : LONGINT; i : LONGINT;
returnValue: JsonParser.TString; helperString: ARRAY 10000 OF CHAR;
BEGIN BEGIN
Strings.Append("/", path);
FOR i := 0 TO LEN(files) - 1 DO FOR i := 0 TO LEN(files) - 1 DO
IF ~Strings.Match(files[i], "") THEN IF ~Strings.Match(files[i], "") THEN
ResolveFile(host, port, path, packageName, version, files[i], returnValue); JsonParser.Empty(helperString);
COPY(path, helperString);
Strings.Append(files[i], helperString);
ResolveFile(host, port, helperString, packageName, files[i], helperString);
END; END;
END; END;
END Resolve; END Resolve;

7
http.Mod
View file

@ -1,8 +1,8 @@
MODULE http; MODULE http;
IMPORT Strings, Internet, Logger, Out; IMPORT Strings, Internet, Logger, Out;
CONST CONST
MAXARRAYNUMBER = 1000; MAXARRAYNUMBER = 10000;
MAXARRAYNUMBEREXTENDED = 10000; MAXARRAYNUMBEREXTENDED = 100000;
TYPE TYPE
PSTRING = POINTER TO ARRAY OF CHAR; PSTRING = POINTER TO ARRAY OF CHAR;
@ -131,7 +131,8 @@ BEGIN
(* Out.Real(valueContentLength, 6); (* Out.Real(valueContentLength, 6);
Out.Ln; Out.Ln;
Logger.LogIntLn(Strings.Length(buff)); Logger.LogIntLn(Strings.Length(buff));
Logger.Log(buff); *) *)
Logger.Log(buff);
UNTIL ~connectionFlag OR (Strings.Length(buff) > valueContentLength); UNTIL ~connectionFlag OR (Strings.Length(buff) > valueContentLength);
Internet.Disconnect(socket); Internet.Disconnect(socket);
END get; END get;