add keep2strava #653

SongJgit · 2024-04-13T06:12:11Z

Only provide the ability to sync data from Keep's multiple sport types to Strava's corresponding sport types, to help those who use multiple devices like me. The web page presentation still uses Strava (or refer to nike_to_strava_sync.py to modify it to suit you). #167 #478 #600 #62 #646 #172

Specifics:

download data from Keep for running, cycling and hiking sport types and generate gpx without intruding into data.db and activities.json.
Upload to Strava, automatically recognised as the corresponding sport type (running, cycling, hiking).
some fields in the successfully uploaded sports data are logged in activities/keep2strava.json (in order to keep track of whether they have been uploaded or not).
Remove the corresponding gpx.

My own best practices:

running/hiking (Huawei/OPPO) -> Keep
Keep -> Strava
cycling(Garmin) -> Strava.
running_page(Strava)

yihong0618 · 2024-04-13T09:10:33Z

some of code are the same as keep_sync.py can we extract them?

vercel · 2024-04-13T11:35:37Z

The latest updates on your projects. Learn more about Vercel for Git ↗︎

Name	Status	Preview	Comments	Updated (UTC)
running-page	✅ Ready (Inspect)	Visit Preview	💬 Add feedback	Apr 17, 2024 2:15am

SongJgit · 2024-04-13T12:02:49Z

some of code are the same as keep_sync.py can we extract them?

I've made the appropriate changes.

ben-29

Great job! Let's proceed by making some minor changes.

ben-29 · 2024-04-13T15:25:20Z

run_page/keep_sync.py

@@ -318,5 +340,13 @@ def run_keep_sync(email, password, with_download_gpx=False):
        action="store_true",
        help="get all keep data to gpx and download",
    )
+    parser.add_argument(


please also add this argument to readme

ben-29 · 2024-04-13T15:29:22Z

run_page/keep_to_strava.py

+"""
+
+
+def get_all_keep_tracks(email, password, old_tracks_ids, with_download_gpx=True):


I think this part is duplicated

ben-29 · 2024-04-13T15:42:10Z

run_page/keep_to_strava.py

+
+
+def run_keep_sync(email, password, with_download_gpx=True):
+    keep2strava_bk_path = os.path.join(OUTPUT_DIR, "keep2strava.json")


It's better to make the file name and path to a static variable

ben-29 · 2024-04-13T15:45:23Z

run_page/keep_sync.py

@@ -161,31 +177,35 @@ def parse_raw_data_to_nametuple(
    return namedtuple("x", d.keys())(*d.values())


-def get_all_keep_tracks(email, password, old_tracks_ids, with_download_gpx=False):
+def get_all_keep_tracks(email, password, old_tracks_ids, with_download_gpx=True):


don't change the default value here

ben-29 · 2024-04-13T15:54:01Z

run_page/keep_to_strava.py

+        json.dump(content, f, indent=0)
+
+    # del gpx
+    for track in new_tracks:


Isn't it to delete the uploaded_file_paths? or we can delete the file while the file is uploaded.

Since GPX files that fail to upload will still be uploaded next time, it might be better to delete them all to keep GPXOUT clean.

Deleting files while uploading, I'm not sure if I'm going to have a problem similar to ”# Fix the issue that the github action runs too fast, resulting in unsuccessful file generation“ in nike_to_strava.py. If I need to add sleep to avoid it, then I might as well delete them last to keep the execution efficient.

Adding comments would be helpful to clarify the code

zhaohongxuan · 2024-04-14T00:00:54Z

run_page/keep_sync.py

As in the other files do, this project is mainly for running, I think the newly introduced IS_ONLY_RUN = False can be a breaking change. Others who only need running will have to modify their script files and add --only-run as well or their projects will sync all sport types(even they don't need), this is a little wired. it's more reasonable in @ben-29 's [workout page] (https://github.com/ben-29/workouts_page) project.
A suggested approach could be by introducing additional argument --sync-all-types or --sync-types then followed needed sport types. users can choose their sport types they need, and default is running.

Please also open PR in Workout Page after this PR has been merged @SongJgit

ben-29 · 2024-04-14T03:24:38Z

.github/workflows/run_data_sync.yml

@@ -18,6 +18,7 @@ on:
      - run_page/gpx_sync.py
      - run_page/tcx_sync.py
      - run_page/garmin_to_strava_sync.py
+      - run_page/keep_to_strava_sync.py


Also add this job in the below jobs section

ben-29 · 2024-04-14T03:25:14Z

README-CN.md

+
+```yaml
+      - name: Run sync Strava script
+        if: env.RUN_TYPE == 'strava'


use the new added RUN_TYPE

ben-29 · 2024-04-14T03:27:32Z

run_page/keep_sync.py

Please also open PR in Workout Page after this PR has been merged @SongJgit

ben-29 · 2024-04-14T13:03:13Z

README-CN.md

+        ```yaml
+        RUN_TYPE: starva
+        ```
+    - if: env.RUN_TYPE == 'keep_to_strava'改为


这里的两个方案，我认为有点绕，不太好理解和操作。
让用户只配置 RUN_TYPE 就好，再去改下面的job分支，对新手用户不太友好；同时，如果用户已经改了，再想把RUN_TYPE 改回 'keep_to_strava' 时，会难以操作。另外，这么改也对只用 strava 不用 keep 的用户造成困扰。

建议：针对第3点的2种方案，增加两个 RUN_TYPE，比如分别为 keep_to_starva 和 keep_to_starva_sync，用户只用在这2个里面选择，无须再更改其他修改。

yihong0618 · 2024-04-15T10:25:07Z

.github/workflows/run_data_sync.yml

+        # If you only want to sync `type running` modify args --sync-types running, default script is to sync all data (rides, hikes and runs).
+        # If you only want to sync data from keep to strava, and the running page display the data from strava, you need to change the "if: env.RUN_TYPE == 'keep_to_strava'" -> "if: env.RUN_TYPE == 'strava'"


nice comments

yihong0618 · 2024-04-15T10:26:28Z

README-CN.md

+        ```yaml
+        RUN_TYPE: starva
+        ```
+    - if: env.RUN_TYPE == 'keep_to_strava'改为


yihong0618 · 2024-04-15T10:28:47Z

run_page/keep_sync.py

    return tracks


-def parse_points_to_gpx(run_points_data, start_time):
+def parse_points_to_gpx(run_points_data, start_time, type):


do not name type here, type is a key word in Python
sport_type or _type

yihong0618 · 2024-04-15T10:30:27Z

run_page/keep_sync.py

@@ -161,31 +178,34 @@ def parse_raw_data_to_nametuple(
    return namedtuple("x", d.keys())(*d.values())


-def get_all_keep_tracks(email, password, old_tracks_ids, with_download_gpx=False):
+def get_all_keep_tracks(
+    email, password, old_tracks_ids, keep_sports_data_api, with_download_gpx=False


I think keep_sports_data_api is not a good name, it confuse me.

In fact, it is named this way because the variable is intended to be used to assign a value to RUN_DATA_API. Hence the inevitable ambiguity.

yihong0618 · 2024-04-15T10:30:49Z

run_page/keep_sync.py

    except:
        print(f"wrong id {keep_id}")
        pass


-def run_keep_sync(email, password, with_download_gpx=False):
+def run_keep_sync(email, password, keep_sports_data_api, with_download_gpx=False):


yihong0618 · 2024-04-15T10:31:14Z

run_page/keep_sync.py

    parser.add_argument(
        "--with-gpx",
        dest="with_gpx",
        action="store_true",
        help="get all keep data to gpx and download",
    )
    options = parser.parse_args()
-    run_keep_sync(options.phone_number, options.password, options.with_gpx)
+    for api in options.sync_types:


for _types in options.sync_types

ben-29 · 2024-04-16T13:08:50Z

.github/workflows/run_data_sync.yml

        run: |
          python run_page/keep_to_strava_sync.py ${{ secrets.KEEP_MOBILE }} ${{ secrets.KEEP_PASSWORD }} ${{ secrets.STRAVA_CLIENT_ID }} ${{ secrets.STRAVA_CLIENT_SECRET }} ${{ secrets.STRAVA_CLIENT_REFRESH_TOKEN }} --sync-types running cycling hiking
        # If you only want to sync `type running` modify args --sync-types running, default script is to sync all data (rides, hikes and runs).
-        # If you only want to sync data from keep to strava, and the running page display the data from strava, you need to change the "if: env.RUN_TYPE == 'keep_to_strava'" -> "if: env.RUN_TYPE == 'strava'"
+        # If you only want to sync data from keep to strava, and the running page display the data from strava, you need to change the "if: env.RUN_TYPE == 'keep_to_strava_sync'" -> "if: env.RUN_TYPE == 'strava'"


Is the step of changing to 'strava' outdated and unnecessary in the latest version of the code? Please update the comments

* refs/heads/upstream: add keep2strava (yihong0618#653) Add data to 'running page runners' table (yihong0618#656) style: use Tailwind CSS (yihong0618#655) feat: fill country (yihong0618#654) docs: add runner (yihong0618#651) doc: add new runner docs: update README (yihong0618#650) docs: add a comment in `src/utils/consts.ts` to remind about security considerations regarding the `MAPBOX_TOKEN` (yihong0618#644) fix: no package manager fix: tachyons-sass import error (yihong0618#639) Update README.md (yihong0618#638) Add proxy config, add keep config, change npm registry, use yarn (yihong0618#634) chore: fix typo (yihong0618#633) # Conflicts: # README-CN.md # README.md # pnpm-lock.yaml # src/components/Layout/style.module.scss # src/components/LocationStat/index.tsx # src/components/RunMap/index.tsx # src/components/RunMap/style.module.css # src/components/RunTable/RunRow.tsx # src/components/SVGStat/index.tsx # src/components/YearStat/index.tsx # src/styles/variables.scss # src/utils/const.ts # src/utils/utils.ts

* yihong0618-master: (33 commits) Fix codoon and Upload tcx_to_garmin (yihong0618#662) Update README-CN.md (yihong0618#663) add keep2strava (yihong0618#653) Add data to 'running page runners' table (yihong0618#656) style: use Tailwind CSS (yihong0618#655) feat: fill country (yihong0618#654) docs: add runner (yihong0618#651) doc: add new runner docs: update README (yihong0618#650) docs: add a comment in `src/utils/consts.ts` to remind about security considerations regarding the `MAPBOX_TOKEN` (yihong0618#644) fix: no package manager fix: tachyons-sass import error (yihong0618#639) Update README.md (yihong0618#638) Add proxy config, add keep config, change npm registry, use yarn (yihong0618#634) chore: fix typo (yihong0618#633) chore: Update package manager and ignore requirements-dev.txt (yihong0618#632) add run.drink.cafe (yihong0618#628) feat: coros sync (yihong0618#623) Fix README typo (yihong0618#624) fix: ts type error (yihong0618#622) ...

* refs/heads/upstream: (71 commits) Add laqieer's running page to README (yihong0618#672) chore: add raycast extension support (yihong0618#670) add </details> (yihong0618#669) fix the deprecation warning (yihong0618#668) Fix codoon and Upload tcx_to_garmin (yihong0618#662) Update README-CN.md (yihong0618#663) add keep2strava (yihong0618#653) Add data to 'running page runners' table (yihong0618#656) style: use Tailwind CSS (yihong0618#655) feat: fill country (yihong0618#654) docs: add runner (yihong0618#651) doc: add new runner docs: update README (yihong0618#650) docs: add a comment in `src/utils/consts.ts` to remind about security considerations regarding the `MAPBOX_TOKEN` (yihong0618#644) fix: no package manager fix: tachyons-sass import error (yihong0618#639) Update README.md (yihong0618#638) Add proxy config, add keep config, change npm registry, use yarn (yihong0618#634) chore: fix typo (yihong0618#633) chore: Update package manager and ignore requirements-dev.txt (yihong0618#632) ... # Conflicts: # run_page/gpxtrackposter/track.py # run_page/keep_sync.py

Adds keep2strava features and support for multiple sport types

add keep2strava

857b64d

Adds keep2strava features and support for multiple sport types

86d3196

vercel bot deployed to Preview April 13, 2024 11:35 View deployment

fix

cb057ab

vercel bot deployed to Preview April 13, 2024 11:41 View deployment

yihong0618 requested review from ben-29 and zhaohongxuan April 13, 2024 13:08

ben-29 reviewed Apr 13, 2024

View reviewed changes

zhaohongxuan reviewed Apr 14, 2024

View reviewed changes

SongJgit added 2 commits April 14, 2024 11:15

Add keep2strava feats to readme and run_data_sync.yml

8ef2f8c

black it

f58335c

vercel bot deployed to Preview April 14, 2024 03:18 View deployment

ben-29 reviewed Apr 14, 2024

View reviewed changes

fix

61180c9

vercel bot deployed to Preview April 14, 2024 09:00 View deployment

ben-29 requested changes Apr 14, 2024

View reviewed changes

fix

689800c

yihong0618 reviewed Apr 15, 2024

View reviewed changes

fix sport type

119cb84

vercel bot deployed to Preview April 15, 2024 11:04 View deployment

ben-29 reviewed Apr 16, 2024

View reviewed changes

fix

52f0f3d

vercel bot deployed to Preview April 17, 2024 02:15 View deployment

ben-29 approved these changes Apr 17, 2024

View reviewed changes

yihong0618 approved these changes Apr 18, 2024

View reviewed changes

yihong0618 merged commit 5d84bd4 into yihong0618:master Apr 18, 2024
6 checks passed

Kugin pushed a commit to Kugin/running_page that referenced this pull request Sep 13, 2024

add keep2strava (yihong0618#653)

b8acbfb

Adds keep2strava features and support for multiple sport types

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

add keep2strava #653

add keep2strava #653

SongJgit commented Apr 13, 2024 •

edited

Loading

yihong0618 commented Apr 13, 2024

vercel bot commented Apr 13, 2024 •

edited

Loading

SongJgit commented Apr 13, 2024 •

edited

Loading

ben-29 left a comment

ben-29 Apr 13, 2024

ben-29 Apr 13, 2024

ben-29 Apr 13, 2024

ben-29 Apr 13, 2024

ben-29 Apr 13, 2024

SongJgit Apr 14, 2024

ben-29 Apr 14, 2024

zhaohongxuan Apr 14, 2024

ben-29 Apr 14, 2024

ben-29 Apr 14, 2024

ben-29 Apr 14, 2024

ben-29 Apr 14, 2024

ben-29 Apr 14, 2024

yihong0618 Apr 15, 2024

yihong0618 Apr 15, 2024

yihong0618 Apr 15, 2024

yihong0618 Apr 15, 2024

yihong0618 Apr 15, 2024

SongJgit Apr 15, 2024

yihong0618 Apr 15, 2024

yihong0618 Apr 15, 2024

ben-29 Apr 16, 2024

		"""


		def get_all_keep_tracks(email, password, old_tracks_ids, with_download_gpx=True):



		def run_keep_sync(email, password, with_download_gpx=True):
		keep2strava_bk_path = os.path.join(OUTPUT_DIR, "keep2strava.json")

		# If you only want to sync `type running` modify args --sync-types running, default script is to sync all data (rides, hikes and runs).
		# If you only want to sync data from keep to strava, and the running page display the data from strava, you need to change the "if: env.RUN_TYPE == 'keep_to_strava'" -> "if: env.RUN_TYPE == 'strava'"

add keep2strava #653

add keep2strava #653

Conversation

SongJgit commented Apr 13, 2024 • edited Loading

yihong0618 commented Apr 13, 2024

vercel bot commented Apr 13, 2024 • edited Loading

SongJgit commented Apr 13, 2024 • edited Loading

ben-29 left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

SongJgit commented Apr 13, 2024 •

edited

Loading

vercel bot commented Apr 13, 2024 •

edited

Loading

SongJgit commented Apr 13, 2024 •

edited

Loading