mirror of
				https://github.com/TeamNewPipe/NewPipe
				synced 2025-10-30 14:52:59 +00:00 
			
		
		
		
	renamed crawler into extractor
This commit is contained in:
		| @@ -2,9 +2,9 @@ package org.schabi.newpipe.services.youtube; | |||||||
| 
 | 
 | ||||||
| import android.test.AndroidTestCase; | import android.test.AndroidTestCase; | ||||||
| 
 | 
 | ||||||
| import org.schabi.newpipe.crawler.VideoPreviewInfo; | import org.schabi.newpipe.extractor.VideoPreviewInfo; | ||||||
| import org.schabi.newpipe.crawler.SearchEngine; | import org.schabi.newpipe.extractor.SearchEngine; | ||||||
| import org.schabi.newpipe.crawler.services.youtube.YoutubeSearchEngine; | import org.schabi.newpipe.extractor.services.youtube.YoutubeSearchEngine; | ||||||
| import org.schabi.newpipe.Downloader; | import org.schabi.newpipe.Downloader; | ||||||
| 
 | 
 | ||||||
| import java.util.ArrayList; | import java.util.ArrayList; | ||||||
| @@ -3,10 +3,10 @@ package org.schabi.newpipe.services.youtube; | |||||||
| import android.test.AndroidTestCase; | import android.test.AndroidTestCase; | ||||||
| 
 | 
 | ||||||
| import org.schabi.newpipe.Downloader; | import org.schabi.newpipe.Downloader; | ||||||
| import org.schabi.newpipe.crawler.CrawlingException; | import org.schabi.newpipe.extractor.CrawlingException; | ||||||
| import org.schabi.newpipe.crawler.ParsingException; | import org.schabi.newpipe.extractor.ParsingException; | ||||||
| import org.schabi.newpipe.crawler.services.youtube.YoutubeStreamExtractor; | import org.schabi.newpipe.extractor.services.youtube.YoutubeStreamExtractor; | ||||||
| import org.schabi.newpipe.crawler.VideoInfo; | import org.schabi.newpipe.extractor.VideoInfo; | ||||||
| 
 | 
 | ||||||
| import java.io.IOException; | import java.io.IOException; | ||||||
| 
 | 
 | ||||||
| @@ -3,8 +3,8 @@ package org.schabi.newpipe.services.youtube; | |||||||
| import android.test.AndroidTestCase; | import android.test.AndroidTestCase; | ||||||
| 
 | 
 | ||||||
| import org.schabi.newpipe.Downloader; | import org.schabi.newpipe.Downloader; | ||||||
| import org.schabi.newpipe.crawler.CrawlingException; | import org.schabi.newpipe.extractor.CrawlingException; | ||||||
| import org.schabi.newpipe.crawler.services.youtube.YoutubeStreamExtractor; | import org.schabi.newpipe.extractor.services.youtube.YoutubeStreamExtractor; | ||||||
| 
 | 
 | ||||||
| import java.io.IOException; | import java.io.IOException; | ||||||
| 
 | 
 | ||||||
| @@ -1,24 +1,18 @@ | |||||||
| package org.schabi.newpipe; | package org.schabi.newpipe; | ||||||
|  |  | ||||||
| import android.content.DialogInterface; |  | ||||||
| import android.content.Intent; | import android.content.Intent; | ||||||
| import android.content.SharedPreferences; | import android.content.SharedPreferences; | ||||||
| import android.graphics.Bitmap; |  | ||||||
| import android.net.Uri; |  | ||||||
| import android.os.Bundle; |  | ||||||
| import android.preference.PreferenceManager; | import android.preference.PreferenceManager; | ||||||
| import android.support.v7.app.ActionBar; | import android.support.v7.app.ActionBar; | ||||||
| import android.support.v7.app.AlertDialog; |  | ||||||
| import android.support.v7.app.AppCompatActivity; | import android.support.v7.app.AppCompatActivity; | ||||||
| import android.util.Log; | import android.util.Log; | ||||||
| import android.view.Menu; | import android.view.Menu; | ||||||
| import android.view.MenuInflater; | import android.view.MenuInflater; | ||||||
| import android.view.MenuItem; | import android.view.MenuItem; | ||||||
| import android.widget.ArrayAdapter; | import android.widget.ArrayAdapter; | ||||||
| import android.widget.Toast; |  | ||||||
|  |  | ||||||
| import org.schabi.newpipe.crawler.MediaFormat; | import org.schabi.newpipe.extractor.MediaFormat; | ||||||
| import org.schabi.newpipe.crawler.VideoInfo; | import org.schabi.newpipe.extractor.VideoInfo; | ||||||
|  |  | ||||||
| import java.util.List; | import java.util.List; | ||||||
|  |  | ||||||
|   | |||||||
| @@ -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.crawler.Downloader { | public class Downloader implements org.schabi.newpipe.extractor.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"; | ||||||
|  |  | ||||||
|   | |||||||
| @@ -7,7 +7,7 @@ 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; | import org.schabi.newpipe.extractor.VideoPreviewInfo; | ||||||
| import com.nostra13.universalimageloader.core.DisplayImageOptions; | import com.nostra13.universalimageloader.core.DisplayImageOptions; | ||||||
| import com.nostra13.universalimageloader.core.ImageLoader; | import com.nostra13.universalimageloader.core.ImageLoader; | ||||||
|  |  | ||||||
|   | |||||||
| @@ -11,8 +11,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.crawler.ServiceList; | import org.schabi.newpipe.extractor.ServiceList; | ||||||
| import org.schabi.newpipe.crawler.StreamingService; | import org.schabi.newpipe.extractor.StreamingService; | ||||||
|  |  | ||||||
|  |  | ||||||
| /** | /** | ||||||
|   | |||||||
| @@ -46,14 +46,14 @@ import com.nostra13.universalimageloader.core.listener.ImageLoadingListener; | |||||||
| import java.util.ArrayList; | import java.util.ArrayList; | ||||||
| import java.util.Vector; | import java.util.Vector; | ||||||
|  |  | ||||||
| import org.schabi.newpipe.crawler.MediaFormat; | import org.schabi.newpipe.extractor.MediaFormat; | ||||||
| import org.schabi.newpipe.crawler.ParsingException; | import org.schabi.newpipe.extractor.ParsingException; | ||||||
| import org.schabi.newpipe.crawler.ServiceList; | import org.schabi.newpipe.extractor.ServiceList; | ||||||
| import org.schabi.newpipe.crawler.StreamExtractor; | import org.schabi.newpipe.extractor.StreamExtractor; | ||||||
| import org.schabi.newpipe.crawler.VideoPreviewInfo; | import org.schabi.newpipe.extractor.VideoPreviewInfo; | ||||||
| import org.schabi.newpipe.crawler.StreamingService; | import org.schabi.newpipe.extractor.StreamingService; | ||||||
| import org.schabi.newpipe.crawler.VideoInfo; | import org.schabi.newpipe.extractor.VideoInfo; | ||||||
| import org.schabi.newpipe.crawler.services.youtube.YoutubeStreamExtractor; | import org.schabi.newpipe.extractor.services.youtube.YoutubeStreamExtractor; | ||||||
|  |  | ||||||
|  |  | ||||||
| /** | /** | ||||||
|   | |||||||
| @@ -2,7 +2,6 @@ package org.schabi.newpipe; | |||||||
|  |  | ||||||
| import android.content.Context; | import android.content.Context; | ||||||
| import android.content.Intent; | import android.content.Intent; | ||||||
| import android.media.AudioManager; |  | ||||||
| import android.os.Bundle; | import android.os.Bundle; | ||||||
| import android.preference.PreferenceManager; | import android.preference.PreferenceManager; | ||||||
| import android.support.v4.app.NavUtils; | import android.support.v4.app.NavUtils; | ||||||
| @@ -17,8 +16,8 @@ import android.view.inputmethod.InputMethodManager; | |||||||
|  |  | ||||||
| import java.util.ArrayList; | import java.util.ArrayList; | ||||||
|  |  | ||||||
| import org.schabi.newpipe.crawler.VideoPreviewInfo; | import org.schabi.newpipe.extractor.VideoPreviewInfo; | ||||||
| import org.schabi.newpipe.crawler.ServiceList; | import org.schabi.newpipe.extractor.ServiceList; | ||||||
|  |  | ||||||
| /** | /** | ||||||
|  * Copyright (C) Christian Schabesberger 2015 <chris.schabesberger@mailbox.org> |  * Copyright (C) Christian Schabesberger 2015 <chris.schabesberger@mailbox.org> | ||||||
|   | |||||||
| @@ -2,8 +2,6 @@ package org.schabi.newpipe; | |||||||
|  |  | ||||||
| import android.content.Context; | import android.content.Context; | ||||||
| import android.content.SharedPreferences; | import android.content.SharedPreferences; | ||||||
| import android.graphics.Bitmap; |  | ||||||
| import android.graphics.BitmapFactory; |  | ||||||
| import android.os.Bundle; | import android.os.Bundle; | ||||||
| import android.os.Handler; | import android.os.Handler; | ||||||
| import android.preference.PreferenceManager; | import android.preference.PreferenceManager; | ||||||
| @@ -16,14 +14,12 @@ import android.widget.ListView; | |||||||
| import android.widget.Toast; | import android.widget.Toast; | ||||||
|  |  | ||||||
| import java.io.IOException; | import java.io.IOException; | ||||||
| import java.net.URL; |  | ||||||
| import java.util.List; | import java.util.List; | ||||||
| import java.util.Vector; |  | ||||||
|  |  | ||||||
| import org.schabi.newpipe.crawler.CrawlingException; | import org.schabi.newpipe.extractor.CrawlingException; | ||||||
| import org.schabi.newpipe.crawler.VideoPreviewInfo; | import org.schabi.newpipe.extractor.VideoPreviewInfo; | ||||||
| import org.schabi.newpipe.crawler.SearchEngine; | import org.schabi.newpipe.extractor.SearchEngine; | ||||||
| import org.schabi.newpipe.crawler.StreamingService; | import org.schabi.newpipe.extractor.StreamingService; | ||||||
|  |  | ||||||
|  |  | ||||||
| /** | /** | ||||||
|   | |||||||
| @@ -8,7 +8,7 @@ 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 org.schabi.newpipe.extractor.VideoPreviewInfo; | ||||||
|  |  | ||||||
| import java.util.List; | import java.util.List; | ||||||
| import java.util.Vector; | import java.util.Vector; | ||||||
|   | |||||||
| @@ -1,4 +1,4 @@ | |||||||
| package org.schabi.newpipe.crawler; | package org.schabi.newpipe.extractor; | ||||||
| 
 | 
 | ||||||
| import android.graphics.Bitmap; | import android.graphics.Bitmap; | ||||||
| 
 | 
 | ||||||
| @@ -1,4 +1,4 @@ | |||||||
| package org.schabi.newpipe.crawler; | package org.schabi.newpipe.extractor; | ||||||
| 
 | 
 | ||||||
| /** | /** | ||||||
|  * Created by Christian Schabesberger on 30.01.16. |  * Created by Christian Schabesberger on 30.01.16. | ||||||
| @@ -1,4 +1,4 @@ | |||||||
| package org.schabi.newpipe.crawler; | package org.schabi.newpipe.extractor; | ||||||
| 
 | 
 | ||||||
| import android.util.Xml; | import android.util.Xml; | ||||||
| 
 | 
 | ||||||
| @@ -1,4 +1,4 @@ | |||||||
| package org.schabi.newpipe.crawler; | package org.schabi.newpipe.extractor; | ||||||
| 
 | 
 | ||||||
| import java.io.IOException; | import java.io.IOException; | ||||||
| 
 | 
 | ||||||
| @@ -1,4 +1,4 @@ | |||||||
| package org.schabi.newpipe.crawler; | package org.schabi.newpipe.extractor; | ||||||
| 
 | 
 | ||||||
| /** | /** | ||||||
|  * Created by Adam Howard on 08/11/15. |  * Created by Adam Howard on 08/11/15. | ||||||
| @@ -1,4 +1,4 @@ | |||||||
| package org.schabi.newpipe.crawler; | package org.schabi.newpipe.extractor; | ||||||
| 
 | 
 | ||||||
| import java.io.UnsupportedEncodingException; | import java.io.UnsupportedEncodingException; | ||||||
| import java.net.URLDecoder; | import java.net.URLDecoder; | ||||||
| @@ -1,4 +1,4 @@ | |||||||
| package org.schabi.newpipe.crawler; | package org.schabi.newpipe.extractor; | ||||||
| 
 | 
 | ||||||
| /** | /** | ||||||
|  * Created by Christian Schabesberger on 31.01.16. |  * Created by Christian Schabesberger on 31.01.16. | ||||||
| @@ -1,4 +1,4 @@ | |||||||
| package org.schabi.newpipe.crawler; | package org.schabi.newpipe.extractor; | ||||||
| 
 | 
 | ||||||
| import java.io.IOException; | import java.io.IOException; | ||||||
| import java.util.ArrayList; | import java.util.ArrayList; | ||||||
| @@ -1,8 +1,8 @@ | |||||||
| package org.schabi.newpipe.crawler; | package org.schabi.newpipe.extractor; | ||||||
| 
 | 
 | ||||||
| import android.util.Log; | import android.util.Log; | ||||||
| 
 | 
 | ||||||
| import org.schabi.newpipe.crawler.services.youtube.YoutubeService; | import org.schabi.newpipe.extractor.services.youtube.YoutubeService; | ||||||
| 
 | 
 | ||||||
| /** | /** | ||||||
|  * Created by Christian Schabesberger on 23.08.15. |  * Created by Christian Schabesberger on 23.08.15. | ||||||
| @@ -1,4 +1,4 @@ | |||||||
| package org.schabi.newpipe.crawler; | package org.schabi.newpipe.extractor; | ||||||
| 
 | 
 | ||||||
| /** | /** | ||||||
|  * Created by Christian Schabesberger on 10.08.15. |  * Created by Christian Schabesberger on 10.08.15. | ||||||
| @@ -1,4 +1,4 @@ | |||||||
| package org.schabi.newpipe.crawler; | package org.schabi.newpipe.extractor; | ||||||
| 
 | 
 | ||||||
| import java.io.IOException; | import java.io.IOException; | ||||||
| 
 | 
 | ||||||
| @@ -1,4 +1,4 @@ | |||||||
| package org.schabi.newpipe.crawler; | package org.schabi.newpipe.extractor; | ||||||
| 
 | 
 | ||||||
| import java.io.IOException; | import java.io.IOException; | ||||||
| import java.util.List; | import java.util.List; | ||||||
| @@ -1,11 +1,9 @@ | |||||||
| package org.schabi.newpipe.crawler; | package org.schabi.newpipe.extractor; | ||||||
| 
 | 
 | ||||||
| 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.crawler.AbstractVideoInfo; |  | ||||||
| 
 |  | ||||||
| /** | /** | ||||||
|  * Created by Christian Schabesberger on 26.08.15. |  * Created by Christian Schabesberger on 26.08.15. | ||||||
|  * |  * | ||||||
| @@ -1,4 +1,4 @@ | |||||||
| package org.schabi.newpipe.crawler; | package org.schabi.newpipe.extractor; | ||||||
| 
 | 
 | ||||||
| /** | /** | ||||||
|  * Created by Christian Schabesberger on 02.02.16. |  * Created by Christian Schabesberger on 02.02.16. | ||||||
| @@ -1,4 +1,4 @@ | |||||||
| package org.schabi.newpipe.crawler.services.youtube; | package org.schabi.newpipe.extractor.services.youtube; | ||||||
| 
 | 
 | ||||||
| import android.net.Uri; | import android.net.Uri; | ||||||
| import android.util.Log; | import android.util.Log; | ||||||
| @@ -6,10 +6,10 @@ 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.crawler.Downloader; | import org.schabi.newpipe.extractor.Downloader; | ||||||
| import org.schabi.newpipe.crawler.ParsingException; | import org.schabi.newpipe.extractor.ParsingException; | ||||||
| import org.schabi.newpipe.crawler.SearchEngine; | import org.schabi.newpipe.extractor.SearchEngine; | ||||||
| import org.schabi.newpipe.crawler.VideoPreviewInfo; | import org.schabi.newpipe.extractor.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; | ||||||
| @@ -1,11 +1,11 @@ | |||||||
| package org.schabi.newpipe.crawler.services.youtube; | package org.schabi.newpipe.extractor.services.youtube; | ||||||
| 
 | 
 | ||||||
| import org.schabi.newpipe.crawler.CrawlingException; | import org.schabi.newpipe.extractor.CrawlingException; | ||||||
| import org.schabi.newpipe.crawler.Downloader; | import org.schabi.newpipe.extractor.Downloader; | ||||||
| import org.schabi.newpipe.crawler.StreamExtractor; | import org.schabi.newpipe.extractor.StreamExtractor; | ||||||
| import org.schabi.newpipe.crawler.StreamingService; | import org.schabi.newpipe.extractor.StreamingService; | ||||||
| import org.schabi.newpipe.crawler.VideoUrlIdHandler; | import org.schabi.newpipe.extractor.VideoUrlIdHandler; | ||||||
| import org.schabi.newpipe.crawler.SearchEngine; | import org.schabi.newpipe.extractor.SearchEngine; | ||||||
| 
 | 
 | ||||||
| import java.io.IOException; | import java.io.IOException; | ||||||
| 
 | 
 | ||||||
| @@ -1,6 +1,5 @@ | |||||||
| package org.schabi.newpipe.crawler.services.youtube; | package org.schabi.newpipe.extractor.services.youtube; | ||||||
| 
 | 
 | ||||||
| import android.provider.MediaStore; |  | ||||||
| import android.util.Log; | import android.util.Log; | ||||||
| 
 | 
 | ||||||
| import org.json.JSONException; | import org.json.JSONException; | ||||||
| @@ -11,19 +10,17 @@ import org.jsoup.nodes.Element; | |||||||
| 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.crawler.CrawlingException; | import org.schabi.newpipe.extractor.CrawlingException; | ||||||
| import org.schabi.newpipe.crawler.Downloader; | import org.schabi.newpipe.extractor.Downloader; | ||||||
| import org.schabi.newpipe.crawler.Parser; | import org.schabi.newpipe.extractor.Parser; | ||||||
| import org.schabi.newpipe.crawler.ParsingException; | import org.schabi.newpipe.extractor.ParsingException; | ||||||
| import org.schabi.newpipe.crawler.VideoUrlIdHandler; | import org.schabi.newpipe.extractor.VideoUrlIdHandler; | ||||||
| import org.schabi.newpipe.crawler.StreamExtractor; | import org.schabi.newpipe.extractor.StreamExtractor; | ||||||
| import org.schabi.newpipe.crawler.MediaFormat; | import org.schabi.newpipe.extractor.MediaFormat; | ||||||
| import org.schabi.newpipe.crawler.VideoInfo; | import org.schabi.newpipe.extractor.VideoInfo; | ||||||
| import org.schabi.newpipe.crawler.VideoPreviewInfo; | import org.schabi.newpipe.extractor.VideoPreviewInfo; | ||||||
| 
 | 
 | ||||||
| import java.io.IOException; | import java.io.IOException; | ||||||
| import java.net.URLDecoder; |  | ||||||
| import java.util.HashMap; |  | ||||||
| import java.util.List; | import java.util.List; | ||||||
| import java.util.Map; | import java.util.Map; | ||||||
| import java.util.Vector; | import java.util.Vector; | ||||||
| @@ -1,14 +1,11 @@ | |||||||
| package org.schabi.newpipe.crawler.services.youtube; | package org.schabi.newpipe.extractor.services.youtube; | ||||||
| 
 | 
 | ||||||
| import android.util.Log; | import org.schabi.newpipe.extractor.Parser; | ||||||
| 
 | import org.schabi.newpipe.extractor.ParsingException; | ||||||
| import org.schabi.newpipe.crawler.Parser; | import org.schabi.newpipe.extractor.VideoUrlIdHandler; | ||||||
| import org.schabi.newpipe.crawler.ParsingException; |  | ||||||
| import org.schabi.newpipe.crawler.VideoUrlIdHandler; |  | ||||||
| 
 | 
 | ||||||
| import java.io.UnsupportedEncodingException; | import java.io.UnsupportedEncodingException; | ||||||
| import java.net.URLDecoder; | import java.net.URLDecoder; | ||||||
| import java.util.Map; |  | ||||||
| 
 | 
 | ||||||
| /** | /** | ||||||
|  * Created by Christian Schabesberger on 02.02.16. |  * Created by Christian Schabesberger on 02.02.16. | ||||||
		Reference in New Issue
	
	Block a user
	 Christian Schabesberger
					Christian Schabesberger