From b70a14c7ce5f1f93aff9cd1ad61851dced427c37 Mon Sep 17 00:00:00 2001 From: prabhatdev Date: Wed, 29 Jul 2020 11:39:38 +0530 Subject: [PATCH] some changes --- Dockerfile | 2 +- main.py | 31 +++++++++++++++++-------------- package-lock.json | 39 --------------------------------------- 3 files changed, 18 insertions(+), 54 deletions(-) diff --git a/Dockerfile b/Dockerfile index b2670ee..61c28b6 100644 --- a/Dockerfile +++ b/Dockerfile @@ -8,7 +8,7 @@ ADD main.py /main.py ADD loc.py /loc.py ADD make_bar_graph.py /make_bar_graph.py ADD colors.json /colors.json - +RUN apt-get update && apt-get -y install google-chrome-stable RUN apt-get update \ && apt-get install -y python3-pip python3-dev \ && cd /usr/local/bin \ diff --git a/main.py b/main.py index 396c509..dc6f26e 100644 --- a/main.py +++ b/main.py @@ -21,19 +21,19 @@ START_COMMENT = '' END_COMMENT = '' listReg = f"{START_COMMENT}[\\s\\S]+{END_COMMENT}" -user = os.getenv('INPUT_USERNAME') -waka_key = os.getenv('INPUT_WAKATIME_API_KEY') -ghtoken = os.getenv('INPUT_GH_TOKEN') -showTimeZone = os.getenv('INPUT_SHOW_TIMEZONE') -showProjects = os.getenv('INPUT_SHOW_PROJECTS') -showEditors = os.getenv('INPUT_SHOW_EDITORS') -showOs = os.getenv('INPUT_SHOW_OS') -showCommit = os.getenv('INPUT_SHOW_COMMIT') -showLanguage = os.getenv('INPUT_SHOW_LANGUAGE') -show_loc = os.getenv('INPUT_SHOW_LINES_OF_CODE') +user = 'y' if os.getenv('INPUT_USERNAME') is None else os.getenv('INPUT_USERNAME') +waka_key = 'y' if os.getenv('INPUT_WAKATIME_API_KEY') is None else os.getenv('INPUT_WAKATIME_API_KEY') +ghtoken = 'y' if os.getenv('INPUT_GH_TOKEN') is None else os.getenv('INPUT_GH_TOKEN') +showTimeZone = 'y' if os.getenv('INPUT_SHOW_TIMEZONE') is None else os.getenv('INPUT_SHOW_TIMEZONE') +showProjects = 'y' if os.getenv('INPUT_SHOW_PROJECTS') is None else os.getenv('INPUT_SHOW_PROJECTS') +showEditors = 'y' if os.getenv('INPUT_SHOW_EDITORS') is None else os.getenv('INPUT_SHOW_EDITORS') +showOs = 'y' if os.getenv('INPUT_SHOW_OS') is None else os.getenv('INPUT_SHOW_OS') +showCommit = 'y' if os.getenv('INPUT_SHOW_COMMIT') is None else os.getenv('INPUT_SHOW_COMMIT') +showLanguage = 'y' if os.getenv('INPUT_SHOW_LANGUAGE') is None else os.getenv('INPUT_SHOW_LANGUAGE') +show_loc = 'y' if os.getenv('INPUT_SHOW_LINES_OF_CODE') is None else os.getenv('INPUT_SHOW_LINES_OF_CODE') -showLanguagePerRepo = os.getenv('INPUT_SHOW_LANGUAGE_PER_REPO') -showLocChart = os.getenv('INPUT_SHOW_LOC_CHART') +showLanguagePerRepo = 'y' if os.getenv('INPUT_SHOW_LANGUAGE_PER_REPO') is None else os.getenv('INPUT_SHOW_LANGUAGE_PER_REPO') +showLocChart = 'y' if os.getenv('INPUT_SHOW_LOC_CHART') is None else os.getenv('INPUT_SHOW_LOC_CHART') show_waka_stats = 'y' # The GraphQL query to get commit data. userInfoQuery = """ @@ -371,6 +371,11 @@ def get_stats(): stats = '' repositoryList = run_query(repositoryListQuery.substitute(username=username, id=id)) + + if show_waka_stats.lower() in ['true', '1', 't', 'y', 'yes']: + stats = stats + get_waka_time_stats() + + if showLanguagePerRepo.lower() in ['true', '1', 't', 'y', 'yes']: stats = stats + generate_language_per_repo(repositoryList) + '\n\n' @@ -381,8 +386,6 @@ def get_stats(): stats = stats + '![Chart not found](https://github.com/prabhatdev/prabhatdev/blob/master/charts/bar_graph.png) \n\n' # stats = stats + generate_language_per_repo(repositoryList) + '\n\n' - if show_waka_stats.lower() in ['true', '1', 't', 'y', 'yes']: - stats = stats + get_waka_time_stats() return stats diff --git a/package-lock.json b/package-lock.json index efbfdc9..25101e8 100644 --- a/package-lock.json +++ b/package-lock.json @@ -74,16 +74,6 @@ "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz", "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==" }, - "canvas": { - "version": "2.6.1", - "resolved": "https://registry.npmjs.org/canvas/-/canvas-2.6.1.tgz", - "integrity": "sha512-S98rKsPcuhfTcYbtF53UIJhcbgIAK533d1kJKMwsMwAIFgfd58MOyxRud3kktlzWiEkFliaJtvyZCBtud/XVEA==", - "requires": { - "nan": "^2.14.0", - "node-pre-gyp": "^0.11.0", - "simple-get": "^3.0.3" - } - }, "chownr": { "version": "1.1.4", "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz", @@ -899,16 +889,6 @@ "resolved": "https://registry.npmjs.org/vega-canvas/-/vega-canvas-1.2.2.tgz", "integrity": "sha512-39h8/fZp4kDwSeDGIEoyEiIgtP3mgY3D08InD1Ldm0FntePpSe1tXzC1zcvoLe/+f7Qprl6Jfwux/ksOXvpj2w==" }, - "vega-cli": { - "version": "5.13.0", - "resolved": "https://registry.npmjs.org/vega-cli/-/vega-cli-5.13.0.tgz", - "integrity": "sha512-5gfN6JmZ4HqNr8gYdu2g+Nkh9MAcsUHJ6Bp1y67vxn9bs8LEWNk1t8vCGlt3BH2CjlyI7jLaF4NRw8bb2IhH8g==", - "requires": { - "canvas": "^2.6.1", - "vega": "5.13.0", - "yargs": "15" - } - }, "vega-crossfilter": { "version": "4.0.2", "resolved": "https://registry.npmjs.org/vega-crossfilter/-/vega-crossfilter-4.0.2.tgz", @@ -1019,25 +999,6 @@ "vega-util": "^1.13.2" } }, - "vega-lite": { - "version": "4.14.0", - "resolved": "https://registry.npmjs.org/vega-lite/-/vega-lite-4.14.0.tgz", - "integrity": "sha512-zWwmH3iX/U8xj4RsmpLkLFSVimNh3r/crbOk72MyolsB0v0TB3lRbsf1r5eJCdVPPSVEkE5TXwDYE+ygQ2kgbQ==", - "requires": { - "@types/clone": "~0.1.30", - "@types/fast-json-stable-stringify": "^2.0.0", - "array-flat-polyfill": "^1.0.1", - "clone": "~2.1.2", - "fast-deep-equal": "~3.1.3", - "fast-json-stable-stringify": "~2.1.0", - "json-stringify-pretty-compact": "~2.0.0", - "tslib": "~2.0.0", - "vega-event-selector": "~2.0.3", - "vega-expression": "~2.6.5", - "vega-util": "~1.14.1", - "yargs": "~15.4.1" - } - }, "vega-loader": { "version": "4.3.0", "resolved": "https://registry.npmjs.org/vega-loader/-/vega-loader-4.3.0.tgz",