From c23cfd121ed121f5b411e97f87c94d16e6916e7c Mon Sep 17 00:00:00 2001
From: Jay Lee <jay0lee@gmail.com>
Date: Sun, 8 Mar 2020 22:08:22 -0400
Subject: [PATCH] move util vars to var.py

---
 src/utils.py | 21 ---------------------
 src/var.py   | 17 +++++++++++++++++
 2 files changed, 17 insertions(+), 21 deletions(-)

diff --git a/src/utils.py b/src/utils.py
index 2d5cb071..fdde8562 100644
--- a/src/utils.py
+++ b/src/utils.py
@@ -8,10 +8,6 @@ from html.parser import HTMLParser
 from var import *
 import fileutils
 
-ONE_KILO_BYTES = 1000
-ONE_MEGA_BYTES = 1000000
-ONE_GIGA_BYTES = 1000000000
-
 
 class _DeHTMLParser(HTMLParser):
 
@@ -55,7 +51,6 @@ class _DeHTMLParser(HTMLParser):
   def text(self):
     return re.sub(r'\n{2}\n+', '\n\n', re.sub(r'\n +', '\n', ''.join(self.__text))).strip()
 
-
 def dehtml(text):
   try:
     parser = _DeHTMLParser()
@@ -98,7 +93,6 @@ def formatTimestampYMDHMS(timestamp):
 def formatTimestampYMDHMSF(timestamp):
   return str(datetime.datetime.fromtimestamp(int(timestamp)/1000))
 
-
 def formatFileSize(fileSize):
   if fileSize == 0:
     return '0kb'
@@ -110,7 +104,6 @@ def formatFileSize(fileSize):
     return f'{fileSize // ONE_MEGA_BYTES}mb'
   return f'{fileSize // ONE_GIGA_BYTES}gb'
 
-
 def formatMilliSeconds(millis):
   seconds, millis = divmod(millis, 1000)
   minutes, seconds = divmod(seconds, 60)
@@ -152,27 +145,18 @@ def get_delta(argstr, pattern):
     return -deltaTime
   return deltaTime
 
-DELTA_DATE_PATTERN = re.compile(r'^([+-])(\d+)([dwy])$')
-DELTA_DATE_FORMAT_REQUIRED = '(+|-)<Number>(d|w|y)'
-
 def get_delta_date(argstr):
   deltaDate = get_delta(argstr, DELTA_DATE_PATTERN)
   if deltaDate is None:
     controlflow.system_error_exit(2, f'expected a <{DELTA_DATE_FORMAT_REQUIRED}>; got {argstr}')
   return deltaDate
 
-DELTA_TIME_PATTERN = re.compile(r'^([+-])(\d+)([mhdwy])$')
-DELTA_TIME_FORMAT_REQUIRED = '(+|-)<Number>(m|h|d|w|y)'
-
 def get_delta_time(argstr):
   deltaTime = get_delta(argstr, DELTA_TIME_PATTERN)
   if deltaTime is None:
     controlflow.system_error_exit(2, f'expected a <{DELTA_TIME_FORMAT_REQUIRED}>; got {argstr}')
   return deltaTime
 
-YYYYMMDD_FORMAT = '%Y-%m-%d'
-YYYYMMDD_FORMAT_REQUIRED = 'yyyy-mm-dd'
-
 def get_yyyymmdd(argstr, minLen=1, returnTimeStamp=False, returnDateTime=False):
   argstr = argstr.strip()
   if argstr:
@@ -192,8 +176,6 @@ def get_yyyymmdd(argstr, minLen=1, returnTimeStamp=False, returnDateTime=False):
     return ''
   controlflow.system_error_exit(2, f'expected a <{YYYYMMDD_FORMAT_REQUIRED}>')
 
-YYYYMMDDTHHMMSS_FORMAT_REQUIRED = 'yyyy-mm-ddThh:mm:ss[.fff](Z|(+|-(hh:mm)))'
-
 def get_time_or_delta_from_now(time_string):
   """Get an ISO 8601 time or a positive/negative delta applied to now.
   Args:
@@ -253,8 +235,6 @@ def get_row_filter_date_or_delta_from_now(time_string):
       pass
   return (False, YYYYMMDDTHHMMSS_FORMAT_REQUIRED)
 
-YYYYMMDD_PATTERN = re.compile(r'^[0-9]{4}-[0-9]{2}-[0-9]{2}$')
-
 def get_date_zero_time_or_full_time(time_string):
   time_string = time_string.strip()
   if time_string:
@@ -272,4 +252,3 @@ def md5_matches_file(local_file, expected_md5, exitOnError):
   if exitOnError and actual_hash != expected_md5:
     controlflow.system_error_exit(6, f'actual hash was {actual_hash}. Exiting on corrupt file.')
   return actual_hash == expected_md5
-
diff --git a/src/var.py b/src/var.py
index fd1604c1..162cb983 100644
--- a/src/var.py
+++ b/src/var.py
@@ -1180,3 +1180,20 @@ MAX_RESULTS_API_EXCEPTIONS = {
   'directory.chromeosdevices.list': 200,
   'drive.files.list': 1000,
   }
+
+ONE_KILO_BYTES = 1000
+ONE_MEGA_BYTES = 1000000
+ONE_GIGA_BYTES = 1000000000
+
+DELTA_DATE_PATTERN = re.compile(r'^([+-])(\d+)([dwy])$')
+DELTA_DATE_FORMAT_REQUIRED = '(+|-)<Number>(d|w|y)'
+
+DELTA_TIME_PATTERN = re.compile(r'^([+-])(\d+)([mhdwy])$')
+DELTA_TIME_FORMAT_REQUIRED = '(+|-)<Number>(m|h|d|w|y)'
+
+YYYYMMDD_FORMAT = '%Y-%m-%d'
+YYYYMMDD_FORMAT_REQUIRED = 'yyyy-mm-dd'
+
+YYYYMMDDTHHMMSS_FORMAT_REQUIRED = 'yyyy-mm-ddThh:mm:ss[.fff](Z|(+|-(hh:mm)))'
+
+YYYYMMDD_PATTERN = re.compile(r'^[0-9]{4}-[0-9]{2}-[0-9]{2}$')