From 89141470683efb53c11f0073adb2c321513be049 Mon Sep 17 00:00:00 2001
From: rgerard <ryan.gerard@gmail.com>
Date: Wed, 10 Aug 2011 07:07:28 -0700
Subject: [PATCH] Only output successfully migrated posts

---
 .idea/workspace.xml                  | 44 +++++++++++++++++++++-------
 app/controllers/import_controller.rb | 11 ++++---
 app/views/import/authorized.erb      |  2 +-
 3 files changed, 42 insertions(+), 15 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 0fa3d40..df791a5 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -35,7 +35,16 @@
       <file leaf-file-name="import_controller.rb" pinned="false" current="true" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/app/controllers/import_controller.rb">
           <provider selected="true" editor-type-id="text-editor">
-            <state line="143" column="30" selection-start="3610" selection-end="3610" vertical-scroll-proportion="0.9209139">
+            <state line="111" column="4" selection-start="2634" selection-end="2634" vertical-scroll-proportion="0.31634447">
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="application.rb" pinned="false" current="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/config/application.rb">
+          <provider selected="true" editor-type-id="text-editor">
+            <state line="3" column="23" selection-start="90" selection-end="90" vertical-scroll-proportion="0.0">
               <folding />
             </state>
           </provider>
@@ -44,7 +53,7 @@
       <file leaf-file-name="start.erb" pinned="false" current="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/app/views/main/start.erb">
           <provider selected="true" editor-type-id="text-editor">
-            <state line="4" column="26" selection-start="173" selection-end="173" vertical-scroll-proportion="0.0">
+            <state line="1" column="44" selection-start="78" selection-end="78" vertical-scroll-proportion="0.0">
               <folding />
             </state>
           </provider>
@@ -62,7 +71,7 @@
       <file leaf-file-name="authorized.erb" pinned="false" current="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/app/views/import/authorized.erb">
           <provider selected="true" editor-type-id="text-editor">
-            <state line="16" column="6" selection-start="229" selection-end="229" vertical-scroll-proportion="0.0">
+            <state line="0" column="60" selection-start="60" selection-end="60" vertical-scroll-proportion="0.0">
               <folding />
             </state>
           </provider>
@@ -93,6 +102,7 @@
         <option value="$PROJECT_DIR$/config/routes.rb" />
         <option value="$PROJECT_DIR$/app/controllers/main_controller.rb" />
         <option value="$PROJECT_DIR$/app/views/main/start.erb" />
+        <option value="$PROJECT_DIR$/config/application.rb" />
         <option value="$PROJECT_DIR$/app/views/import/authorized.erb" />
         <option value="$PROJECT_DIR$/app/controllers/import_controller.rb" />
       </list>
@@ -520,7 +530,7 @@
     <servers />
   </component>
   <component name="ToolWindowManager">
-    <frame x="31" y="58" width="1286" height="710" extended-state="0" />
+    <frame x="51" y="109" width="1286" height="710" extended-state="0" />
     <editor active="true" />
     <layout>
       <window_info id="Changes" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
@@ -528,7 +538,7 @@
       <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32847896" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="true" content_ui="tabs" />
       <window_info id="Dependency Viewer" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
-      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.24960381" sideWeight="0.671521" order="0" side_tool="false" content_ui="tabs" />
+      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.24960381" sideWeight="0.6585761" order="0" side_tool="false" content_ui="tabs" />
       <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.34142396" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32847896" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
@@ -624,23 +634,37 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/app/views/import/authorized.erb">
+    <entry file="file://$PROJECT_DIR$/app/views/main/start.erb">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="16" column="6" selection-start="229" selection-end="229" vertical-scroll-proportion="0.0">
+        <state line="1" column="44" selection-start="78" selection-end="78" vertical-scroll-proportion="0.0">
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/app/views/main/start.erb">
+    <entry file="file://$PROJECT_DIR$/config/environments/development.rb">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/config/application.rb">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="3" column="23" selection-start="90" selection-end="90" vertical-scroll-proportion="0.0">
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/app/views/import/authorized.erb">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="4" column="26" selection-start="173" selection-end="173" vertical-scroll-proportion="0.0">
+        <state line="0" column="60" selection-start="60" selection-end="60" vertical-scroll-proportion="0.0">
           <folding />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/app/controllers/import_controller.rb">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="143" column="30" selection-start="3610" selection-end="3610" vertical-scroll-proportion="0.9209139">
+        <state line="111" column="4" selection-start="2634" selection-end="2634" vertical-scroll-proportion="0.31634447">
           <folding />
         </state>
       </provider>
diff --git a/app/controllers/import_controller.rb b/app/controllers/import_controller.rb
index 39a2441..35aad45 100644
--- a/app/controllers/import_controller.rb
+++ b/app/controllers/import_controller.rb
@@ -43,13 +43,13 @@ def authorized
 
   def create_blog_migration
     #blog_url = "http://www.ryangerard.net/1/feed"
-    logger.info session[:feed_url]
+    #logger.info session[:feed_url]
 
     blog_url = session[:feed_url]
     feed = get_feed(blog_url)
     @feed_arr = parse_feed(feed)
 
-    write_posts_to_tumblr(@feed_arr)
+    @feed_arr = write_posts_to_tumblr(@feed_arr)
 
     respond_to do |format|
       format.html # authorized.html.erb
@@ -106,6 +106,7 @@ def parse_feed(feed)
 
   def write_posts_to_tumblr(posts)
 
+    post_success = []
     logger.info "Starting write"
     #t_url = "http://api.tumblr.com/v2/blog/ryangerard.tumblr.com/post"
     t_url =  "http://api.tumblr.com/v2/blog/" + session[:tumblr_url] + "/post"
@@ -125,20 +126,22 @@ def write_posts_to_tumblr(posts)
 
 	    # Send the request
       logger.info "Posting new item to blog"
-      @response=@access_token.post(t_url, post_params)
+      response=@access_token.post(t_url, post_params)
 
       case response
       when Net::HTTPSuccess, Net::HTTPRedirection
 		    # OK
 		    logger.info "Success!"
+        post_success << post
       else
 		    logger.info "Failure!"
         logger.info response.message
         logger.info response.body
-        logger.info response.response_code
       end
 
     end
 
+    return post_success
+
   end
 end
diff --git a/app/views/import/authorized.erb b/app/views/import/authorized.erb
index 23d1205..6f25fee 100644
--- a/app/views/import/authorized.erb
+++ b/app/views/import/authorized.erb
@@ -1,4 +1,4 @@
-<h1>Listing posts</h1>
+<h1>The following posts were successfully migrated to Tumblr</h1>
  
 <table>
   <tr>