optimise gravity list inserts

Signed-off-by: Adam Warner <me@adamwarner.co.uk>

gravity.sh

@@ -139,23 +139,29 @@ database_table_from_file() {
   local rowid
   declare -i rowid
   rowid=1
-  grep -v '^ *#' < "${source}" | while IFS= read -r domain
+
-  do
+  if [[ "${table}" == "gravity" ]]; then
-    # Only add non-empty lines
+    #Append ,${arg} to every line and then remove blank lines before import
-    if [[ -n "${domain}" ]]; then
+    sed -e "s/$/,${arg}/" "${source}" > "${tmpFile}"
-      if [[ "${table}" == "domain_audit" ]]; then
+    sed -i '/^$/d' "${tmpFile}"
-        # domain_audit table format (no enable or modified fields)
+  else
-        echo "${rowid},\"${domain}\",${timestamp}" >> "${tmpFile}"
+    grep -v '^ *#' < "${source}" | while IFS= read -r domain
-      elif [[ "${table}" == "gravity" ]]; then
+    do
-        # gravity table format
+      # Only add non-empty lines
-        echo "\"${domain}\",${arg}" >> "${tmpFile}"
+      if [[ -n "${domain}" ]]; then
-      else
+        if [[ "${table}" == "domain_audit" ]]; then
-        # White-, black-, and regexlist format
+          # domain_audit table format (no enable or modified fields)
-        echo "${rowid},\"${domain}\",1,${timestamp},${timestamp},\"Migrated from ${source}\"" >> "${tmpFile}"
+          echo "${rowid},\"${domain}\",${timestamp}" >> "${tmpFile}"
+        else
+          # White-, black-, and regexlist format
+          echo "${rowid},\"${domain}\",1,${timestamp},${timestamp},\"Migrated from ${source}\"" >> "${tmpFile}"
+        fi
+        rowid+=1
       fi
-      rowid+=1
+    done
-    fi
+  fi
-  done
+
+
   inputfile="${tmpFile}"
 
   # Store domains in database table specified by ${table}