Fix merge conflict with WhatCd provider and code cleanup.

app/src/main/java/org/transdroid/search/TorrentSite.java

@@ -22,6 +22,7 @@
 
 import org.transdroid.search.AsiaTorrents.AsiaTorrentsAdapter;
 import org.transdroid.search.BTN.BTNAdapter;
+import org.transdroid.search.WhatCd.WhatCdAdapter;
 import org.transdroid.search.ncore.NcoreAdapter;
 import org.transdroid.search.BitHdtv.BitHdtvAdapter;
 import org.transdroid.search.Danishbits.DanishbitsAdapter;
@@ -177,6 +178,12 @@ public ISearchAdapter getAdapter() {
 			return new TorrentLeechAdapter();
 		}
 	},
+	WhatCd {
+		@Override
+		public ISearchAdapter getAdapter() {
+			return new WhatCdAdapter();
+		}
+	},
 	YTS {
 		@Override
 		public ISearchAdapter getAdapter() {

app/src/main/java/org/transdroid/search/WhatCd/WhatCdAdapter.java

@@ -0,0 +1,285 @@
+/*
+    thismachinechills / Alex
+    GPLv3 and greater
+ */
+
+package org.transdroid.search.WhatCd;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.URLEncoder;
+import java.security.InvalidParameterException;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.Date;
+import java.util.List;
+import java.util.Locale;
+
+import javax.security.auth.login.LoginException;
+
+import org.apache.http.HttpResponse;
+import org.apache.http.HttpStatus;
+import org.apache.http.client.HttpClient;
+import org.apache.http.client.entity.UrlEncodedFormEntity;
+import org.apache.http.client.methods.HttpGet;
+import org.apache.http.client.methods.HttpPost;
+import org.apache.http.message.BasicNameValuePair;
+import org.json.JSONArray;
+import org.json.JSONException;
+import org.json.JSONObject;
+import org.transdroid.search.ISearchAdapter;
+import org.transdroid.search.SearchResult;
+import org.transdroid.search.SortOrder;
+import org.transdroid.search.TorrentSite;
+import org.transdroid.search.gui.SettingsHelper;
+import org.transdroid.util.HttpHelper;
+
+import android.content.Context;
+import android.util.Log;   
+
+/*
+ api doc @ https://github.com/WhatCD/Gazelle/wiki/JSON-API-Documentation
+*/
+
+public class WhatCdAdapter implements ISearchAdapter {
+
+    private static final String LOG_TAG = WhatCdAdapter.class.getName();
+    private static final String SITE_NAME = "What.cd";
+
+    private static final String LOGIN_URL = "https://what.cd/login.php";
+    private static final String SEARCH_URL = "https://what.cd/ajax.php?action=browse&searchstr=";
+    private static final String INDEX_URL = "https://what.cd/ajax.php?action=index";
+
+    private static final String LOGIN = "Log In";
+    private static final String LOGIN_ERROR = "Your username or password was incorrect.";
+
+    private static SimpleDateFormat DATE_FMT = new SimpleDateFormat("yyyy-dd-MM kk:mm:ss", Locale.ENGLISH);
+    private static final int MEGABYTES_IN_BYTES = 1024 * 1024;
+
+    private String authkey;
+    private String passkey;
+
+
+    private class SearchResultComparator implements Comparator<SearchResult> {
+        @Override
+        public int compare(SearchResult result1, SearchResult result2) {
+            return result2.getSeeds() - result1.getSeeds();
+        }
+    }
+
+    @Override
+    public List<SearchResult> search(Context context, String query, SortOrder order, int maxResults) throws Exception {
+        String searchString = URLEncoder.encode(query, "UTF-8");
+
+        HttpClient httpclient = prepareRequest(context);
+        HttpGet queryGet = new HttpGet(SEARCH_URL + searchString);
+
+        HttpResponse queryResult = httpclient.execute(queryGet);
+
+        if (queryResult.getStatusLine().getStatusCode() != HttpStatus.SC_OK) {
+            throw new Exception("Unsuccessful query to the What.cd JSON API");
+        }
+
+        try {
+            return getResultsFromJson(getJSON(queryResult));
+        }
+
+        catch (JSONException e) {
+            return new ArrayList<>();
+        }
+    }
+
+    @Override
+    public String buildRssFeedUrlFromSearch(String query, SortOrder order) {
+        return null;
+    }
+
+    @Override
+    public String getSiteName() {
+        return SITE_NAME;
+    }
+
+    @Override
+    public boolean isPrivateSite() {
+        return true;
+    }
+
+    @Override
+    public boolean usesToken() {
+        return false;
+    }
+
+    @Override
+    public InputStream getTorrentFile(Context context, String url) throws Exception {
+        HttpClient client = prepareRequest(context);
+        HttpResponse response = client.execute(new HttpGet(url));
+
+        return response.getEntity().getContent();
+    }
+
+    private HttpClient prepareRequest(Context context) throws JSONException, IOException, LoginException {
+        String username = SettingsHelper.getSiteUser(context, TorrentSite.WhatCd);
+        String password = SettingsHelper.getSitePass(context, TorrentSite.WhatCd);
+
+        if (username == null || password == null) {
+            throw new InvalidParameterException("No username or password was provided, while this is required for this private site.");
+        }
+
+        HttpClient client = HttpHelper.buildDefaultSearchHttpClient(false);
+        login(client, username, password);
+        retrieveKeys(client);
+
+        return client;
+    }
+
+    private List<SearchResult> getResultsFromJson(JSONObject json) throws JSONException {
+        JSONArray jsonResults = json.getJSONObject("response").getJSONArray("results");
+        jsonResults = getTorrentsFromResults(jsonResults);
+        List<SearchResult> results = new ArrayList<>();
+
+        for (int i = 0; i < jsonResults.length(); i++) {
+            JSONObject torrent = jsonResults.getJSONObject(i);
+
+            SearchResult result = new SearchResult(
+                    torrent.getString("groupName"),
+                    getTorrentUrl(torrent.getString("torrentId")),
+                    getDetailsUrl(torrent),
+                    bytesToMBytes(torrent.getString("size")),
+                    getDate(torrent),
+                    torrent.getInt("seeders"),
+                    torrent.getInt("leechers"));
+
+            results.add(result);
+        }
+
+        Collections.sort(results, new SearchResultComparator());
+
+        return results;
+    }
+
+    private String getDetailsUrl(JSONObject torrent) throws JSONException {
+        return "https://what.cd/torrents.php?id=" + torrent.getLong("groupId") + "&torrentid=" + torrent.getLong("torrentId");
+    }
+
+    private String getTorrentUrl(String torrentId) {
+        return "https://what.cd/torrents.php?action=download&id=" + torrentId + "&authkey=" + authkey + "&torrent_pass=" + passkey;
+    }
+
+    private JSONArray getTorrentsFromResults(JSONArray results) throws JSONException {
+        JSONArray jsonTorrents = new JSONArray();
+
+        for (int index = 0; index < results.length(); index++) {
+            JSONObject item = results.getJSONObject(index);
+            //Log.d(LOG_TAG, item.toString());
+
+            if (isJsonTorrent(item)) {
+                jsonTorrents.put(item);
+            }
+
+            else {
+                processTorrentGroup(jsonTorrents, item);
+            }
+
+        }
+
+        return jsonTorrents;
+    }
+
+    private void processTorrentGroup(JSONArray jsonTorrents, JSONObject item) throws JSONException {
+        boolean isMusic = item.has("artist");
+        String name = item.getString("groupName");
+
+        if (isMusic) {
+            name = item.getString("artist") + " - " + name;
+        }
+
+        JSONArray torrents = getTorrentsFromResults(item.getJSONArray("torrents"));
+        long groupId = item.getLong("groupId");
+
+        for (int index = 0; index < torrents.length(); index++) {
+            JSONObject torrent = torrents.getJSONObject(index);
+            String torrentTitle = name;
+
+            if (isJsonTorrent(torrent)) {
+                if (isMusic) {
+                    torrentTitle += " - " + torrent.getString("format") + " - " + torrent.getString("encoding");
+                }
+
+                torrent.put("groupName", torrentTitle);
+                torrent.put("groupId", groupId);
+                jsonTorrents.put(torrent);
+            }
+        }
+    }
+
+    private boolean isJsonTorrent(JSONObject json) {
+        return json.has("torrentId");
+    }
+
+    private String bytesToMBytes(String bytesString) {
+        long nbBytes;
+
+        try {
+            nbBytes = Long.parseLong(bytesString);
+        } catch (NumberFormatException e) {
+            return bytesString;
+        }
+
+        long nbMegaBytes = nbBytes / MEGABYTES_IN_BYTES;
+        long lastingBytesTruncated = (nbBytes % MEGABYTES_IN_BYTES) / 10000;
+
+        return nbMegaBytes + "." + lastingBytesTruncated + "MB";
+    }
+
+    private Date getDate(JSONObject torrent) {
+        Date date;
+        try {
+            date = DATE_FMT.parse(torrent.getString("time"));
+        } catch (ParseException | JSONException e) {
+            date = new Date();
+        }
+        return date;
+    }
+
+    private void retrieveKeys(HttpClient client) throws IOException, JSONException {
+        HttpResponse response = client.execute(new HttpGet(INDEX_URL));
+        JSONObject json = getJSON(response).getJSONObject("response");
+
+        authkey = json.getString("authkey");
+        passkey = json.getString("passkey");
+    }
+
+    private JSONObject getJSON(HttpResponse result) throws JSONException, IOException {
+        InputStream instream = result.getEntity().getContent();
+        String json = HttpHelper.convertStreamToString(instream);
+        instream.close();
+
+        return new JSONObject(json);
+    }
+
+    private void login(HttpClient client, String username, String password)
+            throws IOException, LoginException {
+        Log.d(LOG_TAG, "Attempting to login.");
+
+        HttpPost loginPost = new HttpPost(LOGIN_URL);
+        loginPost.setEntity(new UrlEncodedFormEntity(
+                Arrays.asList(
+                        new BasicNameValuePair("username", username),
+                        new BasicNameValuePair("password", password),
+                        new BasicNameValuePair("login", LOGIN)
+                )));
+        HttpResponse loginResult = client.execute(loginPost);
+        String loginHtml = HttpHelper.convertStreamToString(loginResult.getEntity().getContent());
+
+        if (loginHtml == null || loginHtml.contains(LOGIN_ERROR)) {
+            throw new LoginException("Login failure for What.cd with user " + username);
+        }
+
+        Log.d(LOG_TAG, "Successfully logged in to What.cd");
+    }
+
+}

build.gradle

@@ -1,3 +1,4 @@
+
 buildscript {
     repositories {
         jcenter()
@@ -11,4 +12,4 @@ allprojects {
     repositories {
         jcenter()
     }
-}
+}