Skip to content

Commit 2ebc746

Browse files
authored
Rename and update HTML upload script for Cloudflare R2 (#51)
## Summary - Renamed `upload_to_r2.py` → `upload_html_to_r2.py` for better clarity - Updated script to use `CLOUDFLARE_R2_HTMLEXPORT_BUCKET_NAME` environment variable instead of generic `CLOUDFLARE_R2_BUCKET_NAME` - Updated all references in help text, messages, and examples ## Motivation The script now uses the correct bucket name environment variable that matches the workflow configuration in `.github/workflows/html-export-workflow.yml`. ## Test plan - [x] Tested locally by uploading 10,942 HTML files to R2 successfully - [x] Verified all environment variable references are updated - [x] Confirmed help text and messages reflect new script name 🤖 Generated with [Claude Code](https://claude.com/claude-code)
1 parent 0ce3ebb commit 2ebc746

1 file changed

Lines changed: 13 additions & 13 deletions

File tree

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -19,27 +19,27 @@ def check_required_env_vars():
1919
"""Kontrollera att alla nödvändiga miljövariabler är satta"""
2020
required_vars = [
2121
'CLOUDFLARE_R2_ACCESS_KEY_ID',
22-
'CLOUDFLARE_R2_SECRET_ACCESS_KEY',
23-
'CLOUDFLARE_R2_BUCKET_NAME',
22+
'CLOUDFLARE_R2_SECRET_ACCESS_KEY',
23+
'CLOUDFLARE_R2_HTMLEXPORT_BUCKET_NAME',
2424
'CLOUDFLARE_R2_ACCOUNT_ID'
2525
]
26-
26+
2727
missing_vars = []
2828
for var in required_vars:
2929
if not os.getenv(var):
3030
missing_vars.append(var)
31-
31+
3232
if missing_vars:
3333
print("Error: Följande miljövariabler saknas:")
3434
for var in missing_vars:
3535
print(f" - {var}")
3636
print("\nExempel på hur du sätter dem:")
3737
print("export CLOUDFLARE_R2_ACCESS_KEY_ID='your_access_key'")
3838
print("export CLOUDFLARE_R2_SECRET_ACCESS_KEY='your_secret_key'")
39-
print("export CLOUDFLARE_R2_BUCKET_NAME='your_bucket_name'")
39+
print("export CLOUDFLARE_R2_HTMLEXPORT_BUCKET_NAME='your_bucket_name'")
4040
print("export CLOUDFLARE_R2_ACCOUNT_ID='your_account_id'")
4141
return False
42-
42+
4343
print("✓ Alla nödvändiga miljövariabler är konfigurerade")
4444
return True
4545

@@ -66,7 +66,7 @@ def configure_aws_cli():
6666

6767
def upload_html_site(output_base_dir=""):
6868
"""Ladda upp hela HTML-siten (eli/ + index-sidor) till Cloudflare R2"""
69-
bucket_name = os.getenv('CLOUDFLARE_R2_BUCKET_NAME')
69+
bucket_name = os.getenv('CLOUDFLARE_R2_HTMLEXPORT_BUCKET_NAME')
7070
account_id = os.getenv('CLOUDFLARE_R2_ACCOUNT_ID')
7171
endpoint_url = f"https://{account_id}.r2.cloudflarestorage.com"
7272

@@ -121,7 +121,7 @@ def upload_html_site(output_base_dir=""):
121121

122122
def upload_index_pages(output_base_dir="", json_input_dir=None):
123123
"""Ladda upp index-sidor till Cloudflare R2"""
124-
bucket_name = os.getenv('CLOUDFLARE_R2_BUCKET_NAME')
124+
bucket_name = os.getenv('CLOUDFLARE_R2_HTMLEXPORT_BUCKET_NAME')
125125
account_id = os.getenv('CLOUDFLARE_R2_ACCOUNT_ID')
126126
endpoint_url = f"https://{account_id}.r2.cloudflarestorage.com"
127127

@@ -247,15 +247,15 @@ def upload_summary():
247247
"""Skapa och ladda upp sammanfattning"""
248248
print("Skapar och laddar upp sammanfattning...")
249249

250-
bucket_name = os.getenv('CLOUDFLARE_R2_BUCKET_NAME')
250+
bucket_name = os.getenv('CLOUDFLARE_R2_HTMLEXPORT_BUCKET_NAME')
251251
account_id = os.getenv('CLOUDFLARE_R2_ACCOUNT_ID')
252252
endpoint_url = f"https://{account_id}.r2.cloudflarestorage.com"
253253

254254
# Skapa sammanfattning
255255
summary_content = f"""HTML export completed at {datetime.datetime.now().isoformat()}
256256
Files uploaded to Cloudflare R2 bucket: {bucket_name}/
257257
Index pages uploaded: index.html (30 senaste), latest.html (10 senaste)
258-
Upload performed locally via upload_to_r2.py script
258+
Upload performed locally via upload_html_to_r2.py script
259259
"""
260260

261261
# Skriv till fil
@@ -303,8 +303,8 @@ def main():
303303
formatter_class=argparse.RawDescriptionHelpFormatter,
304304
epilog="""
305305
Exempel:
306-
python upload_to_r2.py --output-base-dir output/html_site # Ladda upp från output/html_site
307-
python upload_to_r2.py --output-base-dir output/html_site --json-dir ../sfs-jsondata # Med JSON-mapp
306+
python upload_html_to_r2.py --output-base-dir output/html_site # Ladda upp från output/html_site
307+
python upload_html_to_r2.py --output-base-dir output/html_site --json-dir ../sfs-jsondata # Med JSON-mapp
308308
"""
309309
)
310310
parser.add_argument(
@@ -359,7 +359,7 @@ def main():
359359
print()
360360
if success:
361361
print("✓ Alla filer har laddats upp till Cloudflare R2!")
362-
print(f"Bucket: {os.getenv('CLOUDFLARE_R2_BUCKET_NAME')}")
362+
print(f"Bucket: {os.getenv('CLOUDFLARE_R2_HTMLEXPORT_BUCKET_NAME')}")
363363
print(f"Källa: {args.output_base_dir}")
364364
else:
365365
print("✗ Något gick fel under uppladdningen")

0 commit comments

Comments
 (0)