diff --git a/git-hooks-pre-commit b/git-hooks-pre-commit new file mode 100644 index 0000000..1201096 --- /dev/null +++ b/git-hooks-pre-commit @@ -0,0 +1,9 @@ +#!/bin/sh +filename="materials/3dstreamradio/_data/version.vmt" +version=$(head -n 1 $filename) +nextversion=$(($version + 1)) +timestap=$(date -u +%s) + +echo $nextversion > $filename +echo $timestap >> $filename +git add $filename diff --git a/gma_to_zip.bat b/gma_to_zip.bat new file mode 100644 index 0000000..ea9e0d8 --- /dev/null +++ b/gma_to_zip.bat @@ -0,0 +1,105 @@ +@echo off +set extractor=gmad.exe +set compressor=7z.exe + +set addonfile= +set zipfile= +set execfile= + +for %%a in (%0) do set execfile=%%~nxa +for %%a in (%1) do set addonfile=%%~dpnxa +for %%a in (%2) do set zipfile=%%~dpnxa + +set addonfile="%addonfile%" +set zipfile="%zipfile%" + +IF %addonfile%=="" ( + echo You need to specify an addon file. + echo Useage: "%execfile% []" + echo. + + pause + @echo on + @exit /B 1 +) + +IF not exist %addonfile% ( + echo The file %addonfile% does not exist. + echo Useage: "%execfile% []" + echo. + + pause + @echo on + @exit /B 2 +) + +for %%a in (%addonfile%) do set rawaddonfile=%%~dpna +for %%a in (%addonfile%) do set rawaddonfilename=%%~na + +IF %zipfile%=="" ( + set zipfile="%rawaddonfile%.zip" +) + +set tmpfolder=%tmp%/gmatozip +set addontmp="%tmpfolder%/%rawaddonfilename%" + +IF exist "%tmpfolder%" ( + rmdir /s /q "%tmpfolder%" > nul +) + +IF exist %zipfile% ( + del /f /q %zipfile% > nul +) + +echo Extracting Addon... +echo. + +echo %extractor% extract -file %addonfile% -out %addontmp% +%extractor% extract -file %addonfile% -out %addontmp% +if errorlevel 1 ( + echo. + echo. + echo The file %addonfile% could not be extracted. + echo Useage: "%execfile% []" + echo. + + rmdir /s /q "%tmpfolder%" > nul + pause + @echo on + @exit /B 3 +) + +echo. +echo. +echo. +echo. + + +echo Zipping addon... +echo. + +echo %compressor% a -tzip -mm=BZip2 -mtc=off -mx=9 -mpass=5 -md=900000b -y %zipfile% %addontmp% +%compressor% a -tzip -mm=BZip2 -mtc=off -mx=9 -mpass=5 -md=900000b -y %zipfile% %addontmp% +if errorlevel 1 ( + echo. + echo. + echo The file %zipfile% could not be created. + echo Useage: "%execfile% []" + echo. + + rmdir /s /q "%tmpfolder%" > nul + pause + @echo on + @exit /B 4 +) + +rmdir /s /q "%tmpfolder%" > nul + +echo. +echo. +echo. +echo. + +@echo on +@exit /B 0 + diff --git a/lua/autorun/streamradio_loader.lua b/lua/autorun/streamradio_loader.lua index 58b26ff..e4bf499 100644 --- a/lua/autorun/streamradio_loader.lua +++ b/lua/autorun/streamradio_loader.lua @@ -19,12 +19,19 @@ local http = http local net = net local hook = hook - -local Version = 373 local Gmodversion = VERSION -local BassVersion = "(n/a)" -local BassModuleVersion = 0 -local Addon = ( "3D Stream Radio (rev. " .. Version .. ")" ) + +local versiondata = file.Read("materials/3dstreamradio/_data/version.vmt", "GAME") or "" +versiondata = string.Explode("[\r\n|\r|\n]", versiondata, true) or {} + +local Version = string.Trim(tostring(versiondata[1] or "")) +local VersionTime = tonumber(string.Trim(versiondata[2] or "")) or -1 + +if Version == "" then + Version = "UNKNOWN" +end + +local Addon = ( "3D Stream Radio (ver. " .. Version .. ")" ) local Addonname = ( Addon .. ":\n" ) local thisfile = "autorun/streamradio_loader.lua" @@ -39,6 +46,10 @@ function StreamRadioLib.GetVersion() return Version end +function StreamRadioLib.GetVersionTime() + return VersionTime +end + local loader_ok = true local g_loaded_dll = {} diff --git a/materials/3dstreamradio/_data/version.vmt b/materials/3dstreamradio/_data/version.vmt new file mode 100644 index 0000000..4e4999d --- /dev/null +++ b/materials/3dstreamradio/_data/version.vmt @@ -0,0 +1,2 @@ +0 +1517968467 diff --git a/updatetoworkshop.bat b/updatetoworkshop.bat new file mode 100644 index 0000000..a733cda --- /dev/null +++ b/updatetoworkshop.bat @@ -0,0 +1,68 @@ +@echo off +set compressor=gmad.exe +set uploader=gmpublish.exe +set zipper=gma_to_zip.bat +set addonid=246756300 + +rem Compress +:Compress + cls + echo Addon updating setup. + echo. + + set addonpath=%CD% + for %%a in ("%CD%") do set addonpath=%%~dpnxa + for %%a in ("%CD%") do set addonname=%%~nxa + set gmapath=%addonpath%/noupload/%addonname%.gma + + echo %compressor% create -folder "%addonpath%" -out "%gmapath%" + %compressor% create -folder "%addonpath%" -out "%gmapath%" + if errorlevel 1 ( + echo Coudln't compress the addon! + pause + goto Compress + ) + + IF exist %zipper% ( + echo "%CD%/%zipper%" "%gmapath%" + call "%CD%/%zipper%" "%gmapath%" + @echo off + ) + + IF "%addonid%"=="" ( + goto End + ) + + pause + :Upload_Question + cls + set /P upload=Upload to Workshop? (Y/N): + + if /I %upload%==Y ( + goto Upload + ) + + if /I %upload%==N ( + goto End + ) + goto Upload_Question + + +rem Upload +:Upload + cls + set /P changes= < "%addonpath%\changes.txt" + echo %uploader% update -addon "%gmapath%" -id %addonid% -changes "%changes%" + %uploader% update -addon "%gmapath%" -id %addonid% -changes "%changes%" + + if errorlevel 1 ( + echo Error Uploading "%gmapath%"! + pause + goto Upload + ) +pause + +:End +@echo on +@exit /B 0 +