cleanup

Author: maxsivkov

Dockerfile

@@ -31,12 +31,13 @@ LABEL version="0.0.1"
 STOPSIGNAL SIGINT
 
 RUN apk update && \
-    apk --no-cache --update add libstdc++ && \
+    apk --no-cache --update add libstdc++ jq netcat-openbsd curl wget && \
     rm -rf /var/cache/apk/*
 
 
 WORKDIR /app
 COPY --from=build-env /app /app
-ENV PATH="/app/venv/bin:$PATH"
+RUN chmod a+x wait-for-http && chmod a+x entrypoint
+ENV PATH="/app/venv/bin:/app:$PATH"
 
-ENTRYPOINT ["/app/venv/bin/python", "main.py"]
+ENTRYPOINT ["python", "main.py"]

bundle/.gitignore

@@ -0,0 +1,2 @@
+.env
+data-folder/

bundle/docker-compose.yml

@@ -0,0 +1,20 @@
+version: '3.4'
+
+services:
+  taxerapi:
+    image: maxsivkov/taxerapi
+    environment:
+      - "TAXER_COOKIES=${TAXER_COOKIES}"
+      - "PORT=80"
+      - "HOST=0.0.0.0"
+    ports:
+      - "7080:80"
+  statements:
+    image: maxsivkov/bank-statements
+    depends_on:
+      - taxerapi
+    environment:
+      - "BSTMT_TAXER_API_URL=http://taxerapi"
+    volumes:
+      - ./data-folder:/app/data
+    entrypoint: ["entrypoint"]

datadir.py

@@ -72,15 +72,15 @@ def __init__(self, config:confuse.Configuration):
 
         self.update_conf()
 
+        self.verbose = config['verbose'].as_number()
         taxer_config: TaxerConfig = TaxerConfig()
         taxer_config.host = self.url
-        taxer_config.debug = True
+        taxer_config.debug = True if self.verbose else False
         cli: TaxerClient = TaxerClient(configuration=taxer_config)
         self.acc_api = TaxerAccountApi(api_client=cli)
         self.accs_api = TaxerAccountsApi(api_client=cli)
         self.operation_api = TaxerOperationApi(api_client=cli)
 
-        self.verbose = config['verbose'].as_number()
         self.logger.info(f'config_dir {config.config_dir()}')
         self.logger.info(f'user_config_path {config.user_config_path()}')
         self.logger.info(f'accounts_folder \'{self.accounts_folder}\'')

doc/how-to-run-docker-lazy.md

@@ -0,0 +1,10 @@
+## Запуск с использованием Docker
+
+- Запустить АПИ сервер [Taxer API](https://github.com/maxsivkov/py-taxer-api)
+- Открыть коммандную строку `cmd`
+- Запуск
+  ```
+  docker run -it --rm maxsivkov/bank-statements test
+  ```
+  В результате в выводе должно появиться чтото типа `Action test`
+  

doc/how-to-run-docker.md

@@ -0,0 +1,10 @@
+## Запуск с использованием Docker
+
+- Запустить АПИ сервер [Taxer API](https://github.com/maxsivkov/py-taxer-api)
+- Открыть коммандную строку `cmd`
+- Запуск
+  ```
+  docker run -it --rm maxsivkov/bank-statements test
+  ```
+  В результате в выводе должно появиться чтото типа `Action test`
+  

entrypoint

@@ -0,0 +1,3 @@
+#!/bin/sh 
+echo Checking $BSTMT_TAXER_API_URL then running $@
+wait-for-http $BSTMT_TAXER_API_URL/docs -- python main.py $@

main.py

@@ -8,6 +8,7 @@
 from datadir import DataDir
 from stmt_driver_xlsx import XlsxDriver
 from utils import list_files, get_config_str, get_config_int
+from taxerapi import Profile
 
 
 def setup_logger(filename:str):
@@ -101,18 +102,16 @@ def setup_logger(filename:str):
                 processed_files = processed_files + 1
         print(f'DONE. Processed {processed_files} statements')
 
-def get_request():
-    import requests
-    r = requests.get('http://atlaz.win/~maxx/1.json')
-    d:Dict = r.json()
-    print(d)
-
-    print('status')
-
-    print(d["status"])
-
 if config['action'].as_str() == 'test':
-    print(f'Action {config["action"].as_str()}')
-    #get_request()
+    logger.info(f'\nAction {config["action"].as_str()}\n')
+    logger.info(f'Requesting Profile from TaxerApi')
+    profile: Profile = d.acc_api.get_account_api()
+    logger.info(f'Account id: {profile.account_id}')
+    logger.info(f'Account name: {profile.account_name}')
+    logger.info(f'Account users list')
+    for user in profile.users:
+        logger.info(f'  user_id: {user.id}')
+        logger.info(f'  user_tax: {user.id_key}')
+        logger.info(f'  user_title: {user.title_name}')
 
 #https://www.ibancalculator.com/iban_validieren.html

wait-for-http

@@ -0,0 +1,105 @@
+#!/bin/sh
+
+TIMEOUT=150
+QUIET=0
+WAITFOR_RETRY_DELAY=0.1
+
+echoerr() {
+  if [ "$QUIET" -ne 1 ]; then printf "%s\n" "$*" 1>&2; fi
+}
+
+usage() {
+  exitcode="$1"
+  cat << USAGE >&2
+Usage:
+  $cmdname host:port|url [-t timeout] [-- command args]
+  -q | --quiet                        Do not output any status messages
+  -t TIMEOUT | --timeout=timeout      Timeout in seconds, zero for no timeout
+  -- COMMAND ARGS                     Execute command with args after the test finishes
+USAGE
+  exit "$exitcode"
+}
+
+wait_for() {
+  for i in `seq $TIMEOUT` ; do
+    nc -z "$HOST" "$PORT" > /dev/null 2>&1
+
+    result=$?
+    if [ $result -eq 0 ] ; then
+      if [ $# -gt 0 ] ; then
+        exec "$@"
+      fi
+      exit 0
+    fi
+    sleep $WAITFOR_RETRY_DELAY
+  done
+  echo "Operation timed out" >&2
+  exit 1
+}
+
+wait_for_http() {
+  for i in `seq $TIMEOUT` ; do
+    wget --timeout=1 -q "$WAITFOR_URL" -O /dev/null > /dev/null 2>&1
+
+    result=$?
+    if [ $result -eq 0 ] ; then
+      if [ $# -gt 0 ] ; then
+        exec "$@"
+      fi
+      exit 0
+    fi
+    sleep $WAITFOR_RETRY_DELAY
+  done
+  echo "Operation timed out" >&2
+  exit 1
+}
+
+while [ $# -gt 0 ]
+do
+  case "$1" in
+    http*)
+    WAITFOR_URL=$1
+    shift 1
+    ;;
+    *:* )
+    HOST=$(printf "%s\n" "$1"| cut -d : -f 1)
+    PORT=$(printf "%s\n" "$1"| cut -d : -f 2)
+    shift 1
+    ;;
+    -q | --quiet)
+    QUIET=1
+    shift 1
+    ;;
+    -t)
+    TIMEOUT="$2"
+    if [ "$TIMEOUT" = "" ]; then break; fi
+    shift 2
+    ;;
+    --timeout=*)
+    TIMEOUT="${1#*=}"
+    shift 1
+    ;;
+    --)
+    shift
+    break
+    ;;
+    --help)
+    usage 0
+    ;;
+    *)
+    echoerr "Unknown argument: $1"
+    usage 1
+    ;;
+  esac
+done
+
+if [ "$HOST" = "" -o "$PORT" = "" ] && [ "$WAITFOR_URL" = "" ]; then
+  echoerr "Error: you need to provide a host and port OR an URL to test."
+  usage 2
+fi
+
+if [ "$WAITFOR_URL" != "" ]; then
+  wait_for_http "$@"
+else
+  wait_for "$@"
+fi