Merge branch 'excise_reindex' of code:cdsc_reddit into excise_reindex

diff --git a/dumps/check_comments_shas.py b/dumps/check_comments_shas.py
index 199261c0c957c952246ae6b4cf43550a965597fc..dd428be658dff1cccc68f6ee4b674127444ac459 100755 (executable)
--- a/dumps/check_comments_shas.py
+++ b/dumps/check_comments_shas.py
@@ -6,7 +6,7 @@ from os import path
 import hashlib
 
 shasums1 = requests.get("https://files.pushshift.io/reddit/comments/sha256sum.txt").text
-shasums2 = requests.get("https://files.pushshift.io/reddit/comments/daily/sha256sum.txt").text
+#shasums2 = requests.get("https://files.pushshift.io/reddit/comments/daily/sha256sum.txt").text
 
 shasums = shasums1 + shasums2
 dumpdir = "/gscratch/comdata/raw_data/reddit_dumps/comments"

diff --git a/dumps/pull_pushshift_comments.sh b/dumps/pull_pushshift_comments.sh
index 40d82d817356cdb61ee0d7be3304daa1d158bcb6..ab309dd7b56c28a2a04405661b9f384c7a6bb5ed 100755 (executable)
--- a/dumps/pull_pushshift_comments.sh
+++ b/dumps/pull_pushshift_comments.sh
@@ -1,12 +1,12 @@
 #!/bin/bash
 
-user_agent='nathante teblunthuis <nathante@uw.edu>'
+user_agent='"nathante teblunthuis <nathante@uw.edu>"'
 output_dir='/gscratch/comdata/raw_data/reddit_dumps/comments'
 base_url='https://files.pushshift.io/reddit/comments/'
 
-wget -r --no-parent -A 'RC_201*.bz2' -U $user_agent -P $output_dir -nd -nc $base_url
-wget -r --no-parent -A 'RC_201*.xz' -U $user_agent -P $output_dir -nd -nc $base_url
-wget -r --no-parent -A 'RC_201*.zst' -U $user_agent -P $output_dir -nd -nc $base_url
+wget -r --no-parent -A 'RC_20*.bz2' -U $user_agent -P $output_dir -nd -nc $base_url
+wget -r --no-parent -A 'RC_20*.xz' -U $user_agent -P $output_dir -nd -nc $base_url
+wget -r --no-parent -A 'RC_20*.zst' -U $user_agent -P $output_dir -nd -nc $base_url
 
 
 ./check_comments_shas.py

diff --git a/dumps/pull_pushshift_submissions.sh b/dumps/pull_pushshift_submissions.sh
index 99d89beb341722c7bd527cac11d32ac35d3d7b27..36e6473b4f1e64bd958b80136f7dd601583074ad 100755 (executable)
--- a/dumps/pull_pushshift_submissions.sh
+++ b/dumps/pull_pushshift_submissions.sh
@@ -1,14 +1,14 @@
 #!/bin/bash
 
-user_agent='nathante teblunthuis <nathante@uw.edu>'
+user_agent='"nathante teblunthuis <nathante@uw.edu>"'
 output_dir='/gscratch/comdata/raw_data/reddit_dumps/submissions'
 base_url='https://files.pushshift.io/reddit/submissions/'
 
-wget -r --no-parent -A 'RS_20*.bz2' -U $user_agent -P $output_dir -nd -nc $base_url
-wget -r --no-parent -A 'RS_20*.xz' -U $user_agent -P $output_dir -nd -nc $base_url
-wget -r --no-parent -A 'RS_20*.zst' -U $user_agent -P $output_dir -nd -nc $base_url
-wget -r --no-parent -A 'RS_20*.bz2' -U $user_agent -P $output_dir -nd -nc $base_url/old_v1_data/
-wget -r --no-parent -A 'RS_20*.xz' -U $user_agent -P $output_dir -nd -nc $base_url/old_v1_data/
-wget -r --no-parent -A 'RS_20*.zst' -U $user_agent -P $output_dir -nd -nc $base_url/old_v1_data/
+wget -r --no-parent -A 'RS_20*.bz2' --user-agent=$user_agent -P $output_dir -nd -nc $base_url
+wget -r --no-parent -A 'RS_20*.xz' --user-agent=$user_agent -P $output_dir -nd -nc $base_url
+wget -r --no-parent -A 'RS_20*.zst' --user-agent=$user_agent -P $output_dir -nd -nc $base_url
+wget -r --no-parent -A 'RS_20*.bz2' --user-agent=$user_agent -P $output_dir -nd -nc $base_url/old_v1_data/
+wget -r --no-parent -A 'RS_20*.xz' --user-agent=$user_agent -P $output_dir -nd -nc $base_url/old_v1_data/
+wget -r --no-parent -A 'RS_20*.zst' --user-agent=$user_agent -P $output_dir -nd -nc $base_url/old_v1_data/
 
 ./check_submission_shas.py