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

URL change,vipackConf.json reading

Browse source
This commit is contained in:
mane 2020-04-26 05:54:23 +04:00
parent d75b48915d
commit b30deb5bd9
3 changed files with 33 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

43
Vipack.Mod
View file

@ -1,19 +1,24 @@
MODULE Vipack; MODULE Vipack;
IMPORT vpkGit, vpkConf, vpkLogger, vpkPackageFileParser, Texts, Strings, In, Platform, Oberon, Out, Files, vpkUserDetails; IMPORT vpkFileManager,vpkJsonParser,vpkGit, vpkConf, vpkLogger, vpkPackageFileParser, Texts, Strings, In, Platform, Oberon, Out, Files, vpkUserDetails;
PROCEDURE main(); PROCEDURE main();
CONST confFileName = "vipack.conf"; CONST confFileName = "vipackConf.json";
CONST syncDirName = "tree/"; CONST syncDirName = "tree/";
CONST quote = '"';
CONST startBracket = "{";
CONST endBracket = "}";
VAR user, str: ARRAY 32 OF CHAR; VAR user, str: ARRAY 32 OF CHAR;
vpkDirPath, treePath, confPath : ARRAY 120 OF CHAR; vpkDirPath, treePath, confPath, jsonString : ARRAY 120 OF CHAR;
i : INTEGER; i : INTEGER;
f : Files.File; f : Files.File;
r : Files.Rider; r : Files.Rider;
ch : CHAR; ch : CHAR;
S: Texts.Scanner; S: Texts.Scanner;
defaultUrl,gitUrl,project,command,string : ARRAY 500 OF CHAR; jsonData,string,defaultUrl,gitUrl,project,command, jsonPathLine : ARRAY 500 OF CHAR;
success: BOOLEAN;
jsonRecord: vpkJsonParser.JsonTypePointer;
PROCEDURE help(); PROCEDURE help();
BEGIN BEGIN
@ -27,7 +32,7 @@ Texts.OpenScanner(S, Oberon.Par.text, Oberon.Par.pos);
Texts.Scan(S); Texts.Scan(S);
Out.String(S.s); Out.Ln; Out.String(S.s); Out.Ln;
defaultUrl := "https://github.com/norayr/diaspora"; defaultUrl := "https://github.com/vishaps/vipackTree";
command := S.s; command := S.s;
@ -57,18 +62,17 @@ IF ~(vpkConf.confExists(confPath)) THEN
Out.String("Creating the configuration file "); Out.String(confPath);Out.Ln; Out.String("Creating the configuration file "); Out.String(confPath);Out.Ln;
vpkConf.makeConf(confPath,f); vpkConf.makeConf(confPath,f);
Files.Set(r, f, 0); Files.Set(r, f, 0);
(*Files.WriteInt(r, 8)*); Files.WriteString(r, " PATH :"); Files.WriteString(r,defaultUrl); Strings.Append(startBracket, jsonPathLine);
Strings.Append('"path" : ', jsonPathLine);
Strings.Append(quote, jsonPathLine);
Strings.Append(defaultUrl,jsonPathLine);
Strings.Append(quote, jsonPathLine);
Strings.Append(endBracket,jsonPathLine);
Files.WriteString(r,jsonPathLine);
Files.Close(f); Files.Close(f);
ELSE ELSE
Out.String("File already exists");Out.Ln; Out.String("File already exists");Out.Ln;
END; END;
(*after adding file and working with it, then removing the file part in the path *)
(*ELSIF Strings.Match(command, "install") THEN
vpkPackageFileParser.install();
END;*)
IF command = "sync" THEN IF command = "sync" THEN
@ -79,11 +83,12 @@ IF command = "sync" THEN
ELSE Out.String("Some error occured or directory already exist"); ELSE Out.String("Some error occured or directory already exist");
END; END;
(*Sync*) (*Sync*)
f := Files.Old(confPath); success := vpkFileManager.Read(confPath,jsonData);
Files.Set(r,f,0); jsonRecord := vpkJsonParser.Create(jsonData);
Files.ReadLine(r,gitUrl); success := vpkJsonParser.GetTerminal(jsonRecord,"path", jsonString);
Strings.Delete(gitUrl,0,6); Out.String("URL = ");
Out.String(gitUrl); Out.Ln; Out.String(jsonString);Out.Ln;
gitUrl := jsonString;
string := gitUrl; string := gitUrl;
Strings.Delete(string,19,Strings.Length(string)-17); Strings.Delete(string,19,Strings.Length(string)-17);
Out.String(string);Out.Ln; Out.String(string);Out.Ln;
@ -99,6 +104,8 @@ IF command = "install" THEN
Texts.Scan(S); Texts.Scan(S);
project := S.s; project := S.s;
Out.String(project);Out.Ln; Out.String(project);Out.Ln;
vpkPackageFileParser.install();
END; END;

10
vpkConf.Mod
View file

@ -1,5 +1,5 @@
MODULE vpkConf; MODULE vpkConf;
IMPORT Files; IMPORT Files, vpkFsHelper;
PROCEDURE confExists*(VAR confFile: ARRAY OF CHAR ):BOOLEAN; PROCEDURE confExists*(VAR confFile: ARRAY OF CHAR ):BOOLEAN;
BEGIN BEGIN
@ -9,8 +9,7 @@ BEGIN
END confExists; END confExists;
PROCEDURE makeConf*(VAR confFilePath: ARRAY OF CHAR); PROCEDURE makeConf*(VAR confFilePath: ARRAY OF CHAR;VAR f:Files.File);
VAR f : Files.File;
BEGIN BEGIN
f := Files.New(confFilePath); f := Files.New(confFilePath);
@ -18,6 +17,11 @@ Files.Register(f);
END makeConf; END makeConf;
PROCEDURE makeDir*(VAR confDirPath: ARRAY OF CHAR):BOOLEAN;
BEGIN
RETURN vpkFsHelper.mkDir(confDirPath);
END makeDir;
BEGIN BEGIN

9
vpkUserDetails.Mod
View file

@ -1,4 +1,4 @@
MODULE UserDetails; MODULE vpkUserDetails;
IMPORT Platform; IMPORT Platform;
PROCEDURE GetUsername*(VAR str : ARRAY OF CHAR):BOOLEAN; PROCEDURE GetUsername*(VAR str : ARRAY OF CHAR):BOOLEAN;
@ -6,11 +6,4 @@ BEGIN
RETURN Platform.getEnv("USER", str); RETURN Platform.getEnv("USER", str);
END GetUsername; END GetUsername;
END vpkUserDetails. END vpkUserDetails.