Better logging, code cleanup, import summary.

README.md

@@ -1,14 +1,15 @@
 #Import .mbox files to Google Apps for Work
 
-This script allows Google Apps admins to import mbox files in bulk for their users.
+This script allows Google Apps admins to import mbox files in bulk for their
+users.
 
 **DISCLAIMER**: This is not an official Google product.
 
 If you want to migrate from Mozilla Thunderbird, try
 [mail-importer](https://github.com/google/mail-importer).
 
-You only authorize it once using a service account, and then it can import mail into the
-mailboxes of all users in your domain.
+You only authorize it once using a service account, and then it can import mail
+into the mailboxes of all users in your domain.
 
 ###A. Creating and authorizing a service account for Gmail API
 
@@ -17,8 +18,8 @@ and log in as a domain super administrator.
 
 2. Create a new project.
 
- * If you have not used the API console before, select **Create a project** from the
-   **Select a project** dropdown list.
+ * If you have not used the API console before, select **Create a project** from
+   the **Select a project** dropdown list.
  * If this is not your first project, use the **Create Project** button.
 
 3. Enter "Gmail API" (or any name you prefer) as the project name and press the
@@ -27,8 +28,8 @@ Service at this point.
 
 4. Click the **Enable and manage APIs** link in the **Use Google APIs** box. 
 
-5. Enable the Gmail API - Select the **Gmail API** link and press the **Enable API**
-button. You can leave the default APIs enabled - it doesn't matter.
+5. Enable the Gmail API - Select the **Gmail API** link and press the **Enable
+   API** button. You can leave the default APIs enabled - it doesn't matter.
 
 6. Click the 3-line icon (**≡**) in the top left corner of the console.
 
@@ -38,25 +39,27 @@ button. You can leave the default APIs enabled - it doesn't matter.
 
 9. Enter a name (for example, "import-mailbox") in the **Name** field.
 
-10. Check the **Furnish a new private key** box and ensure the key type is set to JSON.
+10. Check the **Furnish a new private key** box and ensure the key type is set
+    to JSON.
 
-11. Check the **Enable Google Apps Domain-wide Delegation** box and enter a name in the
-**Product name for the consent screen** field.
+11. Check the **Enable Google Apps Domain-wide Delegation** box and enter a name
+    in the **Product name for the consent screen** field.
 
-12. Click **Create**. You will see a confirmation message advising that the Service
-account JSON file has been downloaded to your computer. Make a note of the location and
-name of this file. **This JSON file contains a private key that potentially allows access
-to all users in your domain. Protect it like you'd protect your admin password. Don't
-share it with anyone.**
+12. Click **Create**. You will see a confirmation message advising that the
+    Service account JSON file has been downloaded to your computer. Make a note
+    of the location and name of this file. **This JSON file contains a private
+    key that potentially allows access to all users in your domain. Protect it
+    like you'd protect your admin password. Don't share it with anyone.**
 
 13. Click **Close**.
 
 14. Click the **View Client ID** link in the **Options** column.
 
 15. Copy the **Client ID** value. You will need this later.
 
-16. Go to [the **Manage API client access** page of the Admin console for your Google
-Apps domain](https://admin.google.com/AdminHome?chromeless=1#OGX:ManageOauthClients).
+16. Go to [the **Manage API client access** page of the Admin console for your
+    Google Apps domain]
+    (https://admin.google.com/AdminHome?chromeless=1#OGX:ManageOauthClients).
 
 17. Under **Client Name**, enter the Client ID collected in step 15.
 
@@ -66,21 +69,22 @@ Apps domain](https://admin.google.com/AdminHome?chromeless=1#OGX:ManageOauthClie
    ```
 19. Click **Authorize**.
 
-You can now use the JSON file to authorize programs to access the Gmail API "insert" and
-"label" scopes of all users in your Google Apps domain.
+You can now use the JSON file to authorize programs to access the Gmail API
+"insert" and "label" scopes of all users in your Google Apps domain.
 
 ###B. Importing mbox files using import-mailbox-to-gmail.py
 
 1. Download the script - [import-mailbox-to-gmail.py]
 (https://github.com/google/import-mailbox-to-gmail/releases/download/v1.0/import-mailbox-to-gmail.py)
 
-2. [Download](https://www.python.org/downloads/) and install Python 2.7 (not Python 3.x)
-for your operating system if needed.
+2. [Download](https://www.python.org/downloads/) and install Python 2.7 (not
+   Python 3.x) for your operating system if needed.
 
-3. Open a **Command Prompt** (CMD) window (on Windows) / **Terminal** window (on Linux).
+3. Open a **Command Prompt** (CMD) window (on Windows) / **Terminal** window
+   (on Linux).
 
-4. Install the Google API Client Libraries for Python and their dependencies by running,
-   all in one line:
+4. Install the Google API Client Libraries for Python and their dependencies by
+   running, all in one line:
 
    Mac/Linux:
    ```
@@ -92,19 +96,19 @@ for your operating system if needed.
    C:\Python27\Scripts\pip install --upgrade google-api-python-client PyOpenSSL
    ```
 
-   Note: On Windows, you may need to do this on a Command Prompt window that was
-run as Administrator.
+   **Note**: On Windows, you may need to do this on a Command Prompt window that
+   was run as Administrator.
 
 5. Create a folder for the mbox files, for example `C:\mbox`.
 
 6. Under that folder, create a folder for each of the users into which you
-intend to import the mbox files. The folder names should be the users' full
-email addresses.
+   intend to import the mbox files. The folder names should be the users' full
+   email addresses.
 
 7. Into each of the folders, copy the mbox files for that user. Make sure the
-file name format is <LabelName>.mbox. For example, if you want the messages to
-go into a label called "Imported messages", name the file
-"Imported messages.mbox".
+   file name format is <LabelName>.mbox. For example, if you want the
+   messages to go into a label called "Imported messages", name the file
+   "Imported messages.mbox".
 
   Your final folder and file structure should look like this (for example):
   ```C:\mbox
@@ -121,18 +125,20 @@ go into a label called "Imported messages", name the file
   the messages are imported correctly.
 
 8. To start the migration, run the following command (one line):
-    Mac/Linux:
+   Mac/Linux:
    ```
-   ./import-mailbox-to-gmail.py --json Credentials.json --dir C:\mbox --replaceqp >> import-mbox-to-gmail.log 2>&1
+   ./import-mailbox-to-gmail.py --json Credentials.json --dir C:\mbox
    ```
 
    Windows:
    ```
-   C:\Python27\python import-mailbox-to-gmail.py --json Credentials.json --dir C:\mbox --replaceqp >> import-mbox-to-gmail.log 2>&1
+   C:\Python27\python import-mailbox-to-gmail.py --json Credentials.json --dir C:\mbox
    ```
 
-  * Replace `Credentials.json` with the path to the JSON file from step 12 above.
+  * Replace `Credentials.json` with the path to the JSON file from step 12
+    above.
   * Replace `C:\mbox` with the path to the folder you created in step 5.
 
 The mbox files will now be imported, one by one, into the users' mailboxes. You
-can monitor the migration by viewing the import-mbox-to-gmail.log file.
+can monitor the migration by looking at the output, and inspect errors by
+viewing the `import-mailbox-to-gmail.log` file.