vk-scripts 1.0.2__tar.gz → 1.0.4__tar.gz

vk_scripts-1.0.4/.gitattributes

@@ -0,0 +1,3 @@
+* text=auto
+
+*.sh text eol=lf

vk_scripts-1.0.4/.github/dependabot.yml

@@ -0,0 +1,6 @@
+version: 2
+updates:
+  - package-ecosystem: github-actions
+    directory: /
+    schedule:
+      interval: weekly

vk_scripts-1.0.4/.github/workflows/ci.yml

@@ -0,0 +1,75 @@
+name: CI
+
+on:
+  push:
+    paths-ignore:
+      - 'docs/**'
+      - 'README.md'
+  schedule:
+    # Weekly, at 6:45 AM on Thursday (somewhat randomly chosen).
+    - cron: '45 6 * * 4'
+  workflow_dispatch:
+
+env:
+  PIP_DISABLE_PIP_VERSION_CHECK: 1
+  PIP_NO_PYTHON_VERSION_WARNING: 1
+
+jobs:
+  test:
+    strategy:
+      matrix:
+        python-version: ['3.9', '3.10', '3.11', '3.12', '3.13', '3.14']
+      # Random number to prevent exceeding the request frequency limit.
+      max-parallel: 3
+    runs-on: ubuntu-latest
+    name: 'Python ${{ matrix.python-version }}'
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v6
+        with:
+          fetch-depth: 0
+      - name: Set up Python
+        uses: actions/setup-python@v6
+        with:
+          python-version: '${{ matrix.python-version }}'
+      - name: 'Install package & dependencies'
+        run: pip install -q -e .
+      - name: Check that scripts are runnable
+        run: |
+          vk-mutuals --version
+          vk-status --version
+          vk-sessions --version
+      - name: Run tests
+        run: ./test/bin/main.sh
+
+  publish_pypi:
+    needs: [test]
+    runs-on: ubuntu-latest
+    name: Publish
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v6
+        with:
+          fetch-depth: 0
+      - name: Set up Python
+        uses: actions/setup-python@v6
+        with:
+          python-version: '3.x'
+      - name: Verify package can be installed
+        run: pip install -q .
+      - name: Install package builder
+        run: pip install -q --upgrade build
+      - name: Build package
+        run: python -m build
+      - name: Publish as artifact
+        uses: actions/upload-artifact@v7
+        with:
+          name: dist
+          path: dist
+          if-no-files-found: error
+      - name: Publish to PyPI
+        if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags/')
+        uses: pypa/gh-action-pypi-publish@release/v1
+        with:
+          user: __token__
+          password: '${{ secrets.PYPI_API_TOKEN }}'

vk_scripts-1.0.4/.gitignore

@@ -0,0 +1,6 @@
+__pycache__/
+
+/*.csv
+/*.json
+/*.log
+/*.png

vk_scripts-1.0.4/.pylintrc

@@ -0,0 +1,7 @@
+[MESSAGES CONTROL]
+
+disable=invalid-name,missing-docstring,multiple-imports,too-many-public-methods,too-few-public-methods
+
+[BASIC]
+
+bad-functions=

{vk_scripts-1.0.2 → vk_scripts-1.0.4}/PKG-INFO

@@ -1,18 +1,18 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: vk_scripts
-Version: 1.0.2
+Version: 1.0.4
 Summary: Scripts to stalk people on VK
-Home-page: https://github.com/egor-tensin/vk-scripts
-Author: Egor Tensin
-Author-email: Egor.Tensin@gmail.com
-License: MIT
+Author-email: Egor Tensin <Egor.Tensin@gmail.com>
+License-Expression: MIT
+Project-URL: Homepage, https://github.com/egor-tensin/vk-scripts
 Project-URL: Bug Tracker, https://github.com/egor-tensin/vk-scripts/issues
-Platform: UNKNOWN
 Classifier: Development Status :: 4 - Beta
-Classifier: License :: OSI Approved :: MIT License
 Requires-Python: >=3.4
 Description-Content-Type: text/markdown
 License-File: LICENSE.txt
+Requires-Dist: importlib-metadata~=4.0; python_version < "3.8"
+Requires-Dist: matplotlib
+Dynamic: license-file
 
 VK scripts
 ==========
@@ -55,6 +55,14 @@ Requires [Pylint].
 
 [Pylint]: https://www.pylint.org/
 
+### Releases
+
+Make a git tag:
+
+    git tag "v$( python -m setuptools_scm --strip-dev )"
+
+You can then review that the tag is fine and push w/ `git push --tags`.
+
 License
 -------
 
@@ -62,5 +70,3 @@ Distributed under the MIT License.
 See [LICENSE.txt] for details.
 
 [LICENSE.txt]: LICENSE.txt
-
-

{vk_scripts-1.0.2 → vk_scripts-1.0.4}/README.md

@@ -39,6 +39,14 @@ Requires [Pylint].
 
 [Pylint]: https://www.pylint.org/
 
+### Releases
+
+Make a git tag:
+
+    git tag "v$( python -m setuptools_scm --strip-dev )"
+
+You can then review that the tag is fine and push w/ `git push --tags`.
+
 License
 -------
 

vk_scripts-1.0.4/docs/mutuals.md

@@ -0,0 +1,44 @@
+vk-mutuals
+==========
+
+Learn who your ex and her new boyfriend are both friends with.
+
+Usage
+-----
+
+    > vk-mutuals -h
+    usage: vk-mutuals [-h] [-f {csv,json}] [-o PATH] UID [UID ...]
+    ...
+
+For example (using made up user IDs/"screen names"),
+
+    > vk-mutuals john.doe jane.doe
+    89497105,John,Smith
+    3698577,Jane,Smith
+
+In the example above, both "John Doe" and "Jane Doe" are friends with "John
+Smith" and "Jane Smith", whose user IDs are 89497105 and 3698577 respectively.
+
+The output format is CSV (comma-separated values) by default.
+You can also get a JSON document:
+
+    > vk-mutuals --format json john.doe jane.doe
+    [
+       {
+          "uid": 89497105,
+          "first_name": "John",
+          "last_name": "Smith"
+       },
+       {
+          "uid": 3698577,
+          "first_name": "Jane",
+          "last_name": "Smith"
+       }
+    ]
+
+See also
+--------
+
+* [License]
+
+[License]: ../README.md#license

vk_scripts-1.0.4/docs/sessions.md

@@ -0,0 +1,168 @@
+vk-sessions
+===========
+
+View/visualize the amount of time people spend online.
+
+Usage
+-----
+
+```
+> vk-sessions -h
+usage: vk-sessions [-h] [-g {user,date,weekday,hour}] [-i {csv,log,null}]
+                   [-o {csv,json,plot}] [-a TIME_FROM] [-b TIME_TO]
+                   [input] [output]
+```
+
+This script additionally requires [matplotlib] to be installed.
+
+Analyze the database produced by [vk-status] and calculate the total amount of
+time people spent online.
+For example (assuming the database in "db.csv" was generated by [vk-status]
+before):
+
+```
+> vk-sessions db.csv
+89497105,John,Smith,john.smith,0:12:31
+3698577,Jane,Smith,jane.smith,1:34:46
+```
+
+In the example above, "John Smith" and "Jane Smith" spent approx. 13 and 95
+minutes online respectively.
+
+The output format is CSV (comma-separated values) by default.
+You can also get a JSON document:
+
+```
+> vk-sessions --output-format json db.csv
+[
+   {
+      "uid": 89497105,
+      "first_name": "John",
+      "last_name": "Smith",
+      "domain": "john.smith",
+      "duration": "0:12:31"
+   },
+   {
+      "uid": 3698577,
+      "first_name": "Jane",
+      "last_name": "Smith",
+      "domain": "jane.smith",
+      "duration": "1:34:46"
+   }
+]
+```
+
+The durations are calculated on a per-user basis by default.
+You can change that by supplying either `date` (to group by dates), `weekday`
+(to group by weekdays) or `hour` (to group by day hours) as the `--group-by`
+parameter value.
+For example (assuming that both Jane and Joe spent their time online on Friday,
+June 17, 2016).
+
+```
+> vk-sessions --output-format json --group-by date db.csv
+[
+   {
+      "date": "2016-06-17",
+      "duration": "1:47:17"
+   }
+]
+```
+
+```
+> vk-sessions --output-format csv --group-by weekday db.csv
+Monday,0:00:00
+Tuesday,0:00:00
+Wednesday,0:00:00
+Thursday,0:00:00
+Friday,1:47:17
+Saturday,0:00:00
+Sunday,0:00:00
+```
+
+```
+> vk-sessions --group-by hour db.csv
+0:00:00,0:00:00
+1:00:00,0:00:00
+2:00:00,0:00:00
+3:00:00,0:00:00
+4:00:00,0:03:56
+5:00:00,0:14:14
+6:00:00,0:29:30
+7:00:00,0:31:20
+8:00:00,0:12:04
+9:00:00,0:00:00
+10:00:00,0:00:00
+11:00:00,0:23:14
+12:00:00,0:06:00
+13:00:00,0:46:19
+14:00:00,0:00:00
+15:00:00,0:00:00
+16:00:00,0:00:00
+17:00:00,0:00:00
+18:00:00,0:00:00
+19:00:00,0:00:00
+20:00:00,0:00:00
+21:00:00,0:00:00
+22:00:00,0:00:00
+23:00:00,0:00:00
+```
+
+In my opinion, the script's most useful feature is its ability to easily create
+plots that represent this data (like in the examples above).
+To produce a plot, pass `plot` as the `--output-format` parameter value and add
+a file path to write the image to.
+
+```
+> vk-sessions --output-format plot db.csv user.png
+```
+
+![user.png]
+
+```
+> vk-sessions --output-format plot --group-by date db.csv date.png
+```
+
+![date.png]
+
+```
+> vk-sessions --output-format plot --group-by weekday db.csv weekday.png
+```
+
+![weekday.png]
+
+```
+> vk-sessions --output-format plot --group-by hour db.csv hour.png
+```
+
+![hour.png]
+
+You can limit the scope of the database by supplying a time range.
+Only online sessions that overlap with this range shall then be processed.
+Set the range by specifying both or one of the `--from` and `--to` parameters.
+The values must be in the `%Y-%m-%dT%H:%M:%SZ` format (a subset of ISO 8601).
+
+All dates and times are in UTC.
+
+[matplotlib]: http://matplotlib.org/
+[vk-status]: status.md
+
+[user.png]: images/user.png
+[date.png]: images/date.png
+[weekday.png]: images/weekday.png
+[hour.png]: images/hour.png
+
+Known issues
+------------
+
+* When people go online using the web version and don't visit other pages over
+time (for example, just listening to music), they appear offline.
+Hence the 0:00:00 durations you might sometimes encounter.
+This might also happen using other clients.
+
+See also
+--------
+
+* [License]
+
+[License]: ../README.md#license

vk_scripts-1.0.4/docs/status.md

@@ -0,0 +1,40 @@
+vk-status
+=========
+
+Track when people go online/offline.
+
+Usage
+-----
+
+    > vk-status -h
+    usage: vk-status [-h] [-t SECONDS] [-O] [-l PATH] [-f {csv,log,null}]
+                     [-o PATH]
+                     UID [UID ...]
+    ...
+
+For example (using made up user IDs/"screen names"),
+
+    > vk-status john.doe jane.smith
+    [2016-06-18 01:43:34] John Doe is ONLINE.
+    [2016-06-18 01:43:34] John Doe was last seen at 2016-06-18 01:33:58+03:00 using the official iPhone app.
+    [2016-06-18 01:43:34] Jane Smith is OFFLINE.
+    [2016-06-18 01:43:34] Jane Smith was last seen at 2016-06-18 01:15:47+03:00 using the web version (or an unrecognized app).
+    [2016-06-18 01:59:09] Jane Smith went ONLINE.
+    [2016-06-18 01:59:09] Jane Smith was last seen at 2016-06-18 01:59:07+03:00 using the official Android app.
+    [2016-06-18 02:10:00] John Doe went OFFLINE.
+    [2016-06-18 02:10:00] John Doe was last seen at 2016-06-18 01:54:58+03:00 using the official iPhone app.
+    ...
+
+By default, the script produces a human-readable log.
+Use the `--log` parameter to write the log to a file.
+If you want to record when people go online/offline for further analysis using
+[vk-sessions], specify the path to a database using the `--output` parameter.
+
+[vk-sessions]: sessions.md
+
+See also
+--------
+
+* [License]
+
+[License]: ../README.md#license

vk_scripts-1.0.4/pyproject.toml

@@ -0,0 +1,32 @@
+[build-system]
+requires = ["setuptools>=61.0", "setuptools-scm"]
+build-backend = "setuptools.build_meta"
+
+[project]
+name = "vk_scripts"
+description = "Scripts to stalk people on VK"
+license = "MIT"
+dynamic = ["version"]
+authors = [{name = "Egor Tensin", email = "Egor.Tensin@gmail.com"}]
+readme = "README.md"
+requires-python = ">=3.4"
+
+dependencies = [
+    'importlib-metadata ~= 4.0 ; python_version < "3.8"',
+    "matplotlib",
+]
+
+classifiers = [
+    "Development Status :: 4 - Beta",
+]
+
+[project.urls]
+"Homepage" = "https://github.com/egor-tensin/vk-scripts"
+"Bug Tracker" = "https://github.com/egor-tensin/vk-scripts/issues"
+
+[project.scripts]
+vk-sessions = "vk.tracking.sessions:main"
+vk-status = "vk.tracking.status:main"
+vk-mutuals = "vk.mutuals:main"
+
+[tool.setuptools_scm]

vk_scripts-1.0.4/setup.cfg

@@ -0,0 +1,4 @@
+[egg_info]
+tag_build = 
+tag_date = 0
+

vk_scripts-1.0.4/test/bin/main.sh

@@ -0,0 +1,19 @@
+#!/usr/bin/env bash
+
+# Copyright (c) 2019 Egor Tensin <Egor.Tensin@gmail.com>
+# This file is part of the "VK scripts" project.
+# For details, see https://github.com/egor-tensin/vk-scripts.
+# Distributed under the MIT License.
+
+set -o errexit -o nounset -o pipefail
+
+script_dir="$( dirname -- "${BASH_SOURCE[0]}" )"
+script_dir="$( cd -- "$script_dir" && pwd )"
+readonly script_dir
+
+"$script_dir/mutuals.sh"
+
+"$script_dir/sessions.sh"
+
+"$script_dir/status_once.sh"
+"$script_dir/status.sh"

vk_scripts-1.0.4/test/bin/mutuals.sh

@@ -0,0 +1,23 @@
+#!/usr/bin/env bash
+
+# Copyright (c) 2019 Egor Tensin <Egor.Tensin@gmail.com>
+# This file is part of the "VK scripts" project.
+# For details, see https://github.com/egor-tensin/vk-scripts.
+# Distributed under the MIT License.
+
+set -o errexit -o nounset -o pipefail
+
+script_dir="$( dirname -- "${BASH_SOURCE[0]}" )"
+script_dir="$( cd -- "$script_dir" && pwd )"
+readonly script_dir
+
+test_users() {
+    "$script_dir/../lib/test.sh" vk.mutuals --format csv  "$@"
+    "$script_dir/../lib/test.sh" vk.mutuals --format json "$@"
+}
+
+main() {
+    test_users kreed58 korya_mc
+}
+
+main

vk_scripts-1.0.4/test/bin/sessions.sh

@@ -0,0 +1,69 @@
+#!/usr/bin/env bash
+
+# Copyright (c) 2019 Egor Tensin <Egor.Tensin@gmail.com>
+# This file is part of the "VK scripts" project.
+# For details, see https://github.com/egor-tensin/vk-scripts.
+# Distributed under the MIT License.
+
+set -o errexit -o nounset -o pipefail
+
+script_dir="$( dirname -- "${BASH_SOURCE[0]}" )"
+script_dir="$( cd -- "$script_dir" && pwd )"
+readonly script_dir
+script_name="$( basename -- "${BASH_SOURCE[0]}" )"
+readonly script_name
+
+readonly db_path="$script_dir/../share/test_db.csv"
+
+dump() {
+    local msg
+    for msg; do
+        echo "$script_name: $msg"
+    done
+}
+
+test_output() {
+    local output_path
+    output_path="$( mktemp --dry-run )"
+
+    local rm_aux_files
+    rm_aux_files="$( printf -- 'rm -f -- %q' "$output_path" )"
+
+    trap "$rm_aux_files" RETURN
+
+    "$script_dir/../lib/test.sh" vk.tracking.sessions "$@" "$db_path" "$output_path"
+
+    if file --brief --dereference --mime -- "$output_path" | grep --quiet -- 'charset=binary$'; then
+        dump 'Output is a binary file, not going to show that'
+        return 0
+    fi
+
+    cat "$output_path"
+}
+
+group_by() {
+    test_output --output-format csv  --group-by "$@"
+    test_output --output-format json --group-by "$@"
+    test_output --output-format plot --group-by "$@"
+}
+
+online_sessions() {
+    group_by user
+    group_by hour
+    group_by date
+    group_by weekday
+}
+
+fix_matplotlib() {
+    # Get rid of:
+    # tkinter.TclError: no display name and no $DISPLAY environment variable
+    mkdir -p -- ~/.config/matplotlib
+    echo 'backend: Agg' > ~/.config/matplotlib/matplotlibrc
+}
+
+main() {
+    fix_matplotlib
+    online_sessions
+}
+
+main

vk_scripts-1.0.4/test/bin/status.sh

@@ -0,0 +1,60 @@
+#!/usr/bin/env bash
+
+# Copyright (c) 2019 Egor Tensin <Egor.Tensin@gmail.com>
+# This file is part of the "VK scripts" project.
+# For details, see https://github.com/egor-tensin/vk-scripts.
+# Distributed under the MIT License.
+
+set -o errexit -o nounset -o pipefail
+
+script_dir="$( dirname -- "${BASH_SOURCE[0]}" )"
+script_dir="$( cd -- "$script_dir" && pwd )"
+readonly script_dir
+script_name="$( basename -- "${BASH_SOURCE[0]}" )"
+readonly script_name
+
+dump() {
+    local msg
+    for msg; do
+        echo "$script_name: $msg"
+    done
+}
+
+test_users() {
+    local log_path
+    log_path="$( mktemp )"
+    local db_path
+    db_path="$( mktemp --dry-run )"
+
+    local rm_aux_files
+    rm_aux_files="$( printf -- 'rm -f -- %q %q' "$log_path" "$db_path" )"
+    trap "$rm_aux_files" RETURN
+
+    "$script_dir/../lib/test.sh" vk.tracking.status "$@" --log "$log_path" --format csv --output "$db_path" &
+    local pid="$!"
+
+    sleep 3
+    dump "Log file path: $log_path"
+    dump "DB file path: $db_path"
+    dump "PID: $pid"
+
+    local timeout=10
+    dump "Sleeping for $timeout seconds..."
+    sleep "$timeout"
+
+    dump 'Terminating track_status.py...'
+    kill "$pid"
+    dump 'Waiting for track_status.py to terminate...'
+    wait "$pid" || true
+
+    dump "Log file:"
+    cat "$log_path"
+    dump "DB:"
+    cat "$db_path"
+}
+
+main() {
+    test_users egor.tensin
+}
+
+main "$@"

vk_scripts-1.0.4/test/bin/status_once.sh

@@ -0,0 +1,22 @@
+#!/usr/bin/env bash
+
+# Copyright (c) 2019 Egor Tensin <Egor.Tensin@gmail.com>
+# This file is part of the "VK scripts" project.
+# For details, see https://github.com/egor-tensin/vk-scripts.
+# Distributed under the MIT License.
+
+set -o errexit -o nounset -o pipefail
+
+script_dir="$( dirname -- "${BASH_SOURCE[0]}" )"
+script_dir="$( cd -- "$script_dir" && pwd )"
+readonly script_dir
+
+test_users() {
+    "$script_dir/../lib/test.sh" vk.tracking.status --only-once "$@"
+}
+
+main() {
+    test_users egor.tensin
+}
+
+main

vk_scripts-1.0.4/test/lib/test.sh

@@ -0,0 +1,27 @@
+#!/usr/bin/env bash
+
+# Copyright (c) 2020 Egor Tensin <Egor.Tensin@gmail.com>
+# This file is part of the "VK scripts" project.
+# For details, see https://github.com/egor-tensin/vk-scripts.
+# Distributed under the MIT License.
+
+set -o errexit -o nounset -o pipefail
+
+script_dir="$( dirname -- "${BASH_SOURCE[0]}" )"
+script_dir="$( cd -- "$script_dir" && pwd )"
+readonly script_dir
+
+run_test() {
+    local arg
+    echo
+    echo ======================================================================
+    for arg; do
+        echo -n "$arg "
+    done
+    echo
+    echo ======================================================================
+
+    PYTHONPATH="$script_dir/../.." python -m "$@"
+}
+
+run_test "$@"

vk_scripts-1.0.4/test/share/test_db.csv

@@ -0,0 +1,45 @@
+2019-09-09T20:35:46Z,5245998,Egor,Tensin,egor.tensin,True,2019-09-09T20:35:01Z,7
+2019-09-09T20:35:46Z,80387804,David,Makeev,david.makeev,False,2019-09-09T17:44:23Z,7
+2019-09-09T20:35:46Z,1172984,Darya,Meluzova,dmeluzova,False,2019-09-09T11:56:03Z,2
+2019-09-09T20:35:46Z,1052036,Alisa,Bakaeva,alisa.bakaeva,False,2019-09-09T13:30:40Z,4
+2019-09-09T20:35:46Z,60534,Dina,Semenenko,dina_semenenko,False,2019-09-09T17:20:36Z,1
+2019-09-09T20:35:46Z,631289,Nikita,Fedorov,nicksarkozy,False,2019-09-09T19:56:54Z,2
+2019-09-09T20:40:55Z,5245998,Egor,Tensin,egor.tensin,False,2019-09-09T20:35:52Z,7
+2019-09-09T21:16:33Z,5245998,Egor,Tensin,egor.tensin,True,2019-09-09T21:16:31Z,7
+2019-09-09T21:23:13Z,5245998,Egor,Tensin,egor.tensin,False,2019-09-09T21:18:10Z,7
+2019-09-09T21:34:50Z,60534,Dina,Semenenko,dina_semenenko,True,2019-09-09T21:34:49Z,1
+2019-09-09T21:40:54Z,60534,Dina,Semenenko,dina_semenenko,False,2019-09-09T21:35:52Z,1
+2019-09-09T22:06:00Z,5245998,Egor,Tensin,egor.tensin,True,2019-09-09T22:05:57Z,7
+2019-09-09T22:11:29Z,5245998,Egor,Tensin,egor.tensin,False,2019-09-09T22:06:24Z,7
+2019-09-09T23:28:11Z,5245998,Egor,Tensin,egor.tensin,True,2019-09-09T23:28:06Z,7
+2019-09-09T23:33:10Z,5245998,Egor,Tensin,egor.tensin,False,2019-09-09T23:28:06Z,7
+2019-09-09T23:44:42Z,5245998,Egor,Tensin,egor.tensin,True,2019-09-09T23:44:37Z,7
+2019-09-09T23:49:40Z,5245998,Egor,Tensin,egor.tensin,False,2019-09-09T23:44:37Z,7
+2019-09-10T00:52:03Z,80387804,David,Makeev,david.makeev,True,2019-09-10T00:52:00Z,4
+2019-09-10T00:54:50Z,80387804,David,Makeev,david.makeev,False,2019-09-10T00:54:46Z,4
+2019-09-10T02:50:01Z,80387804,David,Makeev,david.makeev,True,2019-09-10T02:49:58Z,7
+2019-09-10T03:02:25Z,80387804,David,Makeev,david.makeev,False,2019-09-10T02:57:21Z,7
+2019-09-10T06:26:08Z,1172984,Darya,Meluzova,dmeluzova,True,2019-09-10T06:26:05Z,2
+2019-09-10T06:33:23Z,1172984,Darya,Meluzova,dmeluzova,False,2019-09-10T06:28:21Z,2
+2019-09-10T06:58:01Z,60534,Dina,Semenenko,dina_semenenko,True,2019-09-10T06:58:00Z,1
+2019-09-10T07:06:47Z,60534,Dina,Semenenko,dina_semenenko,False,2019-09-10T07:01:44Z,1
+2019-09-10T07:09:24Z,80387804,David,Makeev,david.makeev,True,2019-09-10T07:09:22Z,7
+2019-09-10T07:15:44Z,80387804,David,Makeev,david.makeev,False,2019-09-10T07:10:42Z,7
+2019-09-10T07:17:20Z,60534,Dina,Semenenko,dina_semenenko,True,2019-09-10T07:17:15Z,1
+2019-09-10T07:52:46Z,60534,Dina,Semenenko,dina_semenenko,False,2019-09-10T07:47:45Z,1
+2019-09-10T07:54:17Z,60534,Dina,Semenenko,dina_semenenko,True,2019-09-10T07:54:13Z,1
+2019-09-10T08:00:36Z,1172984,Darya,Meluzova,dmeluzova,True,2019-09-10T08:00:35Z,2
+2019-09-10T08:05:45Z,1172984,Darya,Meluzova,dmeluzova,False,2019-09-10T08:00:43Z,2
+2019-09-10T08:09:02Z,60534,Dina,Semenenko,dina_semenenko,False,2019-09-10T08:04:00Z,1
+2019-09-10T08:18:39Z,60534,Dina,Semenenko,dina_semenenko,True,2019-09-10T08:18:36Z,1
+2019-09-10T08:24:19Z,60534,Dina,Semenenko,dina_semenenko,False,2019-09-10T08:19:17Z,1
+2019-09-10T08:41:56Z,60534,Dina,Semenenko,dina_semenenko,True,2019-09-10T08:41:53Z,1
+2019-09-10T08:52:59Z,60534,Dina,Semenenko,dina_semenenko,False,2019-09-10T08:47:57Z,1
+2019-09-10T09:37:33Z,60534,Dina,Semenenko,dina_semenenko,True,2019-09-10T09:37:30Z,1
+2019-09-10T09:44:03Z,60534,Dina,Semenenko,dina_semenenko,False,2019-09-10T09:39:02Z,1
+2019-09-10T10:20:35Z,5245998,Egor,Tensin,egor.tensin,True,2019-09-10T10:20:29Z,7
+2019-09-10T10:25:34Z,5245998,Egor,Tensin,egor.tensin,False,2019-09-10T10:20:29Z,7
+2019-09-10T10:27:35Z,631289,Nikita,Fedorov,nicksarkozy,True,2019-09-10T10:27:30Z,7
+2019-09-10T10:33:14Z,631289,Nikita,Fedorov,nicksarkozy,False,2019-09-10T10:28:10Z,7
+2019-09-10T10:36:22Z,631289,Nikita,Fedorov,nicksarkozy,True,2019-09-10T10:36:17Z,7
+2019-09-10T10:41:21Z,631289,Nikita,Fedorov,nicksarkozy,False,2019-09-10T10:36:17Z,7

{vk_scripts-1.0.2 → vk_scripts-1.0.4}/vk/api.py

@@ -64,8 +64,8 @@ ACCESS_TOKEN = '9722cef09722cef09722cef071974b8cbe997229722cef0cbabfd816916af6c7
 
 
 class Version(Enum):
-    V5_131 = '5.131'
-    DEFAULT = V5_131
+    V5_199 = '5.199'
+    DEFAULT = V5_199
 
     def __str__(self):
         return self.value

{vk_scripts-1.0.2 → vk_scripts-1.0.4}/vk/mutuals.py

@@ -12,6 +12,7 @@ import sys
 from vk.api import API
 from vk.user import UserField
 from vk.utils import io
+import vk.version
 
 
 _OUTPUT_USER_FIELDS = UserField.UID, UserField.FIRST_NAME, UserField.LAST_NAME
@@ -84,6 +85,8 @@ def _parse_args(args=None):
     parser = argparse.ArgumentParser(
         description='Learn who your ex and her new boyfriend are both friends with.')
 
+    vk.version.add_to_arg_parser(parser)
+
     parser.add_argument('uids', metavar='UID', nargs='+',
                         help='user IDs or "screen names"')
     parser.add_argument('-f', '--format', dest='out_fmt',

{vk_scripts-1.0.2 → vk_scripts-1.0.4}/vk/tracking/db/backend/log.py

@@ -15,7 +15,7 @@ class Writer(meta.Writer):
         handler = logging.StreamHandler(fd)
         handler.setFormatter(logging.Formatter(
             fmt='[%(asctime)s] %(message)s',
-            datefmt='%Y-%m-%d %H:%M:%S'))
+            datefmt='%Y-%m-%d %H:%M:%S%z'))
         self._logger.addHandler(handler)
 
         self._reset_last_notification()

{vk_scripts-1.0.2 → vk_scripts-1.0.4}/vk/tracking/sessions.py

@@ -15,6 +15,7 @@ from vk.tracking.db import Format as DatabaseFormat
 from vk.user import UserField
 from vk.utils.bar_chart import BarChartBuilder
 from vk.utils import io
+import vk.version
 
 
 class Weekday(Enum):
@@ -436,6 +437,8 @@ def _parse_args(args=None):
     parser = argparse.ArgumentParser(
         description='View/visualize the amount of time people spend online.')
 
+    vk.version.add_to_arg_parser(parser)
+
     parser.add_argument('db_path', metavar='input', nargs='?',
                         help='database file path (standard input by default)')
     parser.add_argument('out_path', metavar='output', nargs='?',

{vk_scripts-1.0.2 → vk_scripts-1.0.4}/vk/tracking/status.py

@@ -12,8 +12,9 @@ import sys
 
 from vk.api import API
 import vk.error
-from vk.user import UserField
 from vk.tracking.db import Format as DatabaseFormat
+from vk.user import UserField
+import vk.version
 
 
 class StatusTracker:
@@ -171,6 +172,8 @@ def _parse_args(args=None):
     parser = argparse.ArgumentParser(
         description='Track when people go online/offline.')
 
+    vk.version.add_to_arg_parser(parser)
+
     parser.add_argument('uids', metavar='UID', nargs='+',
                         help='user IDs or "screen names"')
     parser.add_argument('-t', '--timeout', metavar='SECONDS',

vk_scripts-1.0.4/vk/version.py

@@ -0,0 +1,15 @@
+try:
+    import importlib.metadata as metadata
+except ImportError:
+    import importlib_metadata as metadata
+
+
+try:
+    __version__ = metadata.version('vk_scripts')
+except Exception:
+    __version__ = 'unknown'
+
+
+def add_to_arg_parser(parser):
+    parser.add_argument('--version', '-V', action='version',
+                        version=f'%(prog)s {__version__}')

{vk_scripts-1.0.2 → vk_scripts-1.0.4}/vk_scripts.egg-info/PKG-INFO

@@ -1,18 +1,18 @@
-Metadata-Version: 2.1
-Name: vk-scripts
-Version: 1.0.2
+Metadata-Version: 2.4
+Name: vk_scripts
+Version: 1.0.4
 Summary: Scripts to stalk people on VK
-Home-page: https://github.com/egor-tensin/vk-scripts
-Author: Egor Tensin
-Author-email: Egor.Tensin@gmail.com
-License: MIT
+Author-email: Egor Tensin <Egor.Tensin@gmail.com>
+License-Expression: MIT
+Project-URL: Homepage, https://github.com/egor-tensin/vk-scripts
 Project-URL: Bug Tracker, https://github.com/egor-tensin/vk-scripts/issues
-Platform: UNKNOWN
 Classifier: Development Status :: 4 - Beta
-Classifier: License :: OSI Approved :: MIT License
 Requires-Python: >=3.4
 Description-Content-Type: text/markdown
 License-File: LICENSE.txt
+Requires-Dist: importlib-metadata~=4.0; python_version < "3.8"
+Requires-Dist: matplotlib
+Dynamic: license-file
 
 VK scripts
 ==========
@@ -55,6 +55,14 @@ Requires [Pylint].
 
 [Pylint]: https://www.pylint.org/
 
+### Releases
+
+Make a git tag:
+
+    git tag "v$( python -m setuptools_scm --strip-dev )"
+
+You can then review that the tag is fine and push w/ `git push --tags`.
+
 License
 -------
 
@@ -62,5 +70,3 @@ Distributed under the MIT License.
 See [LICENSE.txt] for details.
 
 [LICENSE.txt]: LICENSE.txt
-
-

{vk_scripts-1.0.2 → vk_scripts-1.0.4}/vk_scripts.egg-info/SOURCES.txt

@@ -1,8 +1,25 @@
+.gitattributes
+.gitignore
+.pylintrc
 LICENSE.txt
 README.md
 pyproject.toml
-setup.cfg
-setup.py
+.github/dependabot.yml
+.github/workflows/ci.yml
+docs/mutuals.md
+docs/sessions.md
+docs/status.md
+docs/images/date.png
+docs/images/hour.png
+docs/images/user.png
+docs/images/weekday.png
+test/bin/main.sh
+test/bin/mutuals.sh
+test/bin/sessions.sh
+test/bin/status.sh
+test/bin/status_once.sh
+test/lib/test.sh
+test/share/test_db.csv
 vk/__init__.py
 vk/api.py
 vk/error.py
@@ -10,6 +27,7 @@ vk/last_seen.py
 vk/mutuals.py
 vk/platform.py
 vk/user.py
+vk/version.py
 vk/tracking/__init__.py
 vk/tracking/sessions.py
 vk/tracking/status.py

{vk_scripts-1.0.2 → vk_scripts-1.0.4}/vk_scripts.egg-info/entry_points.txt

@@ -2,4 +2,3 @@
 vk-mutuals = vk.mutuals:main
 vk-sessions = vk.tracking.sessions:main
 vk-status = vk.tracking.status:main
-

vk_scripts-1.0.4/vk_scripts.egg-info/requires.txt

@@ -0,0 +1,4 @@
+matplotlib
+
+[:python_version < "3.8"]
+importlib-metadata~=4.0

vk_scripts-1.0.2/pyproject.toml

@@ -1,3 +0,0 @@
-[build-system]
-requires = ["setuptools", "wheel"]
-build-backend = "setuptools.build_meta"

vk_scripts-1.0.2/setup.cfg

@@ -1,32 +0,0 @@
-[metadata]
-name = vk_scripts
-version = 1.0.2
-author = Egor Tensin
-author_email = Egor.Tensin@gmail.com
-description = Scripts to stalk people on VK
-long_description = file: README.md
-long_description_content_type = text/markdown
-license = MIT
-url = https://github.com/egor-tensin/vk-scripts
-project_urls = 
-	Bug Tracker = https://github.com/egor-tensin/vk-scripts/issues
-classifiers = 
-	Development Status :: 4 - Beta
-	License :: OSI Approved :: MIT License
-
-[options]
-packages = find:
-python_requires = >=3.4
-install_requires = 
-	matplotlib
-
-[options.entry_points]
-console_scripts = 
-	vk-sessions = vk.tracking.sessions:main
-	vk-status = vk.tracking.status:main
-	vk-mutuals = vk.mutuals:main
-
-[egg_info]
-tag_build = 
-tag_date = 0
-

vk_scripts-1.0.2/setup.py

@@ -1,2 +0,0 @@
-import setuptools
-setuptools.setup()

vk_scripts-1.0.2/vk_scripts.egg-info/requires.txt

@@ -1 +0,0 @@
-matplotlib