Permalink
Browse files

add proxy conf and simplify the params to Scrape methods

  • Loading branch information...
hollingsworthd committed Oct 3, 2014
1 parent 3e7d761 commit df867815dd1c97bd8b3563b8cc45716740dc8919
Showing with 34,298 additions and 34,107 deletions.
  1. +1 −45 LICENSE
  2. +27 −0 api/src/com/screenslicer/api/request/Proxy.java
  3. +1 −1 api/src/com/screenslicer/api/request/Request.java
  4. BIN core/firefox-profile/Cache.Trash189597210/_CACHE_001_
  5. BIN core/firefox-profile/Cache.Trash189597210/_CACHE_002_
  6. BIN core/firefox-profile/Cache.Trash189597210/_CACHE_003_
  7. BIN core/firefox-profile/Cache.Trash189597210/_CACHE_MAP_
  8. +25,338 −24,809 core/firefox-profile/adblockplus/elemhide.css
  9. +10 −8 core/firefox-profile/adblockplus/patterns-backup1.ini
  10. +736 −8,099 core/firefox-profile/adblockplus/patterns-backup2.ini
  11. +601 −156 core/firefox-profile/adblockplus/patterns-backup3.ini
  12. +15 −14 core/firefox-profile/adblockplus/patterns-backup4.ini
  13. +967 −218 core/firefox-profile/adblockplus/patterns-backup5.ini
  14. +1,020 −243 core/firefox-profile/adblockplus/patterns.ini
  15. +45 −7 core/firefox-profile/blocklist.xml
  16. BIN core/firefox-profile/cache2/entries/0E275D13A8072D651BAD67677385AEFD94AB285A
  17. BIN core/firefox-profile/cache2/entries/15E870F01F551C7963F32D6917CB7DF1907589D2
  18. BIN core/firefox-profile/cache2/entries/1F97CCF8DC4BC320D8B476BDB61F2C67D742C3D6
  19. BIN core/firefox-profile/cache2/entries/1F9CA513941CB7F882CC6C6F3881D7038D244FDB
  20. +2,570 −0 core/firefox-profile/cache2/entries/434F5629CB3CE129D7F504AAD826EDE3BD3F4138
  21. BIN core/firefox-profile/cache2/entries/487F17B16084C4CA9124F45061BC0A7FD50DF7EC
  22. BIN core/firefox-profile/cache2/entries/4B73C481872F9D351DA0B7AE2F511C9E47815414
  23. BIN core/firefox-profile/cache2/entries/4D9C796C3F014B36AB8FAC3DA7F6622D8862685E
  24. BIN core/firefox-profile/cache2/entries/4DF5B545CDB54A712ECA391D35E7E606A40C80C4
  25. BIN core/firefox-profile/cache2/entries/50B905D23F5B4EF7594065A86C4004EA6248B352
  26. BIN core/firefox-profile/cache2/entries/6BA758A5224D294E2B255310A120B393DBC6BA04
  27. BIN core/firefox-profile/cache2/entries/6DE91603D116FA97F309881312ED907AE0C3F693
  28. BIN core/firefox-profile/cache2/entries/7D96BC3931F8AF1A539A0EF95AD5D15FDB5A2CAA
  29. BIN core/firefox-profile/cache2/entries/91E11CB510C1432D76DD05BC7B80F6543A12C7A5
  30. BIN core/firefox-profile/cache2/entries/9637E0D9DAD41187866D688E6BCB0E9CC94B6874
  31. BIN core/firefox-profile/cache2/entries/9EE6E1E634589DA91D923C6E5D4C4284063DE94E
  32. +2,457 −0 core/firefox-profile/cache2/entries/B2B378D673C0F8DE91AF511193DCC9455CBA0A3A
  33. BIN core/firefox-profile/cache2/entries/BB7ED22646D2FAC216C193A47DAE23DC713E12E4
  34. BIN core/firefox-profile/cache2/entries/C0A7F52E095832BD774CA2A5A4E859AB71E940EB
  35. BIN core/firefox-profile/cache2/entries/C964F3FFEFA8092F6E7212F738B1A27BB3CCFCDF
  36. BIN core/firefox-profile/cache2/entries/CBFD106B83AF8E5A582ED6CE5DFAD4E9D67DD138
  37. BIN core/firefox-profile/cache2/entries/CF901FB0FB73F71C4F5F7F47C59180CC5A0A4E5D
  38. BIN core/firefox-profile/cache2/entries/D53AD4CDD86800846BA833B8717DB7D56A15C279
  39. BIN core/firefox-profile/cache2/entries/D54C775110675E93CD410DA903C28EDCE0259FCC
  40. BIN core/firefox-profile/cache2/entries/D894E7667E744DF2D0B03FAE368618F9769BCD09
  41. BIN core/firefox-profile/cache2/entries/F3962AA079246DDBF6A4EEC243A4157E4853D6F3
  42. BIN core/firefox-profile/cache2/entries/F68B680A51D6081A9C8DEAC79B0EE4BF8B67BF3A
  43. BIN core/firefox-profile/cache2/entries/FA1704335949B8CCDD77DB3C9745BA8D9FD8D293
  44. BIN core/firefox-profile/cache2/entries/FAB8C2E78CF09C360CCE423998FBB234678E8E16
  45. BIN core/firefox-profile/cookies.sqlite
  46. +6 −7 core/firefox-profile/extensions.ini
  47. +1 −1 core/firefox-profile/extensions.json
  48. BIN core/firefox-profile/extensions/closeproxyauth.vaka@gmail.com.xpi
  49. BIN core/firefox-profile/healthreport.sqlite
  50. +350 −344 core/firefox-profile/localstore.rdf
  51. BIN core/firefox-profile/permissions.sqlite
  52. BIN core/firefox-profile/places.sqlite
  53. +37 −76 core/firefox-profile/prefs.js
  54. BIN core/firefox-profile/safebrowsing/goog-badbinurl-shavar.pset
  55. BIN core/firefox-profile/safebrowsing/goog-badbinurl-shavar.sbstore
  56. BIN core/firefox-profile/safebrowsing/goog-malware-shavar.pset
  57. BIN core/firefox-profile/safebrowsing/goog-malware-shavar.sbstore
  58. BIN core/firefox-profile/safebrowsing/goog-phish-shavar.pset
  59. BIN core/firefox-profile/safebrowsing/goog-phish-shavar.sbstore
  60. BIN core/firefox-profile/startupCache/startupCache.8.little
  61. +7 −0 core/screenslicer.config
  62. +2 −8 core/src/com/screenslicer/core/scrape/QueryForm.java
  63. +75 −44 core/src/com/screenslicer/core/scrape/Scrape.java
  64. +5 −5 core/src/com/screenslicer/core/service/ScreenSlicerBatch.java
  65. +7 −6 core/src/com/screenslicer/core/util/Email.java
  66. +0 −16 core/src/com/screenslicer/core/util/Util.java
  67. +20 −0 misc/EclipsePrefs.epf
View
46 LICENSE
@@ -18,56 +18,13 @@
FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License version 3
for more details.
This program incorporates and modifies other open source third party software.
THE LICENSES, DISCLAIMERS, AND COPYRIGHTS OF THE THIRD PARTY SOFTWARE ARE
INCLUDED AT THE END OF THIS LICENSE FILE. IF THROUGH ERRORS OF OMISSION ANY
THIRD PARTY SOFTWARE LICENSES, DISLCAIMERS, OR COPYRIGHTS ARE NOT NOTED,
THE AUTHORS OF SAID SOFTWARE ARE IN NO WAY LIABLE FOR MACHINE PUBLISHERS, LLC'S
ERRORS OF OMISSION AND MACHINE PUBLISHERS, LLC IS IN NO WAY LIABLE TO YOU
OR USERS, EXCEPT IF PROVIDED OTHERWISE IN THIS DOCUMENT. USE WITH CAUTION AND AT
YOUR OWN RISK, AND PERFORM DUE DILIGENCE. MACHINE PUBLISHERS, LLC IS IN NO WAY
AFFILIATED WITH AUTHORS OF ANY THIRD PARTY SOFTWARE AND DOES NOT ENDORSE THEM,
DOES NOT WARRANT THEIR WORK, AND HAS NO LIABILITY OR EVEN IMPLIED LIABILITY FOR
THEIR SOFTWARE. AND THE AUTHORS OF THE THIRD PARTY SOFTWARE HAVE NO LIABILITY OR
WARRANTY EITHER. DO NOT USE THIS PROGRAM IF YOU DO NOT ACCEPT THE CONDITIONS OF
THIS DISCLAIMER AND/OR LICENSE.
THIS PROGRAM ALSO DEPENDS ON SYSTEM LIBARIES AND CAN MAKE USE OF OTHER
AGGREGATED SOFTWARE WHOSE LICENSES ARE NOT REPRODUCED HERE. THEY ARE USED
WITH NO WARRANTY AND THE AUTHORS OF THOSE PROGRAMS AND LIBRARIES HAVE NO
LIABILITY.
UNDER NO CIRCUMSTANCES IS MACHINE PUBLISHERS, LLC RESPONSIBLE OR LIABLE FOR YOUR
USE OF THIS PROGRAM. EXCEPT IF PROVIDED OTHERWISE IN THIS DOCUMENT, YOU INDEMNIFY
THE AUTHORS AND THIRD PARTY AUTHORS FOR ANY AND ALL LIABILITY RELATED TO YOUR USE
OF THIS PROGRAM OR ASSOCIATED LICENSE TERMS. ANYONE YOU CONVEY THIS LICENSE OR
PROGRAM TO MUST ALSO INDEMNIFY THE AUTHORS, AND IF YOU FAIL TO UPHOLD THESE TERMS,
YOU WILL BE HELD LIABLE.
OTHER IMPORTANT DISLAIMERS OF WARRANTY, LIMITATIONS OF LIABILITY, AND TERMS WHICH
AFFECT YOUR RIGHTS, RECOURSE, AND REMEDIES APPEAR LATER IN THIS DOCUMENT.
"ScreenSlicer", "Machine Publishers", and "automatic, zero-config web scraping"
are trademarks of Machine Publishers, LLC and may not be infringed upon in order
to name or endorse any modifications or uses of this program, except to identify
the original author and explain copyrights. No terms of this license grant you
ability to use these trademarks, and names of any modified or aggregated projects
must not be similar or confusing. Additionally, screenslicer.com and
machinepublishers.com are based on Machine Publishers, LLC trademarks and
variations of those names may not be registered to host or direct users to any
similar or related products, services, or information.
Also, com.screenslicer.* is the official package prefix for all Java files of
ScreenSlicer, and it's important that any modified code or similar projects not
re-use this package name in a way that causes undue conflicts with the original
version, which would be a violation of trademark and/or licensing provisions
(please email the authors or discuss this in the official online forums if you
need guidance on this).
to name or endorse any modifications or uses of this program or similar ones.
The full license is as follows, preceded by conditional permissions.
CONDITIONAL PERMISSIONS
For definitions of terms, see:
@@ -156,7 +113,6 @@ been received.
END OF CONDITIONAL PERMISSIONS
GNU AFFERO GENERAL PUBLIC LICENSE
Version 3, 19 November 2007
@@ -0,0 +1,27 @@
package com.screenslicer.api.request;
import java.util.List;
import java.util.Map;
import com.screenslicer.common.CommonUtil;
public class Proxy {
public static final Proxy instance(Map<String, Object> args) {
return CommonUtil.constructFromMap(Proxy.class, args);
}
public static final List<Proxy> instances(Map<String, Object> args) {
return CommonUtil.constructListFromMap(Proxy.class, args);
}
public static final String TYPE_SOCKS_5 = "socks5";
public static final String TYPE_SOCKS_4 = "socks4";
public static final String TYPE_HTTP = "http";
public static final String TYPE_SSL = "ssl";
public String type = TYPE_SOCKS_5;
public String ip = "127.0.0.1";
public int port = 9050;
public String username = null;
public String password = null;
}
@@ -40,7 +40,7 @@ public static final Request instance(Map<String, Object> args) {
public String[] instances;
public int timeout = 25;
public boolean onionRouting = false;
public Proxy proxy = new Proxy();
public String appId;
public String jobId;
public String jobGuid;
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Oops, something went wrong.

0 comments on commit df86781

Please sign in to comment.