Merge pull request #49 from Aperture-Development/development

Updating MBSync branch to the latest version

Author: ApertureDevelopment

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,22 @@
+---
+name: Bug report
+about: Open a bug report when something doesnt work as it should
+title: Bugreport
+labels: bug
+assignees: ''
+
+---
+
+**__Description__**
+[Describe the bug as good as possible]
+
+**__Reproduction__**
+[How can we re-produce the bug, what did you do to cause it?]
+
+**__Error Messages__**
+```
+[Add error messages here if you recieved any, if not leave this part out]
+```
+
+**__Optional: Screenshots__**
+[Attach screenshots of the bug here if possible]

.github/ISSUE_TEMPLATE/feature_request.md

@@ -0,0 +1,17 @@
+---
+name: Feature request
+about: How can we make MSync even better?
+title: Feature Request
+labels: enhancement
+assignees: ''
+
+---
+
+**__Description:__**
+[Describe your feature idea as much as possible]
+
+**__Usage Cases:__**
+[In what cases would your feature be usefull]
+
+**__Optional: Alternatives__**
+[Alternative ideas for your feature you have considered. Explain what you came up with and why you think it's your feature is better]

addon.json

@@ -12,6 +12,7 @@
 		"README.md",
 		"*.sql",
 		".git/*",
-		".git"
+		".git*",
+		".vscode*"
 	]
 }

lua/autorun/msync_autorun.lua

@@ -1,4 +1,4 @@
-if SERVER then 
+if SERVER then
     include("msync/sh_init.lua")
     AddCSLuaFile("msync/sh_init.lua")
 

lua/msync/client_gui/cl_admin_gui.lua

@@ -6,7 +6,7 @@ MSync.AdminPanel = MSync.AdminPanel or {}
     Arguments: parent sheet
     Returns: panel
 ]]
-function MSync.AdminPanel.InitMySQL( sheet ) 
+function MSync.AdminPanel.InitMySQL( sheet )
     local pnl = vgui.Create( "DPanel", sheet )
 
     local mysqlip_text = vgui.Create( "DLabel", pnl )
@@ -97,10 +97,10 @@ function MSync.AdminPanel.InitMySQL( sheet )
     dbstatus:SetText( "DB Connection status: -Not Implemented-" )
 
     local save_button = vgui.Create( "DButton", pnl )
-    save_button:SetText( "Save Settings" )					
+    save_button:SetText( "Save Settings" )
     save_button:SetPos( 25, 290 )
     save_button:SetSize( 130, 30 )
-    save_button.DoClick = function() 
+    save_button.DoClick = function()
         MSync.settings.mysql.host = mysqlip:GetValue()
         MSync.settings.mysql.port = mysqlport:GetValue()
         MSync.settings.mysql.database = mysqldb:GetValue()
@@ -111,10 +111,10 @@ function MSync.AdminPanel.InitMySQL( sheet )
     end
 
     local saveconnect_button = vgui.Create( "DButton", pnl )
-    saveconnect_button:SetText( "Save and Connect" )					
+    saveconnect_button:SetText( "Save and Connect" )
     saveconnect_button:SetPos( 155, 290 )
     saveconnect_button:SetSize( 130, 30 )
-    saveconnect_button.DoClick = function() 
+    saveconnect_button.DoClick = function()
         MSync.settings.mysql.host = mysqlip:GetValue()
         MSync.settings.mysql.port = mysqlport:GetValue()
         MSync.settings.mysql.database = mysqldb:GetValue()
@@ -126,18 +126,18 @@ function MSync.AdminPanel.InitMySQL( sheet )
     end
 
     local connect_button = vgui.Create( "DButton", pnl )
-    connect_button:SetText( "Connect" )					
+    connect_button:SetText( "Connect" )
     connect_button:SetPos( 285, 290 )
     connect_button:SetSize( 130, 30 )
-    connect_button.DoClick = function() 
+    connect_button.DoClick = function()
         MSync.net.connectDB()
     end
 
     local reset_button = vgui.Create( "DButton", pnl )
-    reset_button:SetText( "Reset Settings" )					
+    reset_button:SetText( "Reset Settings" )
     reset_button:SetPos( 415, 290 )
     reset_button:SetSize( 130, 30 )
-    reset_button.DoClick = function() 
+    reset_button.DoClick = function()
         mysqlip:SetText("127.0.0.1")
         mysqlport:SetText("3306")
         mysqldb:SetText("msync")
@@ -180,7 +180,7 @@ end
     Arguments: parent sheet
     Returns: panel
 ]]
-function MSync.AdminPanel.InitModules( sheet ) 
+function MSync.AdminPanel.InitModules( sheet )
     local pnl = vgui.Create( "DPanel", sheet )
 
     local ModuleList = vgui.Create( "DListView", pnl )
@@ -219,16 +219,19 @@ end
     Arguments: parent sheet
     Returns: panel
 ]]
-function MSync.AdminPanel.InitModuleSettings( sheet ) 
+function MSync.AdminPanel.InitModuleSettings( sheet )
     local pnl = vgui.Create( "DColumnSheet", sheet )
 
     local files, _ = file.Find("msync/client_gui/modules/*.lua", "LUA")
 
     for k, v in pairs(files) do
         local info = include("msync/client_gui/modules/"..v)
-        MSync.modules[info.ModuleIdentifier]["init"]()
-        MSync.modules[info.ModuleIdentifier]["net"]()
-        pnl:AddSheet( info.Name, MSync.modules[info.ModuleIdentifier].adminPanel(pnl))
+
+        if MSync.moduleState[info["ModuleIdentifier"]] then
+            MSync.modules[info.ModuleIdentifier]["init"]()
+            MSync.modules[info.ModuleIdentifier]["net"]()
+            pnl:AddSheet( info.Name, MSync.modules[info.ModuleIdentifier].adminPanel(pnl))
+        end
     end
 
     return pnl

lua/msync/client_gui/cl_modules.lua

@@ -22,12 +22,13 @@ end
 function MSync.initModules()
 
     for k,v in pairs(MSync.modules) do
-        if not MSync.moduleState[v["info"]["ModuleIdentifier"]] then return end;
-        v["init"]()
-        v["net"]()
-        v["ulx"]()
-        v["hooks"]()
-        print("["..v["info"]["Name"].."] Module loaded")
+        if MSync.moduleState[v["info"]["ModuleIdentifier"]] then
+            v["init"]()
+            v["net"]()
+            v["ulx"]()
+            v["hooks"]()
+            print("["..v["info"]["Name"].."] Module loaded")
+        end
     end
 
 end

lua/msync/client_gui/cl_net.lua

@@ -58,10 +58,10 @@ net.Receive( "msync.sendTable", function( len, pl )
     local table = net.ReadTable()
 
     if type == "settings" then MSync.settings = table; print("Got Settings!")
-    elseif type == "modules" then MSync.serverModules = table 
-    elseif type == "modulestate" then 
+    elseif type == "modules" then MSync.serverModules = table
+    elseif type == "modulestate" then
         MSync.moduleState = table
-        MSync.loadModules() 
+        MSync.loadModules()
     end
 end )
 

lua/msync/client_gui/modules/cl_mrsync.lua

@@ -6,7 +6,7 @@ MSync.modules.MRSync = MSync.modules.MRSync or {}
  * @package    MySQL Rank Sync
  * @author     Aperture Development
  * @license    root_dir/LICENCE
- * @version    2.0.0
+ * @version    2.1.3
 ]]
 
 --[[
@@ -16,13 +16,13 @@ MSync.modules.MRSync.info = {
     Name = "MySQL Rank Sync",
     ModuleIdentifier = "MRSync",
     Description = "Synchronise your ranks across your servers",
-    Version = "2.0.0"
+    Version = "2.1.3"
 }
 
 --[[
     Define additional functions that are later used
 ]]
-function MSync.modules.MRSync.init() 
+function MSync.modules.MRSync.init()
 
 end
 
@@ -67,21 +67,19 @@ function MSync.modules.MRSync.adminPanel(sheet)
     end
 
     local allserver_button = vgui.Create( "DButton", pnl )
-    allserver_button:SetText( "Add" )					
+    allserver_button:SetText( "Add" )
     allserver_button:SetPos( 275, 15 )
     allserver_button:SetSize( 130, 20 )
-    allserver_button.DoClick = function() 
-        if allserver_textentry:GetValue() and not MSync.modules.MRSync.settings.nosync[allserver_textentry:GetValue()] and not MSync.modules.MRSync.settings.syncall[allserver_textentry:GetValue()] then
+    allserver_button.DoClick = function()
+        if string.len(allserver_textentry:GetValue()) > 0 and not MSync.modules.MRSync.settings.nosync[allserver_textentry:GetValue()] and not MSync.modules.MRSync.settings.syncall[allserver_textentry:GetValue()] then
+            if string.match(allserver_textentry:GetValue(), "^%s*$") or string.match(allserver_textentry:GetValue(), "^%s") or string.match(allserver_textentry:GetValue(), "%s$") then return end
             allserver_table:AddLine(allserver_textentry:GetValue())
             MSync.modules.MRSync.settings.syncall[allserver_textentry:GetValue()] = true
             allserver_textentry:SetText("")
             MSync.modules.MRSync.sendSettings()
         end
     end
 
-
-
-
     local nosync_text = vgui.Create( "DLabel", pnl )
     nosync_text:SetPos( 25, 140 )
     nosync_text:SetColor( Color( 0, 0, 0 ) )
@@ -116,42 +114,43 @@ function MSync.modules.MRSync.adminPanel(sheet)
     end
 
     local nosync_button = vgui.Create( "DButton", pnl )
-    nosync_button:SetText( "Add" )					
+    nosync_button:SetText( "Add" )
     nosync_button:SetPos( 275, 155 )
     nosync_button:SetSize( 130, 20 )
-    nosync_button.DoClick = function() 
-        if nosync_textentry:GetValue() and not MSync.modules.MRSync.settings.nosync[allserver_textentry:GetValue()] and not MSync.modules.MRSync.settings.syncall[allserver_textentry:GetValue()] then
+    nosync_button.DoClick = function()
+        if string.len(nosync_textentry:GetValue()) > 0 and not MSync.modules.MRSync.settings.nosync[nosync_textentry:GetValue()] and not MSync.modules.MRSync.settings.syncall[nosync_textentry:GetValue()] then
+            if string.match(nosync_textentry:GetValue(), "^%s*$") or string.match(nosync_textentry:GetValue(), "^%s") or string.match(nosync_textentry:GetValue(), "%s$") then return end
             nosync_table:AddLine(nosync_textentry:GetValue())
-            MSync.modules.MRSync.settings.nosync[allserver_textentry:GetValue()] = true
+            MSync.modules.MRSync.settings.nosync[nosync_textentry:GetValue()] = true
             nosync_textentry:SetText("")
             MSync.modules.MRSync.sendSettings()
         end
     end
 
-    if MSync.DBStatus then
-        MSync.modules.MRSync.getSettings()
-    end
+    -- Load settings from the server
+    MSync.modules.MRSync.getSettings()
 
+    -- Wait for settings from the server
     if not MSync.modules.MRSync.settings then
         timer.Create("mrsync.t.checkSettings", 1, 0, function()
             if not MSync.modules.MRSync.settings then return end
 
-            for k,_ in pairs(MSync.modules.MRSync.settings.syncall) do 
+            for k,_ in pairs(MSync.modules.MRSync.settings.syncall) do
                 allserver_table:AddLine(k)
             end
-    
-            for k,_ in pairs(MSync.modules.MRSync.settings.nosync) do 
+
+            for k,_ in pairs(MSync.modules.MRSync.settings.nosync) do
                 nosync_table:AddLine(k)
             end
 
             timer.Remove("mrsync.t.checkSettings")
         end)
     else
-        for k,_ in pairs(MSync.modules.MRSync.settings.syncall) do 
+        for k,_ in pairs(MSync.modules.MRSync.settings.syncall) do
             allserver_table:AddLine(k)
         end
 
-        for k,_ in pairs(MSync.modules.MRSync.settings.nosync) do 
+        for k,_ in pairs(MSync.modules.MRSync.settings.nosync) do
             nosync_table:AddLine(k)
         end
     end
@@ -171,14 +170,14 @@ end
 --[[
     Define net receivers and util.AddNetworkString
 ]]
-function MSync.modules.MRSync.net() 
+function MSync.modules.MRSync.net()
 
     --[[
         Description: Function to send the mrsync settings to the client
         Arguments:
             player [player] - the player that wants to open the admin GUI
         Returns: nothing
-    ]]   
+    ]]
     function MSync.modules.MRSync.sendSettings()
         net.Start("msync.mrsync.sendSettings")
             net.WriteTable(MSync.modules.MRSync.settings)
@@ -190,7 +189,7 @@ function MSync.modules.MRSync.net()
         Arguments:
             player [player] - the player that wants to open the admin GUI
         Returns: nothing
-    ]]   
+    ]]
     function MSync.modules.MRSync.getSettings()
         net.Start("msync.mrsync.getSettings")
         net.SendToServer()
@@ -199,7 +198,7 @@ function MSync.modules.MRSync.net()
     --[[
         Description: Net Receiver - Gets called when the client requests the settings table
         Returns: nothing
-    ]]   
+    ]]
     net.Receive("msync.mrsync.sendSettingsPly", function(len, ply)
         MSync.modules.MRSync.settings = net.ReadTable()
     end )
@@ -208,14 +207,14 @@ end
 --[[
     Define ulx Commands and overwrite common ulx functions (module does not get loaded until ulx has fully been loaded)
 ]]
-function MSync.modules.MRSync.ulx() 
-    
+function MSync.modules.MRSync.ulx()
+
 end
 
 --[[
     Define hooks your module is listening on e.g. PlayerDisconnect
 ]]
-function MSync.modules.MRSync.hooks() 
+function MSync.modules.MRSync.hooks()
 
 end
 

lua/msync/client_gui/modules/cl_samplemodule.lua

@@ -22,7 +22,7 @@ MSync.modules.SampleModule.info = {
 --[[
     Define additional functions that are later used
 ]]
-function MSync.modules.SampleModule.init() 
+function MSync.modules.SampleModule.init()
 
     function MSync.modules.SampleModule.SampleFunction()
         return true
@@ -51,7 +51,7 @@ end
 --[[
     Define net receivers and util.AddNetworkString
 ]]
-function MSync.modules.SampleModule.net() 
+function MSync.modules.SampleModule.net()
     net.Receive( "my_message", function( len, pl )
         if ( IsValid( pl ) and pl:IsPlayer() ) then
             print( "Message from " .. pl:Nick() .. " received. Its length is " .. len .. "." )
@@ -64,16 +64,16 @@ end
 --[[
     Define ulx Commands and overwrite common ulx functions (module does not get loaded until ulx has fully been loaded)
 ]]
-function MSync.modules.SampleModule.ulx() 
-    
+function MSync.modules.SampleModule.ulx()
+
 end
 
 --[[
     Define hooks your module is listening on e.g. PlayerDisconnect
 ]]
-function MSync.modules.SampleModule.hooks() 
+function MSync.modules.SampleModule.hooks()
     hook.Add("initialize", "msync_sampleModule_init", function()
-        
+
     end)
 end