-
-
Notifications
You must be signed in to change notification settings - Fork 44
Add Config File #8
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
andreiverse
wants to merge
11
commits into
main
Choose a base branch
from
vaf-configfile
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
11 commits
Select commit
Hold shift + click to select a range
84d883c
fix warning
andreiverse 4bc96df
initVafConfig
andreiverse ae50ef4
Configuration File Structure
daanbreur 3c6ea49
Create the VafWordlist Type.
daanbreur 973cebf
Merge pull request #9 from daanbreur/vaf-configfile-base
andreiverse 47e9ca9
add readVafConfig
andreiverse 5996e65
Removed the version number from the configfile.
daanbreur 794eefc
Merge pull request #10 from daanbreur/vaf-configfile-base
andreiverse cfe365b
Create import function
daanbreur dc991bc
Create parseVafConfig file.
daanbreur 28c7504
Merge pull request #11 from daanbreur/vaf-configfile-base
andreiverse File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,6 @@ | ||
| import VafWordlist | ||
|
|
||
| type | ||
| VafConfigStructure* = object | ||
| DefaultWordlist*: int | ||
| Wordlists*: seq[VafWordlist] |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
|
|
||
| type | ||
| VafWordlist* = object | ||
| Id*: int | ||
| Path*: string |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,24 @@ | ||
| import json | ||
| import os | ||
| import strutils | ||
|
|
||
| import initVafConfig | ||
| import parseVafConfig | ||
|
|
||
| import VafConfigStructure | ||
|
|
||
| var homeDir: string = os.getHomeDir() | ||
|
|
||
| proc importVafConfig*(): VafConfigStructure = | ||
| var configExists: bool = fileExists(homedir & "/.vaf.json") | ||
| var configContents = readFile(homedir & "/.vaf.json") | ||
| var jsonData: JsonNode | ||
|
|
||
|
|
||
| if configExists: | ||
| jsonData = parseJson(configContents) | ||
| # else: | ||
| # jsonData = initVafConfig() | ||
|
|
||
| return parseVafConfig(jsonData) | ||
|
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,17 @@ | ||
| import os | ||
| import strutils | ||
|
|
||
| var homeDir: string = os.getHomeDir() | ||
| var defaultJson: string = """{}""" | ||
|
|
||
| proc initVafConfig*(): int = | ||
| var configExists: bool = fileExists(homedir & "/.vaf.json") | ||
| var configFile = open(homedir & "/.vaf.json", fmWrite) | ||
|
|
||
| defer: configFile.close() | ||
|
|
||
| if configExists: | ||
| return 1 | ||
| else: | ||
| for i in defaultJson.split("\n"): | ||
| configFile.writeLine(i) |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,36 @@ | ||
| import json | ||
| import os | ||
| import strutils | ||
|
|
||
| import VafWordlist | ||
| import VafConfigStructure | ||
|
|
||
| proc parseWordlist(data: JsonNode): VafWordlist = | ||
| var wordlistObject: VafWordlist = VafWordlist() | ||
|
|
||
| if data{"Id"} != nil: | ||
| wordlistObject.Id = data{"Id"}.getInt() | ||
|
|
||
| if data{"Path"} != nil: | ||
| wordlistObject.Path = data{"Path"}.getStr() | ||
|
|
||
| return wordlistObject | ||
|
|
||
| proc parseVafConfig*(data: JsonNode): VafConfigStructure = | ||
| var configObject: VafConfigStructure = VafConfigStructure() | ||
|
|
||
| echo data | ||
|
|
||
| if data{"DefaultWordlist"} == nil: | ||
| configObject.DefaultWordlist = -1 | ||
| else: | ||
| configObject.DefaultWordlist = data{"DefaultWordlist"}.getInt() | ||
|
|
||
| if data{"Wordlists"} != nil: | ||
| for wordlist in data{"Wordlists"}: | ||
| configObject.Wordlists.add( parseWordlist( wordlist )) | ||
|
|
||
|
|
||
| echo configObject | ||
|
|
||
| return configObject |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,18 @@ | ||
| import json | ||
| import os | ||
| import strutils | ||
| import initVafConfig | ||
|
|
||
| var homeDir: string = os.getHomeDir() | ||
|
|
||
| proc readVafConfig*(): int = | ||
| var configExists: bool = fileExists(homedir & "/.vaf.json") | ||
| var configContents = readFile(homedir & "/.vaf.json") | ||
| var jsonNode = parseJson(configContents) | ||
|
|
||
| discard initVafConfig() | ||
|
|
||
| if configExists: | ||
| return 0 | ||
| else: | ||
| echo jsonNode |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,5 @@ | ||
| import httpclient | ||
| import VafResponse | ||
| import json | ||
|
|
||
| var client = newHttpClient() | ||
|
|
||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Binary file not shown.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.