Skip to content

Commit

Permalink
added speech for windows users partial #3 issue fixed
Browse files Browse the repository at this point in the history
  • Loading branch information
sovr610 committed Nov 25, 2019
1 parent fadd058 commit 4dd43fd
Show file tree
Hide file tree
Showing 81 changed files with 1,096 additions and 24 deletions.
4 changes: 2 additions & 2 deletions LIB_ADDER_V1.cs
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ namespace PADscript
{
public class LIB_ADDER_V1
{
private string dir_libs = Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData) + "\\PAD\\plugins";
private string dir_libs = Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData) + "\\PADScript\\plugins";

public LIB_ADDER_V1()
{
Expand Down Expand Up @@ -54,7 +54,7 @@ public void getLibrarySystem()
IEnumerable<string> files = Directory.GetFiles(dir_libs + "\\library\\lib");

foreach (var _file in files)
if (!_file.Trim().Contains("Newtonsoft.Json"))
if (!_file.Trim().Contains("Newtonsoft.Json") && !_file.Trim().ToLower().Contains(".json") && _file.Trim().ToLower().Contains(".dll"))
{
var DLL = Assembly.LoadFile(_file);
var name = DLL.GetName();
Expand Down
4 changes: 2 additions & 2 deletions Library_Adder.cs
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ public class Library_Adder
private readonly List<object> assm = new List<object>();
private readonly string[,] cmd_assm = new string[1000, 1000];

private readonly string dir = Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData) + "\\PAD\\plugins\\Library\\";
private readonly string dir_libs = Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData) + "\\PAD\\plugins";
private readonly string dir = Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData) + "\\PADScript\\plugins\\Library\\";
private readonly string dir_libs = Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData) + "\\PADScript\\plugins";

private Script _p = new Script();

Expand Down
12 changes: 12 additions & 0 deletions PADScriptTestLibraryPlugin/Class1.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
using System;

namespace PADScriptTestLibraryPlugin
{
public class Class1
{
public int add(int a, int b)
{
return a + b;
}
}
}
7 changes: 7 additions & 0 deletions PADScriptTestLibraryPlugin/PADScriptTestLibraryPlugin.csproj
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>netcoreapp3.0</TargetFramework>
</PropertyGroup>

</Project>
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
{
"runtimeTarget": {
"name": ".NETCoreApp,Version=v3.0",
"signature": ""
},
"compilationOptions": {},
"targets": {
".NETCoreApp,Version=v3.0": {
"PADScriptTestLibraryPlugin/1.0.0": {
"runtime": {
"PADScriptTestLibraryPlugin.dll": {}
}
}
}
},
"libraries": {
"PADScriptTestLibraryPlugin/1.0.0": {
"type": "project",
"serviceable": false,
"sha512": ""
}
}
}
Binary file not shown.
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
// Runtime Version:4.0.30319.42000
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
// </auto-generated>
//------------------------------------------------------------------------------

using System;
using System.Reflection;

[assembly: System.Reflection.AssemblyCompanyAttribute("PADScriptTestLibraryPlugin")]
[assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0")]
[assembly: System.Reflection.AssemblyProductAttribute("PADScriptTestLibraryPlugin")]
[assembly: System.Reflection.AssemblyTitleAttribute("PADScriptTestLibraryPlugin")]
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]

// Generated by the MSBuild WriteCodeFragment class.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
7dc348d8cec89470671a770064562b51101a907b
Binary file not shown.
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"version": 1,
"dgSpecHash": "S4ACmCCtthxLAMCauze13wq5kWvldEveNF5ztBNueOw6Ov1HoJFMTCvmExq5GS9JOREW5oFRL62cGPXXD5l90Q==",
"success": true
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
{
"format": 1,
"restore": {
"C:\\Users\\Sovr6\\Desktop\\PADScriptTestLibraryPlugin\\PADScriptTestLibraryPlugin.csproj": {}
},
"projects": {
"C:\\Users\\Sovr6\\Desktop\\PADScriptTestLibraryPlugin\\PADScriptTestLibraryPlugin.csproj": {
"version": "1.0.0",
"restore": {
"projectUniqueName": "C:\\Users\\Sovr6\\Desktop\\PADScriptTestLibraryPlugin\\PADScriptTestLibraryPlugin.csproj",
"projectName": "PADScriptTestLibraryPlugin",
"projectPath": "C:\\Users\\Sovr6\\Desktop\\PADScriptTestLibraryPlugin\\PADScriptTestLibraryPlugin.csproj",
"packagesPath": "C:\\Users\\Sovr6\\.nuget\\packages\\",
"outputPath": "C:\\Users\\Sovr6\\Desktop\\PADScriptTestLibraryPlugin\\obj\\",
"projectStyle": "PackageReference",
"fallbackFolders": [
"C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder"
],
"configFilePaths": [
"C:\\Users\\Sovr6\\AppData\\Roaming\\NuGet\\NuGet.Config",
"C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config"
],
"originalTargetFrameworks": [
"netcoreapp3.0"
],
"sources": {
"C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {},
"https://api.nuget.org/v3/index.json": {}
},
"frameworks": {
"netcoreapp3.0": {
"projectReferences": {}
}
},
"warningProperties": {
"warnAsError": [
"NU1605"
]
}
},
"frameworks": {
"netcoreapp3.0": {
"imports": [
"net461",
"net462",
"net47",
"net471",
"net472",
"net48"
],
"assetTargetFallback": true,
"warn": true,
"frameworkReferences": {
"Microsoft.NETCore.App": {
"privateAssets": "all"
}
},
"runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\3.0.101\\RuntimeIdentifierGraph.json"
}
}
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
<?xml version="1.0" encoding="utf-8" standalone="no"?>
<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' ">
<RestoreSuccess Condition=" '$(RestoreSuccess)' == '' ">True</RestoreSuccess>
<RestoreTool Condition=" '$(RestoreTool)' == '' ">NuGet</RestoreTool>
<ProjectAssetsFile Condition=" '$(ProjectAssetsFile)' == '' ">$(MSBuildThisFileDirectory)project.assets.json</ProjectAssetsFile>
<NuGetPackageRoot Condition=" '$(NuGetPackageRoot)' == '' ">$(UserProfile)\.nuget\packages\</NuGetPackageRoot>
<NuGetPackageFolders Condition=" '$(NuGetPackageFolders)' == '' ">C:\Users\Sovr6\.nuget\packages\;C:\Program Files\dotnet\sdk\NuGetFallbackFolder</NuGetPackageFolders>
<NuGetProjectStyle Condition=" '$(NuGetProjectStyle)' == '' ">PackageReference</NuGetProjectStyle>
<NuGetToolVersion Condition=" '$(NuGetToolVersion)' == '' ">5.3.1</NuGetToolVersion>
</PropertyGroup>
<PropertyGroup>
<MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
</PropertyGroup>
</Project>
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="utf-8" standalone="no"?>
<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
</PropertyGroup>
</Project>
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
// Runtime Version:4.0.30319.42000
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
// </auto-generated>
//------------------------------------------------------------------------------

using System;
using System.Reflection;

[assembly: System.Reflection.AssemblyCompanyAttribute("PADScriptTestLibraryPlugin")]
[assembly: System.Reflection.AssemblyConfigurationAttribute("Release")]
[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0")]
[assembly: System.Reflection.AssemblyProductAttribute("PADScriptTestLibraryPlugin")]
[assembly: System.Reflection.AssemblyTitleAttribute("PADScriptTestLibraryPlugin")]
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]

// Generated by the MSBuild WriteCodeFragment class.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
286c15b751459cb54afc83aaea053b6848c8986b
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
C:\Users\Sovr6\Desktop\PADScriptTestLibraryPlugin\bin\Release\netcoreapp3.0\PADScriptTestLibraryPlugin.deps.json
C:\Users\Sovr6\Desktop\PADScriptTestLibraryPlugin\bin\Release\netcoreapp3.0\PADScriptTestLibraryPlugin.dll
C:\Users\Sovr6\Desktop\PADScriptTestLibraryPlugin\bin\Release\netcoreapp3.0\PADScriptTestLibraryPlugin.pdb
C:\Users\Sovr6\Desktop\PADScriptTestLibraryPlugin\obj\Release\netcoreapp3.0\PADScriptTestLibraryPlugin.csprojAssemblyReference.cache
C:\Users\Sovr6\Desktop\PADScriptTestLibraryPlugin\obj\Release\netcoreapp3.0\PADScriptTestLibraryPlugin.AssemblyInfoInputs.cache
C:\Users\Sovr6\Desktop\PADScriptTestLibraryPlugin\obj\Release\netcoreapp3.0\PADScriptTestLibraryPlugin.AssemblyInfo.cs
C:\Users\Sovr6\Desktop\PADScriptTestLibraryPlugin\obj\Release\netcoreapp3.0\PADScriptTestLibraryPlugin.dll
C:\Users\Sovr6\Desktop\PADScriptTestLibraryPlugin\obj\Release\netcoreapp3.0\PADScriptTestLibraryPlugin.pdb
Binary file not shown.
Binary file not shown.
Binary file not shown.
69 changes: 69 additions & 0 deletions PADScriptTestLibraryPlugin/obj/project.assets.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,69 @@
{
"version": 3,
"targets": {
".NETCoreApp,Version=v3.0": {}
},
"libraries": {},
"projectFileDependencyGroups": {
".NETCoreApp,Version=v3.0": []
},
"packageFolders": {
"C:\\Users\\Sovr6\\.nuget\\packages\\": {},
"C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder": {}
},
"project": {
"version": "1.0.0",
"restore": {
"projectUniqueName": "C:\\Users\\Sovr6\\Desktop\\PADScriptTestLibraryPlugin\\PADScriptTestLibraryPlugin.csproj",
"projectName": "PADScriptTestLibraryPlugin",
"projectPath": "C:\\Users\\Sovr6\\Desktop\\PADScriptTestLibraryPlugin\\PADScriptTestLibraryPlugin.csproj",
"packagesPath": "C:\\Users\\Sovr6\\.nuget\\packages\\",
"outputPath": "C:\\Users\\Sovr6\\Desktop\\PADScriptTestLibraryPlugin\\obj\\",
"projectStyle": "PackageReference",
"fallbackFolders": [
"C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder"
],
"configFilePaths": [
"C:\\Users\\Sovr6\\AppData\\Roaming\\NuGet\\NuGet.Config",
"C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config"
],
"originalTargetFrameworks": [
"netcoreapp3.0"
],
"sources": {
"C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {},
"https://api.nuget.org/v3/index.json": {}
},
"frameworks": {
"netcoreapp3.0": {
"projectReferences": {}
}
},
"warningProperties": {
"warnAsError": [
"NU1605"
]
}
},
"frameworks": {
"netcoreapp3.0": {
"imports": [
"net461",
"net462",
"net47",
"net471",
"net472",
"net48"
],
"assetTargetFallback": true,
"warn": true,
"frameworkReferences": {
"Microsoft.NETCore.App": {
"privateAssets": "all"
}
},
"runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\3.0.101\\RuntimeIdentifierGraph.json"
}
}
}
}
13 changes: 13 additions & 0 deletions PADscript.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,22 @@
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>netcoreapp3.0</TargetFramework>
<StartupObject>PADscript.Program</StartupObject>
<Version>0.1.1</Version>
<GeneratePackageOnBuild>false</GeneratePackageOnBuild>
<Authors>Parker Bidigare</Authors>
<Company>Jarvis home automation inc.Parker Bidigare</Company>
<Copyright>Jarvis Home Automation</Copyright>
<NeutralLanguage>en</NeutralLanguage>
<PackageReleaseNotes>This release added speech for windows users only, need to work on for linux and macOS.</PackageReleaseNotes>
<RepositoryType>github</RepositoryType>
<RepositoryUrl>https://github.com/sovr610/PADscript</RepositoryUrl>
<PackageProjectUrl>http://www.jarvishomeautomation.com</PackageProjectUrl>
<Description>PADScript is a scripting language built upon Lua to allow easy to use and learn syntax. It is also built with .net Core 3.0 and utilizes the functionality of .net Core in the scripting language. You can add C# .net Core 3.0 dll files as a plugin system to add more functions to it. Happy scripting!</Description>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="2.9.3" />
<PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
<PackageReference Include="NLua" Version="1.4.25" />
</ItemGroup>
Expand Down
6 changes: 6 additions & 0 deletions PADscript.csproj.user
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<_LastSelectedProfileId>C:\Users\Sovr6\Desktop\PADscript\Properties\PublishProfiles\FolderProfile.pubxml</_LastSelectedProfileId>
</PropertyGroup>
</Project>
31 changes: 31 additions & 0 deletions PADscript.sln
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 16
VisualStudioVersion = 16.0.29519.87
MinimumVisualStudioVersion = 10.0.40219.1
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PADscript", "PADscript.csproj", "{547CBA34-3030-42D9-B4D8-F850F17A8CE2}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PADScriptTestLibraryPlugin", "..\PADScriptTestLibraryPlugin\PADScriptTestLibraryPlugin.csproj", "{7B4903DE-833A-4E23-B6BC-0911C093F0DB}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Release|Any CPU = Release|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{547CBA34-3030-42D9-B4D8-F850F17A8CE2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{547CBA34-3030-42D9-B4D8-F850F17A8CE2}.Debug|Any CPU.Build.0 = Debug|Any CPU
{547CBA34-3030-42D9-B4D8-F850F17A8CE2}.Release|Any CPU.ActiveCfg = Release|Any CPU
{547CBA34-3030-42D9-B4D8-F850F17A8CE2}.Release|Any CPU.Build.0 = Release|Any CPU
{7B4903DE-833A-4E23-B6BC-0911C093F0DB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{7B4903DE-833A-4E23-B6BC-0911C093F0DB}.Debug|Any CPU.Build.0 = Debug|Any CPU
{7B4903DE-833A-4E23-B6BC-0911C093F0DB}.Release|Any CPU.ActiveCfg = Release|Any CPU
{7B4903DE-833A-4E23-B6BC-0911C093F0DB}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {243FB54E-3304-4813-B5B7-1C0F1F0EA897}
EndGlobalSection
EndGlobal
5 changes: 5 additions & 0 deletions Program.cs
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,14 @@ static void Main(string[] args)
Script script;
Library_Adder adder;
LIB_ADDER_V1 lib;
core c = new core();

Console.WriteLine("PADscript v1.0");
script = new Script();

script = c.loadScript(script);


adder = new Library_Adder();
lib = new LIB_ADDER_V1();
lib.getLibrarySystem();
Expand Down
13 changes: 13 additions & 0 deletions Properties/PublishProfiles/FolderProfile.pubxml
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
https://go.microsoft.com/fwlink/?LinkID=208121.
-->
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<PublishProtocol>FileSystem</PublishProtocol>
<Configuration>Release</Configuration>
<Platform>Any CPU</Platform>
<TargetFramework>netcoreapp3.0</TargetFramework>
<PublishDir>bin\Release\netcoreapp3.0\publish\</PublishDir>
</PropertyGroup>
</Project>
Loading

0 comments on commit 4dd43fd

Please sign in to comment.