- remove book if there is no book from scrapping result

transpine
1 parent 000919da
Showing 6 changed files with 67 additions and 19 deletions
app/src/main/java/net/devfac/userstory/BookShelfCursorAdapter.java
app/src/main/java/net/devfac/userstory/FSM/StateContext.java
app/src/main/java/net/devfac/userstory/FSM/state/StateSync.java
app/src/main/java/net/devfac/userstory/Utils/Database.java
app/src/main/java/net/devfac/userstory/Utils/DbOpenHelper.java
app/src/main/res/layout/fragment_addbook.xml
@@ -4,22 +4,16 @@ import android.content.Context;
 import android.database.Cursor;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
-import android.os.AsyncTask;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.CursorAdapter;
 import android.widget.ImageView;
-import android.widget.LinearLayout;
 import android.widget.TextView;
  
 import net.devfac.userstory.Utils.Database;
-import net.devfac.userstory.Utils.Logger;
  
 import java.io.File;
-import java.io.IOException;
-import java.net.MalformedURLException;
-import java.net.URL;
  
 /**
  * Adapter for database
@@ -43,7 +37,7 @@ public class BookShelfCursorAdapter extends CursorAdapter {
         ImageView shelfCoverImage = (ImageView)view.findViewById(R.id.shelf_list_item_cover);
         TextView shelfTitle = (TextView)view.findViewById(R.id.shelf_lis_item_title);
  
-        String registeredId = cursor.getString( cursor.getColumnIndex(Database.BookShelfTable.RESISTERED_ID));
+        String registeredId = cursor.getString( cursor.getColumnIndex(Database.BookShelfTable.REGISTERED_ID));
         String coverUrlAdress =  cursor.getString( cursor.getColumnIndex(Database.BookShelfTable.COVER_URL));
         String title =  cursor.getString( cursor.getColumnIndex(Database.BookShelfTable.TITLE));
  
@@ -59,6 +59,8 @@ public class StateContext {
  
     public STATE_RESULT mStateResult;
  
+    private ArrayList<BookShelfInfo> mBookShelfInfoArray;
+
     public enum STATE_RESULT{
         LOGIN_FAIL,
         LOGIN_SUCCESS,
@@ -286,6 +288,7 @@ public class StateContext {
                         ) + "1");
                     }
                 });
+                mBookShelfInfoArray = new ArrayList<>();
             }
         }
  
@@ -323,10 +326,11 @@ public class StateContext {
                         titleArray.get(index)
                 );
  
-                if( !mDbOpenHelper.exist(bookInfo.getResisteredId()) ){
-                    new DownloadCoverImage().execute(bookInfo.getCoverUrl());
-                    mDbOpenHelper.insert(bookInfo);
-                }
+                mBookShelfInfoArray.add(bookInfo);
+//                if( !mDbOpenHelper.exist(bookInfo.getResisteredId())) {
+//                    new DownloadCoverImage().execute(bookInfo.getCoverUrl());
+//                    mDbOpenHelper.insert(bookInfo);
+//                }
  
             }
  
@@ -353,6 +357,32 @@ public class StateContext {
                 });
             }
             else{
+                ArrayList<BookShelfInfo> mDbEntries = mDbOpenHelper.getAllEntries();
+
+                for( BookShelfInfo bookInfo : mBookShelfInfoArray){
+                    if( !mDbOpenHelper.exist(bookInfo.getResisteredId())) {
+                        new DownloadCoverImage().execute(bookInfo.getCoverUrl());
+                        mDbOpenHelper.insert(bookInfo);
+                    }
+                }
+
+                boolean is_contained = false;
+
+                for( BookShelfInfo dbBookInfo : mDbEntries ){
+                    for( BookShelfInfo newBookInfo : mBookShelfInfoArray){
+                        if( dbBookInfo.getResisteredId().equals(newBookInfo.getResisteredId())){
+                            is_contained = true;
+                            break;
+                        }
+                    }
+
+                    if( !is_contained ){
+                        mDbOpenHelper.delete(dbBookInfo.getResisteredId());
+                    }
+
+                    is_contained = false;
+                }
+                mStateResult = STATE_RESULT.SYNC_SUCCESS;
                 processEvent(Action.RES_SYNC, null);
             }
         }
@@ -466,7 +496,7 @@ public class StateContext {
                 Logger.i("Book Search Success");
                 mStateResult = STATE_RESULT.BOOK_SEARCH_SUCCESS;
             }
-            else{
+            else {
                 Logger.e("Book Search Fail");
                 mStateResult = STATE_RESULT.BOOK_SEARCH_FAIL;
             }
@@ -56,7 +56,9 @@ public class StateSync implements State {
  
     @Override
     public void onExit(Object output, StateContext.STATE_RESULT stateResult) {
-
+        for( StateEventListener listener:mStateContext.mStateEventListenerArray){
+            listener.onExit(this.getClass(), output, stateResult);
+        }
     }
  
     public String toString(){
@@ -9,7 +9,7 @@ import android.provider.BaseColumns;
 public class Database {
  
     public static final class BookShelfTable implements BaseColumns {
-        public static final String RESISTERED_ID = "registered_id";
+        public static final String REGISTERED_ID = "registered_id";
         public static final String COVER_URL = "cover_url";
         public static final String TITLE = "title";
  
@@ -17,7 +17,7 @@ public class Database {
         public static final String _CREATE =
                 "create table " + _TABLE_NAME + "("
                         + _ID + " integer primary key autoincrement, "
-                        + RESISTERED_ID + " text not null, "
+                        + REGISTERED_ID + " text not null, "
                         + COVER_URL + " text not null, "
                         + TITLE + " text not null );"
                 ;
@@ -10,6 +10,7 @@ import net.devfac.userstory.Constants;
 import net.devfac.userstory.types.BookShelfInfo;
  
 import java.sql.SQLException;
+import java.util.ArrayList;
  
 /**
  * Created by Onether on 15. 8. 1..
@@ -56,7 +57,7 @@ public class DbOpenHelper {
         Logger.i("insert BookShelfInfo : " + info.getTitle());
  
         ContentValues values = new ContentValues();
-        values.put(Database.BookShelfTable.RESISTERED_ID, info.getResisteredId());
+        values.put(Database.BookShelfTable.REGISTERED_ID, info.getResisteredId());
         values.put(Database.BookShelfTable.COVER_URL, info.getCoverUrl());
         values.put(Database.BookShelfTable.TITLE, info.getTitle());
  
@@ -66,14 +67,14 @@ public class DbOpenHelper {
     }
  
     public void delete(String registered_id){
-        mDB.delete(Database.BookShelfTable._TABLE_NAME, Database.BookShelfTable.RESISTERED_ID + "=?", new String[]{registered_id});
+        mDB.delete(Database.BookShelfTable._TABLE_NAME, Database.BookShelfTable.REGISTERED_ID + "=?", new String[]{registered_id});
  
         refreshCursor();
     }
  
     public boolean exist(String registed_id){
         String queryExist = String.format( "SELECT * FROM %s", Database.BookShelfTable._TABLE_NAME + " where "
-                + Database.BookShelfTable.RESISTERED_ID + " = " + registed_id);
+                + Database.BookShelfTable.REGISTERED_ID + " = " + registed_id);
         Cursor cursorExist = mDB.rawQuery(queryExist, null);
  
         if( cursorExist.getCount() <= 0){
@@ -95,4 +96,25 @@ public class DbOpenHelper {
     }
  
     public Cursor getCursor(){ return mCursor; }
+
+    public ArrayList<BookShelfInfo> getAllEntries(){
+        ArrayList<BookShelfInfo> entries = new ArrayList<>();
+
+        if( mCursor.moveToFirst() ){
+            do{
+                BookShelfInfo bookShelfInfo = new BookShelfInfo(
+                        mCursor.getString(mCursor.getColumnIndex(Database.BookShelfTable.REGISTERED_ID)),
+                        mCursor.getString(mCursor.getColumnIndex(Database.BookShelfTable.COVER_URL)),
+                        mCursor.getString(mCursor.getColumnIndex(Database.BookShelfTable.TITLE))
+                );
+
+                entries.add(bookShelfInfo);
+            }while(mCursor.moveToNext());
+        }
+        else{
+            return null;
+        }
+
+        return entries;
+    }
 }
@@ -24,7 +24,7 @@
  
     <ListView
         android:layout_width="wrap_content"
-        android:layout_height="300dp"
+        android:layout_height="wrap_content"
         android:id="@+id/list_searched_result" />
  
     <WebView