Merge pull request #92 from codl/archive-warn

warn when archive looks too big

CHANGELOG.markdown

@@ -1,3 +1,7 @@
+## v1.4.0
+
+* added warning when it looks like an archive is a full "Your Twitter data" archive
+
 ## v1.3.0
 
 Released 2018-07-06

assets/settings.js

@@ -1,4 +1,5 @@
 import Banner from '../components/Banner.html';
+import ArchiveForm from '../components/ArchiveForm.html';
 
 (function settings_init(){
     if(!('fetch' in window)){
@@ -188,4 +189,17 @@ import Banner from '../components/Banner.html';
             reason_banner.parentElement.removeChild(reason_banner);
         })
     }
+
+    let archive_form_el = document.querySelector('#archive-form');
+    if(archive_form_el){
+        let csrf_token = archive_form_el.querySelector('input[name=csrf-token]').value;
+        let archive_form = new ArchiveForm({
+            target: archive_form_el,
+            hydrate: true,
+            data: {
+                action: archive_form_el.action,
+                csrf_token: csrf_token,
+            },
+        })
+    }
 })();

assets/styles.css

@@ -76,6 +76,16 @@ img.avatar.mastodon {
     padding-top: .6rem;
     padding-bottom: .6rem;
     margin-bottom: 1rem;
+    padding-left: 1rem;
+    padding-right: 1rem;
+}
+
+.banner p {
+    margin: .3rem 0;
+}
+
+.banner p ~ p {
+    margin-top: 1.3rem;
 }
 
 body > section > .banner,

components/ArchiveForm.html

@@ -0,0 +1,49 @@
+<form action={action} method='post' enctype='multipart/form-data'>
+    {#if file_too_big}
+        <div class="banner warning">
+            <p>The file you have selected is very large.</p>
+
+            <p>Twitter has two types of archives, <b>Forget does not support
+                "Your Twitter data" archives, only "Tweet archives"</b>
+            available from
+            <a href="https://twitter.com/settings/account#export_request">your account settings</a>.
+            Please make sure you have the right type of archive.</p>
+        </div>
+    {/if}
+    <input type="file" name="file" accept="application/zip,.zip"
+        on:change="take_file(this.files)">
+    <input type="submit" value="Upload">
+    <input type='hidden' name='csrf-token' value={csrf_token}>
+</form>
+
+<script>
+function get_file_size(file_list){
+    /* returns size of selected file given an <input type="file">
+        or 0 if no file is selected */
+    let size = 0;
+    for(let i = 0; i < file_list.length; i++){
+        size += file_list[i].size;
+    }
+    return size;
+}
+
+
+export default {
+    data(){
+        return { file_size: 0 }
+    },
+
+    oncreate(){
+    },
+
+    methods: {
+        take_file(file_list){
+            this.set({file_size: get_file_size(file_list)});
+        },
+    },
+
+    computed: {
+        file_too_big: ({file_size}) => file_size > 10000000, // 10 MB
+    },
+}
+</script>

dodo.py

@@ -125,7 +125,7 @@ def task_rollup():
                 file_dep=list(chain(
                     # fuck it
                     glob('assets/*.js'),
-                    glob('components/*.html'))),
+                    glob('components/*.html'))) + ['rollup.config.js'],
                 targets=[dst],
                 clean=True,
                 actions=[

rollup.config.js

@@ -7,6 +7,7 @@ export default {
     plugins: [
         svelte({
             include: 'components/**/*.html',
+            hydratable: true,
         }),
     ]
 }

templates/logged_in.html

@@ -139,8 +139,8 @@
 
     <h2 id='tweet_archive_import'>Tweet archive import</h2>
     <p>
-    Twitter's API only lets us access up to 3200 of your most recent tweets. If you have more tweets than that, you can request a zip archive of your tweets from
+    Twitter's API only lets us access up to 3200 of your most recent tweets. If you have more tweets than that, you can request a tweet archive from
-    <a href="https://twitter.com/settings/account">Twitter's settings page</a>,
+    <a href="https://twitter.com/settings/account#export_request">your account settings</a>,
     and upload it here.
     </p>
 
@@ -148,7 +148,7 @@
     <div class="banner error">The file you uploaded is not a valid tweet archive. No posts have been imported.</div>
     {% endif %}
 
-    <form action='{{url_for('upload_tweet_archive')}}' method='post' enctype='multipart/form-data'>
+    <form action='{{url_for('upload_tweet_archive')}}' method='post' enctype='multipart/form-data' id='archive-form'>
         <input type="file" name='file' accept='application/zip,.zip'><input type="submit" value="Upload">
         <input type='hidden' name='csrf-token' value='{{g.viewer.csrf_token}}'>
     </form>