From 38bc5673c42e2c6b64e4e9396558c001ac0cb34b Mon Sep 17 00:00:00 2001
From: "Collin M. Barrett" <collinbarrett@users.noreply.github.com>
Date: Sun, 11 Feb 2018 17:15:56 -0600
Subject: [PATCH] cleanup scripts dir

---
 FilterLists.sln                                 | 10 +++++++++-
 scripts/deploy.sh                               | 15 ++++++++++++++-
 scripts/{createMySqlDb.sql => sql/createDb.sql} |  0
 scripts/sql/snapshotTimeAnalysis.sql            |  9 +++++++++
 4 files changed, 32 insertions(+), 2 deletions(-)
 rename scripts/{createMySqlDb.sql => sql/createDb.sql} (100%)
 create mode 100644 scripts/sql/snapshotTimeAnalysis.sql

diff --git a/FilterLists.sln b/FilterLists.sln
index 5246da530..ac303ca1c 100644
--- a/FilterLists.sln
+++ b/FilterLists.sln
@@ -28,13 +28,18 @@ EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "scripts", "scripts", "{FCA7F77A-9EC6-4C6D-A80E-7DD27FF95673}"
 	ProjectSection(SolutionItems) = preProject
 		scripts\build.sh = scripts\build.sh
-		scripts\createMySqlDb.sql = scripts\createMySqlDb.sql
 		scripts\cron = scripts\cron
 		scripts\deploy.sh = scripts\deploy.sh
 	EndProjectSection
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FilterLists.Agent", "src\FilterLists.Agent\FilterLists.Agent.csproj", "{4F39D132-498D-4A93-9F6C-1C604718300D}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "sql", "sql", "{A4BB2C81-5232-4162-B410-704D123D2C01}"
+	ProjectSection(SolutionItems) = preProject
+		scripts\sql\createDb.sql = scripts\sql\createDb.sql
+		scripts\sql\snapshotTimeAnalysis.sql = scripts\sql\snapshotTimeAnalysis.sql
+	EndProjectSection
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -65,6 +70,9 @@ Global
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
+	GlobalSection(NestedProjects) = preSolution
+		{A4BB2C81-5232-4162-B410-704D123D2C01} = {FCA7F77A-9EC6-4C6D-A80E-7DD27FF95673}
+	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {8A31B449-52DD-4445-A9C4-033A24E25308}
 	EndGlobalSection
diff --git a/scripts/deploy.sh b/scripts/deploy.sh
index e097eac71..21ef60ddc 100755
--- a/scripts/deploy.sh
+++ b/scripts/deploy.sh
@@ -1,12 +1,25 @@
 #!/usr/bin/env bash
-#purge target directory: rm -rf !(appsettings.json)
+
+#TODO: purge target directory
+#https://github.com/collinbarrett/FilterLists/issues/135
+#rm -rf !(appsettings.json)
+
+#deploy seed data
 sshpass -p $FTP_PASSWORD scp -o StrictHostKeyChecking=no -r /home/travis/build/collinbarrett/FilterLists/data/ $FTP_USER@$FTP_HOST:$FTP_DIR
+
+#deploy Agent
 chmod 777 /home/travis/build/collinbarrett/FilterLists/src/FilterLists.Agent/bin/Release/netcoreapp2.0/ubuntu.16.04-x64/publish/FilterLists.Agent
 sshpass -p $FTP_PASSWORD scp -o StrictHostKeyChecking=no -r /home/travis/build/collinbarrett/FilterLists/src/FilterLists.Agent/bin/Release/netcoreapp2.0/ubuntu.16.04-x64/publish/* $FTP_USER@$FTP_HOST:$FTP_DIR
+
+#deploy API
 chmod a+x /home/travis/build/collinbarrett/FilterLists/src/FilterLists.Api/bin/Release/netcoreapp2.0/ubuntu.16.04-x64/publish/FilterLists.Api.dll
 sshpass -p $FTP_PASSWORD scp -o StrictHostKeyChecking=no -r /home/travis/build/collinbarrett/FilterLists/src/FilterLists.Api/bin/Release/netcoreapp2.0/ubuntu.16.04-x64/publish/* $FTP_USER@$FTP_HOST:$FTP_DIR
 sshpass -p $FTP_PASSWORD ssh -o StrictHostKeyChecking=no $FTP_USER@$FTP_HOST 'sudo systemctl restart filterlists.api.service'
+
+#deploy Web
 chmod a+x /home/travis/build/collinbarrett/FilterLists/src/FilterLists.Web/bin/Release/netcoreapp2.0/ubuntu.16.04-x64/publish/FilterLists.Web.dll
 sshpass -p $FTP_PASSWORD scp -o StrictHostKeyChecking=no -r /home/travis/build/collinbarrett/FilterLists/src/FilterLists.Web/bin/Release/netcoreapp2.0/ubuntu.16.04-x64/publish/* $FTP_USER@$FTP_HOST:$FTP_DIR
 sshpass -p $FTP_PASSWORD ssh -o StrictHostKeyChecking=no $FTP_USER@$FTP_HOST 'sudo systemctl restart filterlists.web.service'
+
+#purge CDN
 curl -X DELETE "https://api.cloudflare.com/client/v4/zones/$CF_FILTERLISTS_ZONE/purge_cache" -H "X-Auth-Email: $CF_EMAIL" -H "X-Auth-Key: $CF_GLOBAL_API_KEY" -H "Content-Type: application/json" --data '{"purge_everything":true}'
\ No newline at end of file
diff --git a/scripts/createMySqlDb.sql b/scripts/sql/createDb.sql
similarity index 100%
rename from scripts/createMySqlDb.sql
rename to scripts/sql/createDb.sql
diff --git a/scripts/sql/snapshotTimeAnalysis.sql b/scripts/sql/snapshotTimeAnalysis.sql
new file mode 100644
index 000000000..0514b87be
--- /dev/null
+++ b/scripts/sql/snapshotTimeAnalysis.sql
@@ -0,0 +1,9 @@
+SELECT
+FilterListId,
+ ModifiedDateUtc - CreatedDateUtc,
+ CreatedDateUtc,
+ ModifiedDateUtc,
+ IsCompleted
+FROM snapshots
+WHERE ModifiedDateUtc - CreatedDateUtc > 30 OR IsCompleted = 0
+ORDER BY ModifiedDateUtc - CreatedDateUtc DESC
\ No newline at end of file