Merge pull request #993 from mfietz/issue/990-show-content-length

Get filesize from server

app/src/androidTest/java/de/test/antennapod/handler/FeedHandlerTest.java

@@ -172,7 +172,7 @@ public class FeedHandlerTest extends InstrumentationTestCase {
                     "http://example.com/items/" + i, new Date(i*60000), FeedItem.UNPLAYED, feed);
             feed.getItems().add(item);
             if (withFeedMedia) {
-                item.setMedia(new FeedMedia(0, item, 4711, 0, 100, "audio/mp3", null, "http://example.com/media-" + i,
+                item.setMedia(new FeedMedia(0, item, 4711, 0, 1024*1024, "audio/mp3", null, "http://example.com/media-" + i,
                         false, null, 0));
             }
         }

app/src/androidTest/java/de/test/antennapod/storage/DBTasksTest.java

@@ -67,6 +67,8 @@ public class DBTasksTest extends InstrumentationTestCase {
         SharedPreferences.Editor prefEdit = PreferenceManager.getDefaultSharedPreferences(context.getApplicationContext()).edit();
         prefEdit.putString(UserPreferences.PREF_EPISODE_CACHE_SIZE, Integer.toString(EPISODE_CACHE_SIZE));
         prefEdit.commit();
+
+        UserPreferences.init(context);
     }
 
     @FlakyTest(tolerance = 3)
@@ -261,7 +263,7 @@ public class DBTasksTest extends InstrumentationTestCase {
         }
 
         for (int i = NUM_ITEMS_OLD; i < NUM_ITEMS_NEW + NUM_ITEMS_OLD; i++) {
-            feed.getItems().add(0, new FeedItem(0, "item " + i, "id " + i, "link " + i, new Date(i), FeedItem.PLAYED, feed));
+            feed.getItems().add(0, new FeedItem(0, "item " + i, "id " + i, "link " + i, new Date(i), FeedItem.UNPLAYED, feed));
         }
 
         final Feed newFeed = DBTasks.updateFeed(context, feed)[0];
@@ -275,7 +277,6 @@ public class DBTasksTest extends InstrumentationTestCase {
         updatedFeedTest(feedFromDB, feedID, itemIDs, NUM_ITEMS_OLD, NUM_ITEMS_NEW);
     }
 
-    @FlakyTest(tolerance = 3)
     private void updatedFeedTest(final Feed newFeed, long feedID, List<Long> itemIDs, final int NUM_ITEMS_OLD, final int NUM_ITEMS_NEW) {
         assertTrue(newFeed.getId() == feedID);
         assertTrue(newFeed.getItems().size() == NUM_ITEMS_NEW + NUM_ITEMS_OLD);

app/src/main/java/de/danoeh/antennapod/PodcastApp.java

@@ -1,12 +1,14 @@
 package de.danoeh.antennapod;
 
 import android.app.Application;
+import android.content.Intent;
 import android.content.res.Configuration;
 
 import de.danoeh.antennapod.core.asynctask.PicassoProvider;
 import de.danoeh.antennapod.core.feed.EventDistributor;
 import de.danoeh.antennapod.core.preferences.PlaybackPreferences;
 import de.danoeh.antennapod.core.preferences.UserPreferences;
+import de.danoeh.antennapod.core.service.FeedMediaSizeService;
 import de.danoeh.antennapod.spa.SPAUtil;
 
 /** Main application class. */
@@ -43,6 +45,8 @@ public class PodcastApp extends Application {
 		EventDistributor.getInstance();
 
         SPAUtil.sendSPAppsQueryFeedsIntent(this);
+
+		startService(new Intent(this, FeedMediaSizeService.class));
 	}
 
 	public static float getLogicalDensity() {

app/src/main/java/de/danoeh/antennapod/adapter/AdapterUtils.java

@@ -36,18 +36,19 @@ public class AdapterUtils {
                 || state == FeedItem.State.IN_PROGRESS) {
             if (media.getDuration() > 0) {
                 episodeProgress.setVisibility(View.VISIBLE);
-                episodeProgress
+                episodeProgress.setProgress((int) (((double) media
-                        .setProgress((int) (((double) media
                                 .getPosition()) / media.getDuration() * 100));
-                txtvPos.setText(Converter
+                txtvPos.setText(Converter.getDurationStringLong(media.getDuration()
-                        .getDurationStringLong(media.getDuration()
                                 - media.getPosition()));
             }
         } else if (!media.isDownloaded()) {
+            if(media.getSize() > 0) {
                 txtvPos.setText(Converter.byteToString(media.getSize()));
             } else {
-            txtvPos.setText(Converter.getDurationStringLong(media
+                txtvPos.setText("");
-                    .getDuration()));
+            }
+        } else {
+            txtvPos.setText(Converter.getDurationStringLong(media.getDuration()));
         }
     }
 }

app/src/main/java/de/danoeh/antennapod/adapter/QueueListAdapter.java

@@ -129,7 +129,11 @@ public class QueueListAdapter extends BaseAdapter {
                     holder.progressRight.setText(Converter.getDurationStringLong(media.getDuration()));
                 }
             } else {
+                if(media.getSize() > 0) {
                     holder.progressLeft.setText(Converter.byteToString(media.getSize()));
+                } else {
+                    holder.progressLeft.setText("");
+                }
                 holder.progressRight.setText(Converter.getDurationStringLong(media.getDuration()));
                 holder.progress.setVisibility(View.GONE);
             }

core/src/main/AndroidManifest.xml

@@ -23,6 +23,9 @@
         <service
             android:name=".service.GpodnetSyncService"
             android:enabled="true" />
+        <service
+            android:name=".service.FeedMediaSizeService"
+            android:enabled="true" />
 
         <receiver
             android:name=".receiver.MediaButtonReceiver"

core/src/main/java/de/danoeh/antennapod/core/event/FeedMediaEvent.java

@@ -0,0 +1,24 @@
+package de.danoeh.antennapod.core.event;
+
+import de.danoeh.antennapod.core.feed.FeedMedia;
+
+public class FeedMediaEvent {
+
+    public enum Action {
+        UPDATE
+    }
+
+    public final Action action;
+    public final FeedMedia media;
+
+    private FeedMediaEvent(Action action, FeedMedia media) {
+        this.action = action;
+        this.media = media;
+    }
+
+    public static FeedMediaEvent update(FeedMedia media) {
+        return new FeedMediaEvent(Action.UPDATE, media);
+    }
+
+
+}

core/src/main/java/de/danoeh/antennapod/core/service/FeedMediaSizeService.java

@@ -0,0 +1,69 @@
+package de.danoeh.antennapod.core.service;
+
+import android.app.IntentService;
+import android.content.Intent;
+import android.util.Log;
+
+import java.io.File;
+import java.io.IOException;
+import java.net.HttpURLConnection;
+import java.net.URL;
+import java.util.List;
+
+import de.danoeh.antennapod.core.event.FeedMediaEvent;
+import de.danoeh.antennapod.core.feed.FeedMedia;
+import de.danoeh.antennapod.core.storage.DBReader;
+import de.danoeh.antennapod.core.storage.DBWriter;
+import de.danoeh.antennapod.core.util.NetworkUtils;
+import de.greenrobot.event.EventBus;
+
+public class FeedMediaSizeService extends IntentService {
+
+    private final static String TAG = "FeedMediaSizeService";
+
+    public FeedMediaSizeService() {
+        super(TAG);
+    }
+
+    @Override
+    protected void onHandleIntent(Intent intent) {
+        Log.d(TAG, "onHandleIntent()");
+        if(false == NetworkUtils.networkAvailable(this)) {
+            return;
+        }
+        List<FeedMedia> list = DBReader.getFeedMediaUnknownSize(this);
+        for (FeedMedia media : list) {
+            if(false == NetworkUtils.networkAvailable(this)) {
+                return;
+            }
+            long size = Integer.MIN_VALUE;
+            if(media.isDownloaded()) {
+                File mediaFile = new File(media.getLocalMediaUrl());
+                if(mediaFile.exists()) {
+                    size = mediaFile.length();
+                }
+            } else {
+                HttpURLConnection conn = null;
+                try {
+                    URL url = new URL(media.getDownload_url());
+                    conn = (HttpURLConnection) url.openConnection();
+                    conn.setRequestProperty("Accept-Encoding", "");
+                    conn.setRequestMethod("HEAD");
+                    size = conn.getContentLength();
+                    conn.disconnect();
+                } catch (IOException e) {
+                    Log.d(TAG, media.getDownload_url());
+                    e.printStackTrace();
+                } finally {
+                    if (conn != null) {
+                        conn.disconnect();
+                    }
+                }
+            }
+            media.setSize(size);
+            DBWriter.setFeedMedia(this, media);
+            EventBus.getDefault().post(FeedMediaEvent.update(media));
+        }
+    }
+
+}

core/src/main/java/de/danoeh/antennapod/core/storage/DBReader.java

@@ -550,6 +550,28 @@ public final class DBReader {
         return itemIds;
     }
 
+    /**
+     * Loads FeedMedia whose file size is unknown
+     *
+     * @param context A context that is used for opening a database connection.
+     * @return A list of FeedMedia items whose size is 0 (unknown and never tried to
+     * determine the correct size)
+     */
+    public static List<FeedMedia> getFeedMediaUnknownSize(Context context) {
+        PodDBAdapter adapter = new PodDBAdapter(context);
+        adapter.open();
+        Cursor cursor = adapter.getFeedMediaUnknownSizeCursor();
+        List<FeedMedia> result = new ArrayList<>(cursor.getCount());
+        if (cursor.moveToFirst()) {
+            do {
+                FeedMedia media = extractFeedMediaFromCursorRow(cursor);
+                result.add(media);
+            } while (cursor.moveToNext());
+        }
+        cursor.close();
+        return result;
+    }
+
 
     /**
      * Loads a list of FeedItems sorted by pubDate in descending order.

core/src/main/java/de/danoeh/antennapod/core/storage/DBTasks.java

@@ -5,6 +5,9 @@ import android.content.Intent;
 import android.database.Cursor;
 import android.util.Log;
 
+import java.io.IOException;
+import java.net.HttpURLConnection;
+import java.net.URL;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
@@ -29,6 +32,7 @@ import de.danoeh.antennapod.core.feed.FeedImage;
 import de.danoeh.antennapod.core.feed.FeedItem;
 import de.danoeh.antennapod.core.feed.FeedMedia;
 import de.danoeh.antennapod.core.preferences.UserPreferences;
+import de.danoeh.antennapod.core.service.FeedMediaSizeService;
 import de.danoeh.antennapod.core.service.GpodnetSyncService;
 import de.danoeh.antennapod.core.service.download.DownloadStatus;
 import de.danoeh.antennapod.core.service.playback.PlaybackService;
@@ -595,10 +599,9 @@ public final class DBTasks {
                             item.getIdentifyingValue());
                     if (oldItem == null) {
                         // item is new
-                        final int i = idx;
                         item.setFeed(savedFeed);
                         item.setAutoDownload(savedFeed.getPreferences().getAutoDownload());
-                        savedFeed.getItems().add(i, item);
+                        savedFeed.getItems().add(idx, item);
                         if (markNewItems) {
                             item.setNew();
                         }
@@ -629,6 +632,8 @@ public final class DBTasks {
 
         EventDistributor.getInstance().sendFeedUpdateBroadcast();
 
+        context.startService(new Intent(context, FeedMediaSizeService.class));
+
         return resultFeeds;
     }
 

core/src/main/java/de/danoeh/antennapod/core/storage/PodDBAdapter.java

@@ -1110,6 +1110,13 @@ public class PodDBAdapter {
         return db.rawQuery(query, null);
     }
 
+    public final Cursor getFeedMediaUnknownSizeCursor() {
+        final String query = "SELECT * "
+                + " FROM " + TABLE_NAME_FEED_MEDIA
+                + " WHERE " + KEY_SIZE + ">" + Integer.MIN_VALUE;
+        return db.rawQuery(query, null);
+    }
+
     /**
      * Returns a cursor which contains all items of a feed that are considered new.
      * The returned cursor uses the FEEDITEM_SEL_FI_SMALL selection.

core/src/main/java/de/danoeh/antennapod/core/syndication/namespace/NSRSS20.java

@@ -57,6 +57,10 @@ public class NSRSS20 extends Namespace {
 				long size = 0;
 				try {
 					size = Long.parseLong(attributes.getValue(ENC_LEN));
+					if(size < 16384) {
+						// less than 16kb is suspicious, check manually
+						size = 0;
+					}
 				} catch (NumberFormatException e) {
 					if (BuildConfig.DEBUG)
 						Log.d(TAG, "Length attribute could not be parsed.");