Skip to content

Commit

Permalink
PodcastList dobi mp3
Browse files Browse the repository at this point in the history
  • Loading branch information
LogAnd1 committed Jan 9, 2018
1 parent fb59330 commit b101122
Show file tree
Hide file tree
Showing 4 changed files with 30 additions and 22 deletions.
21 changes: 13 additions & 8 deletions app/src/main/java/com/example/pp/podcastplayer/MainActivity.java
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
import android.content.pm.PackageManager;
import android.os.AsyncTask;
import android.os.Bundle;
import android.os.Environment;
import android.support.design.widget.NavigationView;
import android.support.v4.app.ActivityCompat;
import android.support.v4.view.GravityCompat;
Expand All @@ -21,6 +22,7 @@

import org.xmlpull.v1.XmlPullParserException;

import java.io.File;
import java.io.InputStream;
import java.net.MalformedURLException;
import java.net.URL;
Expand Down Expand Up @@ -259,26 +261,30 @@ protected Boolean doInBackground(Void... voids) {

naslov = data.naslov;
opis = data.opis;
urlMP3 =
urlMP3 = url;

slika_url = data.slika;
Log.d("aaa", slika_url);

slika = slika_url.split("/"); // Zadnji element je ime slike

if (slika_url == null) {
slika_url = "https://upload.wikimedia.org/wikipedia/commons/c/c9/Moon.jpg";
slika = slika_url.split("/"); // Zadnji element je ime slike
// String str_result= new Downloadimages().execute(slika_url).get();
Downloader d = new Downloader();
String code = d.DownloadFile(slika_url, "downloads/images", slika[slika.length - 1]);
}


} else {
slika = slika_url.split("/");
// String str_result= new Downloadimages().execute(slika_url).get();
String PATH = Environment.getExternalStorageDirectory().toString()+ "/"+"downloads/images+/" + slika;

File file = new File(PATH);

if(!file.exists()){
Downloader d = new Downloader();
String code = d.DownloadFile(slika_url, "downloads/images", slika[slika.length - 1]);
}



return true;


Expand All @@ -299,7 +305,6 @@ protected void onPostExecute(Boolean success) {

mAdapter = new MyRecyclerViewAdapter(getDataSet());
mRecyclerView.setAdapter(mAdapter);

}
}
}
Expand Down
8 changes: 3 additions & 5 deletions app/src/main/java/com/example/pp/podcastplayer/Parser.java
Original file line number Diff line number Diff line change
Expand Up @@ -106,13 +106,11 @@ public DataRSS parseData(InputStream inputStream) throws XmlPullParserException,
// Log.d("Add", naslov + opis);
// Dodamo oddajo samo v primeru da so vse ustrezne znacke pridobljene
item = new DataRSS(naslov, slika, opis);
}

naslov = null;
slika = null;
opis = null;
}
Log.d("aaa","Parse konec");
break;

itemObj = false;
}
}

Expand Down
7 changes: 4 additions & 3 deletions app/src/main/java/com/example/pp/podcastplayer/ParserMP3.java
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ public class ParserMP3 {


// Razclenjevanje podatkov
public DataRSSmp3 parseData(InputStream inputStream) throws XmlPullParserException,
public List<DataRSSmp3> parseData(InputStream inputStream) throws XmlPullParserException,
IOException {

String naslov = null;
Expand All @@ -32,7 +32,7 @@ public DataRSSmp3 parseData(InputStream inputStream) throws XmlPullParserExcepti
DataRSSmp3 item = new DataRSSmp3(naslov,mp3,opis);


List<DataRSS> items = new ArrayList<>();
List<DataRSSmp3> items = new ArrayList<>();

try {
// Uporabimo xmlPullParser
Expand Down Expand Up @@ -103,6 +103,7 @@ public DataRSSmp3 parseData(InputStream inputStream) throws XmlPullParserExcepti
// Log.d("Add", naslov + opis);
// Dodamo oddajo samo v primeru da so vse ustrezne znacke pridobljene
item = new DataRSSmp3(naslov, mp3, opis);
items.add(item);
}

naslov = null;
Expand All @@ -113,7 +114,7 @@ public DataRSSmp3 parseData(InputStream inputStream) throws XmlPullParserExcepti
}
}

return item;
return items;
} finally {
inputStream.close();
}
Expand Down
16 changes: 10 additions & 6 deletions app/src/main/java/com/example/pp/podcastplayer/PodcastList.java
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
import java.net.MalformedURLException;
import java.net.URL;
import java.util.ArrayList;
import java.util.List;

public class PodcastList extends AppCompatActivity {

Expand All @@ -31,16 +32,16 @@ public class PodcastList extends AppCompatActivity {
private RecyclerView.LayoutManager mLayoutManager;
private static String LOG_TAG = "CardViewActivity";

DataRSSmp3 data;

String naslov;
String urlMP3;
String opis;
String[] slika;
String urlRSS;
String slika_url;

int i = 0;

List<DataRSSmp3> data;

@Override
protected void onCreate(Bundle savedInstanceState) {
Expand All @@ -62,6 +63,8 @@ protected void onCreate(Bundle savedInstanceState) {
urlRSS = "Bongo";
} else {
new PodcastList.FetchFeedTask().execute((Void) null);


}
}
}
Expand Down Expand Up @@ -115,7 +118,7 @@ private class FetchFeedTask extends AsyncTask<Void, Void, Boolean> {
// Pridobimo url
protected void onPreExecute() {
url = urlRSS;
//Log.d("Add", url);
Log.d("Add", url);
}

@Override
Expand All @@ -131,9 +134,10 @@ protected Boolean doInBackground(Void... voids) {
// Log.d("Add", data.naslov);


naslov = data.naslov;
opis = data.opis;
urlMP3 = data.mp3;
naslov = data.get(0).naslov;
Log.d("Add", naslov);
opis = data.get(0).opis;
urlMP3 = data.get(0).mp3;


Log.d("d", urlMP3);
Expand Down

0 comments on commit b101122

Please sign in to comment.