baalajimaestro/NewPipe
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases 3 Wiki Activity

renamed services into crawer

Browse source
This commit is contained in:
Christian Schabesberger 2016-01-28 21:34:35 +01:00
parent 54d318bf04
commit f8ed96bb25
21 changed files with 50 additions and 48 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/src/androidTest/java/org/schabi/newpipe/services/youtube/YoutubeSearchEngineTest.java
View file

@ -2,7 +2,7 @@ package org.schabi.newpipe.services.youtube;
import android.test.AndroidTestCase; import android.test.AndroidTestCase;
import org.schabi.newpipe.VideoPreviewInfo; import org.schabi.newpipe.crawler.VideoPreviewInfo;
import org.schabi.newpipe.services.SearchEngine; import org.schabi.newpipe.services.SearchEngine;
import java.util.ArrayList; import java.util.ArrayList;

4
app/src/main/java/org/schabi/newpipe/ActionBarHandler.java
View file

@ -16,8 +16,8 @@ import android.view.MenuInflater;
import android.view.MenuItem; import android.view.MenuItem;
import android.widget.ArrayAdapter; import android.widget.ArrayAdapter;
import org.schabi.newpipe.services.MediaFormat; import org.schabi.newpipe.crawler.MediaFormat;
import org.schabi.newpipe.services.VideoInfo; import org.schabi.newpipe.crawler.VideoInfo;
/** /**
* Created by Christian Schabesberger on 18.08.15. * Created by Christian Schabesberger on 18.08.15.

2
app/src/main/java/org/schabi/newpipe/Downloader.java
View file

@ -30,7 +30,7 @@ import info.guardianproject.netcipher.NetCipher;
* along with NewPipe. If not, see <http://www.gnu.org/licenses/>. * along with NewPipe. If not, see <http://www.gnu.org/licenses/>.
*/ */
public class Downloader implements org.schabi.newpipe.services.Downloader { public class Downloader implements org.schabi.newpipe.crawler.Downloader {
private static final String USER_AGENT = "Mozilla/5.0 (Windows NT 6.1; WOW64; rv:43.0) Gecko/20100101 Firefox/43.0"; private static final String USER_AGENT = "Mozilla/5.0 (Windows NT 6.1; WOW64; rv:43.0) Gecko/20100101 Firefox/43.0";

2
app/src/main/java/org/schabi/newpipe/VideoInfoItemViewCreator.java
View file

@ -7,6 +7,8 @@ import android.view.ViewGroup;
import android.widget.ImageView; import android.widget.ImageView;
import android.widget.TextView; import android.widget.TextView;
import org.schabi.newpipe.crawler.VideoPreviewInfo;
/** /**
* Created by Christian Schabesberger on 24.10.15. * Created by Christian Schabesberger on 24.10.15.
* *

4
app/src/main/java/org/schabi/newpipe/VideoItemDetailActivity.java
View file

@ -10,8 +10,8 @@ import android.view.Menu;
import android.view.MenuItem; import android.view.MenuItem;
import android.widget.Toast; import android.widget.Toast;
import org.schabi.newpipe.services.ServiceList; import org.schabi.newpipe.crawler.ServiceList;
import org.schabi.newpipe.services.StreamingService; import org.schabi.newpipe.crawler.StreamingService;
/** /**

10
app/src/main/java/org/schabi/newpipe/VideoItemDetailFragment.java
View file

@ -16,7 +16,6 @@ import android.support.v4.app.Fragment;
import android.support.v7.app.AppCompatActivity; import android.support.v7.app.AppCompatActivity;
import android.text.Html; import android.text.Html;
import android.text.method.LinkMovementMethod; import android.text.method.LinkMovementMethod;
import android.util.DisplayMetrics;
import android.util.Log; import android.util.Log;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.Menu; import android.view.Menu;
@ -36,10 +35,11 @@ import java.net.URL;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Vector; import java.util.Vector;
import org.schabi.newpipe.services.VideoExtractor; import org.schabi.newpipe.crawler.VideoPreviewInfo;
import org.schabi.newpipe.services.ServiceList; import org.schabi.newpipe.crawler.VideoExtractor;
import org.schabi.newpipe.services.StreamingService; import org.schabi.newpipe.crawler.ServiceList;
import org.schabi.newpipe.services.VideoInfo; import org.schabi.newpipe.crawler.StreamingService;
import org.schabi.newpipe.crawler.VideoInfo;
/** /**

3
app/src/main/java/org/schabi/newpipe/VideoItemListActivity.java
View file

@ -16,7 +16,8 @@ import android.view.inputmethod.InputMethodManager;
import java.util.ArrayList; import java.util.ArrayList;
import org.schabi.newpipe.services.ServiceList; import org.schabi.newpipe.crawler.VideoPreviewInfo;
import org.schabi.newpipe.crawler.ServiceList;
/** /**
* Copyright (C) Christian Schabesberger 2015 <chris.schabesberger@mailbox.org> * Copyright (C) Christian Schabesberger 2015 <chris.schabesberger@mailbox.org>

5
app/src/main/java/org/schabi/newpipe/VideoItemListFragment.java
View file

@ -19,8 +19,9 @@ import java.net.URL;
import java.util.List; import java.util.List;
import java.util.Vector; import java.util.Vector;
import org.schabi.newpipe.services.SearchEngine; import org.schabi.newpipe.crawler.VideoPreviewInfo;
import org.schabi.newpipe.services.StreamingService; import org.schabi.newpipe.crawler.SearchEngine;
import org.schabi.newpipe.crawler.StreamingService;
/** /**

2
app/src/main/java/org/schabi/newpipe/VideoListAdapter.java
View file

@ -9,6 +9,8 @@ import android.view.ViewGroup;
import android.widget.BaseAdapter; import android.widget.BaseAdapter;
import android.widget.ListView; import android.widget.ListView;
import org.schabi.newpipe.crawler.VideoPreviewInfo;
import java.util.List; import java.util.List;
import java.util.Vector; import java.util.Vector;

2
app/src/main/java/org/schabi/newpipe/services/AbstractVideoInfo.java → app/src/main/java/org/schabi/newpipe/crawler/AbstractVideoInfo.java
View file

@ -1,4 +1,4 @@
package org.schabi.newpipe.services; package org.schabi.newpipe.crawler;
import android.graphics.Bitmap; import android.graphics.Bitmap;

2
app/src/main/java/org/schabi/newpipe/services/Downloader.java → app/src/main/java/org/schabi/newpipe/crawler/Downloader.java
View file

@ -1,4 +1,4 @@
package org.schabi.newpipe.services; package org.schabi.newpipe.crawler;
/** /**
* Created by Christian Schabesberger on 28.01.16. * Created by Christian Schabesberger on 28.01.16.

2
app/src/main/java/org/schabi/newpipe/services/MediaFormat.java → app/src/main/java/org/schabi/newpipe/crawler/MediaFormat.java
View file

@ -1,4 +1,4 @@
package org.schabi.newpipe.services; package org.schabi.newpipe.crawler;
/** /**
* Created by Adam Howard on 08/11/15. * Created by Adam Howard on 08/11/15.

4
app/src/main/java/org/schabi/newpipe/services/SearchEngine.java → app/src/main/java/org/schabi/newpipe/crawler/SearchEngine.java
View file

@ -1,6 +1,4 @@
package org.schabi.newpipe.services; package org.schabi.newpipe.crawler;
import org.schabi.newpipe.VideoPreviewInfo;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Vector; import java.util.Vector;

4
app/src/main/java/org/schabi/newpipe/services/ServiceList.java → app/src/main/java/org/schabi/newpipe/crawler/ServiceList.java
View file

@ -1,8 +1,8 @@
package org.schabi.newpipe.services; package org.schabi.newpipe.crawler;
import android.util.Log; import android.util.Log;
import org.schabi.newpipe.services.youtube.YoutubeService; import org.schabi.newpipe.crawler.services.youtube.YoutubeService;
/** /**
* Created by Christian Schabesberger on 23.08.15. * Created by Christian Schabesberger on 23.08.15.

2
app/src/main/java/org/schabi/newpipe/services/StreamingService.java → app/src/main/java/org/schabi/newpipe/crawler/StreamingService.java
View file

@ -1,4 +1,4 @@
package org.schabi.newpipe.services; package org.schabi.newpipe.crawler;
/** /**
* Created by Christian Schabesberger on 23.08.15. * Created by Christian Schabesberger on 23.08.15.

2
app/src/main/java/org/schabi/newpipe/services/VideoExtractor.java → app/src/main/java/org/schabi/newpipe/crawler/VideoExtractor.java
View file

@ -1,4 +1,4 @@
package org.schabi.newpipe.services; package org.schabi.newpipe.crawler;
/** /**
* Created by Christian Schabesberger on 10.08.15. * Created by Christian Schabesberger on 10.08.15.

11
app/src/main/java/org/schabi/newpipe/services/VideoInfo.java → app/src/main/java/org/schabi/newpipe/crawler/VideoInfo.java
View file

@ -1,7 +1,4 @@
package org.schabi.newpipe.services; package org.schabi.newpipe.crawler;
import org.schabi.newpipe.VideoPreviewInfo;
import org.schabi.newpipe.services.AbstractVideoInfo;
import java.util.List; import java.util.List;
@ -73,7 +70,8 @@ public class VideoInfo extends AbstractVideoInfo {
this.view_count = avi.view_count; this.view_count = avi.view_count;
//todo: better than this //todo: better than this
if(avi instanceof VideoPreviewInfo) {//shitty String to convert code if(avi instanceof VideoPreviewInfo) {
//shitty String to convert code
String dur = ((VideoPreviewInfo)avi).duration; String dur = ((VideoPreviewInfo)avi).duration;
int minutes = Integer.parseInt(dur.substring(0, dur.indexOf(":"))); int minutes = Integer.parseInt(dur.substring(0, dur.indexOf(":")));
int seconds = Integer.parseInt(dur.substring(dur.indexOf(":")+1, dur.length())); int seconds = Integer.parseInt(dur.substring(dur.indexOf(":")+1, dur.length()));
@ -82,7 +80,8 @@ public class VideoInfo extends AbstractVideoInfo {
} }
public static class VideoStream { public static class VideoStream {
public String url = ""; //url of the stream //url of the stream
public String url = "";
public int format = -1; public int format = -1;
public String resolution = ""; public String resolution = "";

4
app/src/main/java/org/schabi/newpipe/VideoPreviewInfo.java → app/src/main/java/org/schabi/newpipe/crawler/VideoPreviewInfo.java
View file

@ -1,10 +1,10 @@
package org.schabi.newpipe; package org.schabi.newpipe.crawler;
import android.graphics.Bitmap; import android.graphics.Bitmap;
import android.os.Parcel; import android.os.Parcel;
import android.os.Parcelable; import android.os.Parcelable;
import org.schabi.newpipe.services.AbstractVideoInfo; import org.schabi.newpipe.crawler.AbstractVideoInfo;
/** /**
* Created by Christian Schabesberger on 26.08.15. * Created by Christian Schabesberger on 26.08.15.

8
app/src/main/java/org/schabi/newpipe/services/youtube/YoutubeSearchEngine.java → app/src/main/java/org/schabi/newpipe/crawler/services/youtube/YoutubeSearchEngine.java
View file

@ -1,4 +1,4 @@
package org.schabi.newpipe.services.youtube; package org.schabi.newpipe.crawler.services.youtube;
import android.net.Uri; import android.net.Uri;
import android.util.Log; import android.util.Log;
@ -6,9 +6,9 @@ import android.util.Log;
import org.jsoup.Jsoup; import org.jsoup.Jsoup;
import org.jsoup.nodes.Document; import org.jsoup.nodes.Document;
import org.jsoup.nodes.Element; import org.jsoup.nodes.Element;
import org.schabi.newpipe.services.Downloader; import org.schabi.newpipe.crawler.Downloader;
import org.schabi.newpipe.services.SearchEngine; import org.schabi.newpipe.crawler.SearchEngine;
import org.schabi.newpipe.VideoPreviewInfo; import org.schabi.newpipe.crawler.VideoPreviewInfo;
import org.w3c.dom.Node; import org.w3c.dom.Node;
import org.w3c.dom.NodeList; import org.w3c.dom.NodeList;
import org.xml.sax.InputSource; import org.xml.sax.InputSource;

10
app/src/main/java/org/schabi/newpipe/services/youtube/YoutubeService.java → app/src/main/java/org/schabi/newpipe/crawler/services/youtube/YoutubeService.java
View file

@ -1,9 +1,9 @@
package org.schabi.newpipe.services.youtube; package org.schabi.newpipe.crawler.services.youtube;
import org.schabi.newpipe.services.Downloader; import org.schabi.newpipe.crawler.Downloader;
import org.schabi.newpipe.services.StreamingService; import org.schabi.newpipe.crawler.StreamingService;
import org.schabi.newpipe.services.VideoExtractor; import org.schabi.newpipe.crawler.VideoExtractor;
import org.schabi.newpipe.services.SearchEngine; import org.schabi.newpipe.crawler.SearchEngine;
/** /**

13
app/src/main/java/org/schabi/newpipe/services/youtube/YoutubeVideoExtractor.java → app/src/main/java/org/schabi/newpipe/crawler/services/youtube/YoutubeVideoExtractor.java
View file

@ -1,4 +1,4 @@
package org.schabi.newpipe.services.youtube; package org.schabi.newpipe.crawler.services.youtube;
import android.util.Log; import android.util.Log;
import android.util.Xml; import android.util.Xml;
@ -12,12 +12,11 @@ import org.jsoup.parser.Parser;
import org.mozilla.javascript.Context; import org.mozilla.javascript.Context;
import org.mozilla.javascript.Function; import org.mozilla.javascript.Function;
import org.mozilla.javascript.ScriptableObject; import org.mozilla.javascript.ScriptableObject;
import org.schabi.newpipe.FileDownloader; import org.schabi.newpipe.crawler.Downloader;
import org.schabi.newpipe.services.Downloader; import org.schabi.newpipe.crawler.VideoExtractor;
import org.schabi.newpipe.services.VideoExtractor; import org.schabi.newpipe.crawler.MediaFormat;
import org.schabi.newpipe.services.MediaFormat; import org.schabi.newpipe.crawler.VideoInfo;
import org.schabi.newpipe.services.VideoInfo; import org.schabi.newpipe.crawler.VideoPreviewInfo;
import org.schabi.newpipe.VideoPreviewInfo;
import org.xmlpull.v1.XmlPullParser; import org.xmlpull.v1.XmlPullParser;
import java.io.StringReader; import java.io.StringReader;