honour umask in downloaded files

gilesknap · Jul 31, 2019 · 27407ac · 27407ac · foscoj · Oct 14, 2020
1 parent 8eab21d
commit 27407ac
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/gphotos/GooglePhotosDownload.py b/gphotos/GooglePhotosDownload.py
@@ -62,6 +62,9 @@ def __init__(self, api: RestClient, root_folder: Path, db: LocalData):
         self.pool_future_to_media = {}
         self.bad_ids = BadIds(self._root_folder)
 
+        self.current_umask = os.umask(7)
+        os.umask(self.current_umask)
+
         self._session = requests.Session()
         retries = Retry(total=5,
                         backoff_factor=0.1,
@@ -220,6 +223,7 @@ def do_download_file(self, base_url: str, media_item: DatabaseMedia):
             os.utime(str(local_full_path),
                      (Utils.safe_timestamp(media_item.modify_date),
                       Utils.safe_timestamp(media_item.create_date)))
+            os.chmod(str(local_full_path), 0o666 & ~self.current_umask)
         except KeyboardInterrupt:
             log.debug("User cancelled download thread")
             raise

diff --git a/test/test_credentials/.gphotos.token b/test/test_credentials/.gphotos.token
@@ -1 +1 @@
-{"access_token": "ya29.Gl1VB3ETG6Q7KNV5pEPAkwNSPBQTfN0hqCWL738yozvKO2iFrRmNSTsQNhweyqZRaXY7OgCjr7zqv6QdEeIuB_2f_lkezhls1E_COGbnkwOKrEGbhdgqpsNvuG8YVo0", "expires_in": 3600, "scope": ["https://www.googleapis.com/auth/photoslibrary.sharing", "https://www.googleapis.com/auth/photoslibrary.readonly"], "token_type": "Bearer", "expires_at": 1564523771.4965656, "refresh_token": "1/HG0feqbbu7FZLjztEbGneV0Jz2aNoiNYuFIHvcZ9MgQ"}
+{"access_token": "ya29.Gl1WB4CwD_sE9T0LnmkMSSjesZknrhxOdf0sJ-uxlFOgAFfPz29YbCdn05RuQ4XZEGXXdh0ykeM3HVk0ufMQTxElwBPFmvN4OmzwcAgRNI-L4DWGszwEfyt1XHt_vOo", "expires_in": 3600, "scope": ["https://www.googleapis.com/auth/photoslibrary.sharing", "https://www.googleapis.com/auth/photoslibrary.readonly"], "token_type": "Bearer", "expires_at": 1564572955.0487018, "refresh_token": "1/HG0feqbbu7FZLjztEbGneV0Jz2aNoiNYuFIHvcZ9MgQ"}
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		{"access_token": "ya29.Gl1VB3ETG6Q7KNV5pEPAkwNSPBQTfN0hqCWL738yozvKO2iFrRmNSTsQNhweyqZRaXY7OgCjr7zqv6QdEeIuB_2f_lkezhls1E_COGbnkwOKrEGbhdgqpsNvuG8YVo0", "expires_in": 3600, "scope": ["https://www.googleapis.com/auth/photoslibrary.sharing", "https://www.googleapis.com/auth/photoslibrary.readonly"], "token_type": "Bearer", "expires_at": 1564523771.4965656, "refresh_token": "1/HG0feqbbu7FZLjztEbGneV0Jz2aNoiNYuFIHvcZ9MgQ"}
		{"access_token": "ya29.Gl1WB4CwD_sE9T0LnmkMSSjesZknrhxOdf0sJ-uxlFOgAFfPz29YbCdn05RuQ4XZEGXXdh0ykeM3HVk0ufMQTxElwBPFmvN4OmzwcAgRNI-L4DWGszwEfyt1XHt_vOo", "expires_in": 3600, "scope": ["https://www.googleapis.com/auth/photoslibrary.sharing", "https://www.googleapis.com/auth/photoslibrary.readonly"], "token_type": "Bearer", "expires_at": 1564572955.0487018, "refresh_token": "1/HG0feqbbu7FZLjztEbGneV0Jz2aNoiNYuFIHvcZ9MgQ"}