Skip to content

Updated to Swift3#23

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
juanpablofernandez wants to merge 2 commits into
base:master
Choose a base branch
from
Open

Updated to Swift3 #23

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0f6a8da
Updated to Swift 3, fixed compiler warnings and errors
t0mball Mar 16, 2017
0c7f13b
Updated to recommended settings
t0mball Mar 16, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions Hacker Swifter/Hacker Swifter/Extensions/HTMLScanner.swift
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,13 +8,13 @@

import Foundation

extension NSScanner {
func scanTag(startTag: String, endTag: String) -> String {
extension Scanner {
func scanTag(_ startTag: String, endTag: String) -> String {
var temp: NSString? = ""
var result: NSString? = ""
self.scanUpToString(startTag, intoString: &temp)
self.scanString(startTag, intoString: &temp)
self.scanUpToString(endTag, intoString: &result)
self.scanUpTo(startTag, into: &temp)
self.scanString(startTag, into: &temp)
self.scanUpTo(endTag, into: &result)
return result as! String
}
}
}
38 changes: 19 additions & 19 deletions Hacker Swifter/Hacker Swifter/Extensions/HTMLString.swift
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,29 +9,29 @@
import Foundation

extension String {
static func stringByRemovingHTMLEntities(string: String) -> String {
static func stringByRemovingHTMLEntities(_ string: String) -> String {
var result = string

result = result.stringByReplacingOccurrencesOfString("<p>", withString: "\n\n", options: .CaseInsensitiveSearch, range: nil)
result = result.stringByReplacingOccurrencesOfString("</p>", withString: "", options: .CaseInsensitiveSearch, range: nil)
result = result.stringByReplacingOccurrencesOfString("<i>", withString: "", options: .CaseInsensitiveSearch, range: nil)
result = result.stringByReplacingOccurrencesOfString("</i>", withString: "", options: .CaseInsensitiveSearch, range: nil)
result = result.stringByReplacingOccurrencesOfString("&#38;", withString: "&", options: .CaseInsensitiveSearch, range: nil)
result = result.stringByReplacingOccurrencesOfString("&#62;", withString: ">", options: .CaseInsensitiveSearch, range: nil)
result = result.stringByReplacingOccurrencesOfString("&#x27;", withString: "'", options: .CaseInsensitiveSearch, range: nil)
result = result.stringByReplacingOccurrencesOfString("&#x2F;", withString: "/", options: .CaseInsensitiveSearch, range: nil)
result = result.stringByReplacingOccurrencesOfString("&quot;", withString: "\"", options: .CaseInsensitiveSearch, range: nil)
result = result.stringByReplacingOccurrencesOfString("&#60;", withString: "<", options: .CaseInsensitiveSearch, range: nil)
result = result.stringByReplacingOccurrencesOfString("&lt;", withString: "<", options: .CaseInsensitiveSearch, range: nil)
result = result.stringByReplacingOccurrencesOfString("&gt;", withString: ">", options: .CaseInsensitiveSearch, range: nil)
result = result.stringByReplacingOccurrencesOfString("&amp;", withString: "&", options: .CaseInsensitiveSearch, range: nil)
result = result.stringByReplacingOccurrencesOfString("<pre><code>", withString: "", options: .CaseInsensitiveSearch, range: nil)
result = result.stringByReplacingOccurrencesOfString("</code></pre>", withString: "", options: .CaseInsensitiveSearch, range: nil)
result = result.replacingOccurrences(of: "<p>", with: "\n\n", options: .caseInsensitive, range: nil)
result = result.replacingOccurrences(of: "</p>", with: "", options: .caseInsensitive, range: nil)
result = result.replacingOccurrences(of: "<i>", with: "", options: .caseInsensitive, range: nil)
result = result.replacingOccurrences(of: "</i>", with: "", options: .caseInsensitive, range: nil)
result = result.replacingOccurrences(of: "&#38;", with: "&", options: .caseInsensitive, range: nil)
result = result.replacingOccurrences(of: "&#62;", with: ">", options: .caseInsensitive, range: nil)
result = result.replacingOccurrences(of: "&#x27;", with: "'", options: .caseInsensitive, range: nil)
result = result.replacingOccurrences(of: "&#x2F;", with: "/", options: .caseInsensitive, range: nil)
result = result.replacingOccurrences(of: "&quot;", with: "\"", options: .caseInsensitive, range: nil)
result = result.replacingOccurrences(of: "&#60;", with: "<", options: .caseInsensitive, range: nil)
result = result.replacingOccurrences(of: "&lt;", with: "<", options: .caseInsensitive, range: nil)
result = result.replacingOccurrences(of: "&gt;", with: ">", options: .caseInsensitive, range: nil)
result = result.replacingOccurrences(of: "&amp;", with: "&", options: .caseInsensitive, range: nil)
result = result.replacingOccurrences(of: "<pre><code>", with: "", options: .caseInsensitive, range: nil)
result = result.replacingOccurrences(of: "</code></pre>", with: "", options: .caseInsensitive, range: nil)

let regex = try? NSRegularExpression(pattern: "<a[^>]+href=\"(.*?)\"[^>]*>.*?</a>",
options: NSRegularExpressionOptions.CaseInsensitive)
result = regex!.stringByReplacingMatchesInString(result, options: [], range: NSMakeRange(0, result.utf16.count), withTemplate: "$1")
options: NSRegularExpression.Options.caseInsensitive)
result = regex!.stringByReplacingMatches(in: result, options: [], range: NSMakeRange(0, result.utf16.count), withTemplate: "$1")

return result
}
}
}
91 changes: 46 additions & 45 deletions Hacker Swifter/Hacker Swifter/HTTP/Cache.swift
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -14,32 +14,32 @@ private let _DiskCache = DiskCache()

public typealias cacheCompletion = (AnyObject!) -> Void

public class Cache {
open class Cache {

public class var sharedCache: Cache {
open class var sharedCache: Cache {
return _Cache
}

init() {

}

public class func generateCacheKey(path: String) -> String {
open class func generateCacheKey(_ path: String) -> String {
if (path == "") {
return "root"
}
return path.stringByReplacingOccurrencesOfString("/",
withString: "#", options: NSStringCompareOptions.CaseInsensitiveSearch, range: nil)
return path.replacingOccurrences(of: "/",
with: "#", options: NSString.CompareOptions.caseInsensitive, range: nil)
}

public func setObject(object: AnyObject, key: String) {
if (object.conformsToProtocol(NSCoding)) {
open func setObject(_ object: AnyObject, key: String) {
if (object.conforms(to: NSCoding.self)) {
MemoryCache.sharedMemoryCache.setObject(object, key: key)
DiskCache.sharedDiskCache.setObject(object, key: key)
}
}

public func objectForKey(key: String, completion: cacheCompletion) {
open func objectForKey(_ key: String, completion: cacheCompletion) {
MemoryCache.sharedMemoryCache.objectForKey(key, completion: {(object: AnyObject!) in
if let realObject: AnyObject = object {
completion(realObject)
Expand All@@ -52,63 +52,64 @@ public class Cache {
})
}

public func objectForKeySync(key: String) -> AnyObject! {
open func objectForKeySync(_ key: String) -> AnyObject! {
let ramObject: AnyObject! = MemoryCache.sharedMemoryCache.objectForKeySync(key)
return (ramObject != nil) ? ramObject : DiskCache.sharedDiskCache.objectForKeySync(key)
}

public func removeObject(key: String) {
open func removeObject(_ key: String) {
MemoryCache.sharedMemoryCache.removeObject(key)
DiskCache.sharedDiskCache.removeObject(key)
}

public func removeAllObject() {
open func removeAllObject() {
MemoryCache.sharedMemoryCache.removeAllObject()
DiskCache.sharedDiskCache.removeAllObject()
}
}

public class DiskCache: Cache {
open class DiskCache: Cache {

private struct files {
fileprivate struct files {
static var filepath: String {
let manager = NSFileManager.defaultManager()
var paths = NSSearchPathForDirectoriesInDomains(NSSearchPathDirectory.CachesDirectory,
NSSearchPathDomainMask.UserDomainMask, true)
let manager = FileManager.default
var paths = NSSearchPathForDirectoriesInDomains(FileManager.SearchPathDirectory.cachesDirectory,
FileManager.SearchPathDomainMask.userDomainMask, true)
let cachePath = paths[0] + "/modelCache/"
if (!manager.fileExistsAtPath(cachePath)) {
if (!manager.fileExists(atPath: cachePath)) {
do {
try manager.createDirectoryAtPath(cachePath, withIntermediateDirectories: true, attributes: nil)
try manager.createDirectory(atPath: cachePath, withIntermediateDirectories: true, attributes: nil)
} catch _ {
}
}
return cachePath
}
}

private let priority = DISPATCH_QUEUE_PRIORITY_DEFAULT
fileprivate let priority = DispatchQoS.QoSClass.default


public class var sharedDiskCache: Cache {
open class var sharedDiskCache: Cache {
return _DiskCache
}

override init() {

}

public func fullPath(key: String) -> String {
open func fullPath(_ key: String) -> String {
return files.filepath + key
}

public func objectExist(key: String) -> Bool {
return NSFileManager.defaultManager().fileExistsAtPath(fullPath(key))
open func objectExist(_ key: String) -> Bool {
return FileManager.default.fileExists(atPath: fullPath(key))
}

public override func objectForKey(key: String, completion: cacheCompletion) {
open func objectForKey(_ key: String, completion: @escaping cacheCompletion) {
if (self.objectExist(key)) {
dispatch_async(dispatch_get_global_queue(self.priority, UInt(0)), { ()->() in
let object: AnyObject! = NSKeyedUnarchiver.unarchiveObjectWithFile(self.fullPath(key))
dispatch_async(dispatch_get_main_queue(), { ()->() in
DispatchQueue.global(qos: self.priority).async(execute: { ()->() in
let object: AnyObject! = NSKeyedUnarchiver.unarchiveObject(withFile: self.fullPath(key)) as AnyObject!
DispatchQueue.main.async(execute: { ()->() in
completion(object)
})
})
Expand All@@ -118,60 +119,60 @@ public class DiskCache: Cache {
}
}

public override func objectForKeySync(key: String) -> AnyObject! {
open override func objectForKeySync(_ key: String) -> AnyObject! {
if (self.objectExist(key)) {
return NSKeyedUnarchiver.unarchiveObjectWithFile(self.fullPath(key))
return NSKeyedUnarchiver.unarchiveObject(withFile: self.fullPath(key)) as AnyObject!
}
return nil
}

public override func setObject(object: AnyObject, key: String) {
open override func setObject(_ object: AnyObject, key: String) {
NSKeyedArchiver.archiveRootObject(object, toFile: self.fullPath(key))
}

public override func removeObject(key: String) {
open override func removeObject(_ key: String) {
if (self.objectExist(key)) {
do {
try NSFileManager.defaultManager().removeItemAtPath(self.fullPath(key))
try FileManager.default.removeItem(atPath: self.fullPath(key))
} catch _ {
}
}
}

public override func removeAllObject() {
open override func removeAllObject() {

}
}

public class MemoryCache: Cache {
open class MemoryCache: Cache {

private var memoryCache = NSCache()
fileprivate var memoryCache = NSCache<AnyObject, AnyObject>()

public class var sharedMemoryCache: Cache {
open class var sharedMemoryCache: Cache {
return _MemoryCache
}

override init() {

}

public override func objectForKeySync(key: String) -> AnyObject! {
return self.memoryCache.objectForKey(key)
open override func objectForKeySync(_ key: String) -> AnyObject! {
return self.memoryCache.object(forKey: key as AnyObject)
}

public override func objectForKey(key: String, completion: cacheCompletion) {
completion(self.memoryCache.objectForKey(key))
open override func objectForKey(_ key: String, completion: cacheCompletion) {
completion(self.memoryCache.object(forKey: key as AnyObject))
}

public override func setObject(object: AnyObject, key: String) {
self.memoryCache.setObject(object, forKey: key)
open override func setObject(_ object: AnyObject, key: String) {
self.memoryCache.setObject(object, forKey: key as AnyObject)
}

public override func removeObject(key: String) {
self.memoryCache.removeObjectForKey(key)
open override func removeObject(_ key: String) {
self.memoryCache.removeObject(forKey: key as AnyObject)
}

public override func removeAllObject() {
open override func removeAllObject() {
self.memoryCache.removeAllObjects()
}

Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all 
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Updated to Swift3 by juanpablofernandez · Pull Request #23 · Dimillian/HackerSwifter · GitHub
Skip to content
Updated to Swift3#23

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Open

juanpablofernandez
wants to merge
2
commits into

base:master
Choose a base branch

from

 Open


Updated to Swift3
#23
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
0f6a8da

Updated to Swift 3, fixed compiler warnings and errors


t0mball Mar 16, 2017
0c7f13b

Updated to recommended settings


t0mball Mar 16, 2017

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


12 changes: 6 additions & 6 deletions
Hacker Swifter/Hacker Swifter/Extensions/HTMLScanner.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,13 +8,13 @@

import Foundation

extension NSScanner {
 func scanTag(startTag: String, endTag: String) -> String {
extension Scanner {
 func scanTag(_ startTag: String, endTag: String) -> String {
 var temp: NSString? = ""
 var result: NSString? = ""
 self.scanUpToString(startTag, intoString: &temp)
 self.scanString(startTag, intoString: &temp)
 self.scanUpToString(endTag, intoString: &result)
 self.scanUpTo(startTag, into: &temp)
 self.scanString(startTag, into: &temp)
 self.scanUpTo(endTag, into: &result)
 return result as! String
 }
}
}

38 changes: 19 additions & 19 deletions
Hacker Swifter/Hacker Swifter/Extensions/HTMLString.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,29 +9,29 @@
import Foundation

extension String {
 static func stringByRemovingHTMLEntities(string: String) -> String {
 static func stringByRemovingHTMLEntities(_ string: String) -> String {
 var result = string

 result = result.stringByReplacingOccurrencesOfString("<p>", withString: "\n\n", options: .CaseInsensitiveSearch, range: nil)
 result = result.stringByReplacingOccurrencesOfString("</p>", withString: "", options: .CaseInsensitiveSearch, range: nil)
 result = result.stringByReplacingOccurrencesOfString("<i>", withString: "", options: .CaseInsensitiveSearch, range: nil)
 result = result.stringByReplacingOccurrencesOfString("</i>", withString: "", options: .CaseInsensitiveSearch, range: nil)
 result = result.stringByReplacingOccurrencesOfString("&#38;", withString: "&", options: .CaseInsensitiveSearch, range: nil)
 result = result.stringByReplacingOccurrencesOfString("&#62;", withString: ">", options: .CaseInsensitiveSearch, range: nil)
 result = result.stringByReplacingOccurrencesOfString("&#x27;", withString: "'", options: .CaseInsensitiveSearch, range: nil)
 result = result.stringByReplacingOccurrencesOfString("&#x2F;", withString: "/", options: .CaseInsensitiveSearch, range: nil)
 result = result.stringByReplacingOccurrencesOfString("&quot;", withString: "\"", options: .CaseInsensitiveSearch, range: nil)
 result = result.stringByReplacingOccurrencesOfString("&#60;", withString: "<", options: .CaseInsensitiveSearch, range: nil)
 result = result.stringByReplacingOccurrencesOfString("&lt;", withString: "<", options: .CaseInsensitiveSearch, range: nil)
 result = result.stringByReplacingOccurrencesOfString("&gt;", withString: ">", options: .CaseInsensitiveSearch, range: nil)
 result = result.stringByReplacingOccurrencesOfString("&amp;", withString: "&", options: .CaseInsensitiveSearch, range: nil)
 result = result.stringByReplacingOccurrencesOfString("<pre><code>", withString: "", options: .CaseInsensitiveSearch, range: nil)
 result = result.stringByReplacingOccurrencesOfString("</code></pre>", withString: "", options: .CaseInsensitiveSearch, range: nil)
 result = result.replacingOccurrences(of: "<p>", with: "\n\n", options: .caseInsensitive, range: nil)
 result = result.replacingOccurrences(of: "</p>", with: "", options: .caseInsensitive, range: nil)
 result = result.replacingOccurrences(of: "<i>", with: "", options: .caseInsensitive, range: nil)
 result = result.replacingOccurrences(of: "</i>", with: "", options: .caseInsensitive, range: nil)
 result = result.replacingOccurrences(of: "&#38;", with: "&", options: .caseInsensitive, range: nil)
 result = result.replacingOccurrences(of: "&#62;", with: ">", options: .caseInsensitive, range: nil)
 result = result.replacingOccurrences(of: "&#x27;", with: "'", options: .caseInsensitive, range: nil)
 result = result.replacingOccurrences(of: "&#x2F;", with: "/", options: .caseInsensitive, range: nil)
 result = result.replacingOccurrences(of: "&quot;", with: "\"", options: .caseInsensitive, range: nil)
 result = result.replacingOccurrences(of: "&#60;", with: "<", options: .caseInsensitive, range: nil)
 result = result.replacingOccurrences(of: "&lt;", with: "<", options: .caseInsensitive, range: nil)
 result = result.replacingOccurrences(of: "&gt;", with: ">", options: .caseInsensitive, range: nil)
 result = result.replacingOccurrences(of: "&amp;", with: "&", options: .caseInsensitive, range: nil)
 result = result.replacingOccurrences(of: "<pre><code>", with: "", options: .caseInsensitive, range: nil)
 result = result.replacingOccurrences(of: "</code></pre>", with: "", options: .caseInsensitive, range: nil)

 let regex = try? NSRegularExpression(pattern: "<a[^>]+href=\"(.*?)\"[^>]*>.*?</a>",
 options: NSRegularExpressionOptions.CaseInsensitive)
 result = regex!.stringByReplacingMatchesInString(result, options: [], range: NSMakeRange(0, result.utf16.count), withTemplate: "$1")
 options: NSRegularExpression.Options.caseInsensitive)
 result = regex!.stringByReplacingMatches(in: result, options: [], range: NSMakeRange(0, result.utf16.count), withTemplate: "$1")

 return result
 }
}
}

91 changes: 46 additions & 45 deletions
Hacker Swifter/Hacker Swifter/HTTP/Cache.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,32 +14,32 @@ private let _DiskCache = DiskCache()

public typealias cacheCompletion = (AnyObject!) -> Void

public class Cache {
open class Cache {

public class var sharedCache: Cache {
open class var sharedCache: Cache {
 return _Cache
 }

 init() {

 }

public class func generateCacheKey(path: String) -> String {
open class func generateCacheKey(_ path: String) -> String {
 if (path == "") {
 return "root"
 }
 return path.stringByReplacingOccurrencesOfString("/",
withString: "#", options: NSStringCompareOptions.CaseInsensitiveSearch, range: nil)
 return path.replacingOccurrences(of: "/",
with: "#", options: NSString.CompareOptions.caseInsensitive, range: nil)
 }

public func setObject(object: AnyObject, key: String) {
 if (object.conformsToProtocol(NSCoding)) {
open func setObject(_ object: AnyObject, key: String) {
 if (object.conforms(to: NSCoding.self)) {
 MemoryCache.sharedMemoryCache.setObject(object, key: key)
 DiskCache.sharedDiskCache.setObject(object, key: key)
 }
 }

public func objectForKey(key: String, completion: cacheCompletion) {
open func objectForKey(_ key: String, completion: cacheCompletion) {
 MemoryCache.sharedMemoryCache.objectForKey(key, completion: {(object: AnyObject!) in
 if let realObject: AnyObject = object {
 completion(realObject)
Expand All@@ -52,63 +52,64 @@ public class Cache {
 })
 }

public func objectForKeySync(key: String) -> AnyObject! {
open func objectForKeySync(_ key: String) -> AnyObject! {
 let ramObject: AnyObject! = MemoryCache.sharedMemoryCache.objectForKeySync(key)
 return (ramObject != nil) ? ramObject : DiskCache.sharedDiskCache.objectForKeySync(key)
 }

public func removeObject(key: String) {
open func removeObject(_ key: String) {
 MemoryCache.sharedMemoryCache.removeObject(key)
 DiskCache.sharedDiskCache.removeObject(key)
 }

public func removeAllObject() {
open func removeAllObject() {
 MemoryCache.sharedMemoryCache.removeAllObject()
 DiskCache.sharedDiskCache.removeAllObject()
 }
}

public class DiskCache: Cache {
open class DiskCache: Cache {

private struct files {
fileprivate struct files {
 static var filepath: String {
 let manager = NSFileManager.defaultManager()
 var paths = NSSearchPathForDirectoriesInDomains(NSSearchPathDirectory.CachesDirectory,
NSSearchPathDomainMask.UserDomainMask, true)
 let manager = FileManager.default
 var paths = NSSearchPathForDirectoriesInDomains(FileManager.SearchPathDirectory.cachesDirectory,
FileManager.SearchPathDomainMask.userDomainMask, true)
 let cachePath = paths[0] + "/modelCache/"
 if (!manager.fileExistsAtPath(cachePath)) {
 if (!manager.fileExists(atPath: cachePath)) {
 do {
 try manager.createDirectoryAtPath(cachePath, withIntermediateDirectories: true, attributes: nil)
 try manager.createDirectory(atPath: cachePath, withIntermediateDirectories: true, attributes: nil)
 } catch _ {
 }
 }
 return cachePath
 }
 }

 private let priority = DISPATCH_QUEUE_PRIORITY_DEFAULT
 fileprivate let priority = DispatchQoS.QoSClass.default


public class var sharedDiskCache: Cache {
open class var sharedDiskCache: Cache {
 return _DiskCache
 }

 override init() {

 }

public func fullPath(key: String) -> String {
open func fullPath(_ key: String) -> String {
 return files.filepath + key
 }

public func objectExist(key: String) -> Bool {
 return NSFileManager.defaultManager().fileExistsAtPath(fullPath(key))
open func objectExist(_ key: String) -> Bool {
 return FileManager.default.fileExists(atPath: fullPath(key))
 }

public override func objectForKey(key: String, completion: cacheCompletion) {
open func objectForKey(_ key: String, completion: @escaping cacheCompletion) {
 if (self.objectExist(key)) {
dispatch_async(dispatch_get_global_queue(self.priority, UInt(0)), { ()->() in
 let object: AnyObject! = NSKeyedUnarchiver.unarchiveObjectWithFile(self.fullPath(key))
dispatch_async(dispatch_get_main_queue(), { ()->() in
DispatchQueue.global(qos: self.priority).async(execute: { ()->() in
 let object: AnyObject! = NSKeyedUnarchiver.unarchiveObject(withFile: self.fullPath(key)) as AnyObject!
DispatchQueue.main.async(execute: { ()->() in
 completion(object)
 })
 })
Expand All@@ -118,60 +119,60 @@ public class DiskCache: Cache {
 }
 }

public override func objectForKeySync(key: String) -> AnyObject! {
open override func objectForKeySync(_ key: String) -> AnyObject! {
 if (self.objectExist(key)) {
 return NSKeyedUnarchiver.unarchiveObjectWithFile(self.fullPath(key))
 return NSKeyedUnarchiver.unarchiveObject(withFile: self.fullPath(key)) as AnyObject!
 }
 return nil
 }

public override func setObject(object: AnyObject, key: String) {
open override func setObject(_ object: AnyObject, key: String) {
 NSKeyedArchiver.archiveRootObject(object, toFile: self.fullPath(key))
 }

public override func removeObject(key: String) {
open override func removeObject(_ key: String) {
 if (self.objectExist(key)) {
 do {
 try NSFileManager.defaultManager().removeItemAtPath(self.fullPath(key))
 try FileManager.default.removeItem(atPath: self.fullPath(key))
 } catch _ {
 }
 }
 }

public override func removeAllObject() {
open override func removeAllObject() {

 }
}

public class MemoryCache: Cache {
open class MemoryCache: Cache {

private var memoryCache = NSCache()
fileprivate var memoryCache = NSCache<AnyObject, AnyObject>()

public class var sharedMemoryCache: Cache {
open class var sharedMemoryCache: Cache {
 return _MemoryCache
 }

 override init() {

 }

public override func objectForKeySync(key: String) -> AnyObject! {
 return self.memoryCache.objectForKey(key)
open override func objectForKeySync(_ key: String) -> AnyObject! {
 return self.memoryCache.object(forKey: key as AnyObject)
 }

public override func objectForKey(key: String, completion: cacheCompletion) {
 completion(self.memoryCache.objectForKey(key))
open override func objectForKey(_ key: String, completion: cacheCompletion) {
 completion(self.memoryCache.object(forKey: key as AnyObject))
 }

public override func setObject(object: AnyObject, key: String) {
 self.memoryCache.setObject(object, forKey: key)
open override func setObject(_ object: AnyObject, key: String) {
 self.memoryCache.setObject(object, forKey: key as AnyObject)
 }

public override func removeObject(key: String) {
 self.memoryCache.removeObjectForKey(key)
open override func removeObject(_ key: String) {
 self.memoryCache.removeObject(forKey: key as AnyObject)
 }

public override func removeAllObject() {
open override func removeAllObject() {
 self.memoryCache.removeAllObjects()
 }

Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Force GitHub README to respect dark mode
(function() {
var style = document.createElement('style');
style.textContent = '
.markdown-body {
color-scheme: dark light;
}
.markdown-body pre { background: #161b22 !important; }
.markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }
.markdown-body table th, .markdown-body table td { border-color: #30363d !important; }
.markdown-body img { background: #0d1117; }
.markdown-body blockquote { border-left-color: #8b949e; }
.markdown-body hr { border-color: #30363d; }
';
document.head.appendChild(style);
})();
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Updated to Swift3 by juanpablofernandez · Pull Request #23 · Dimillian/HackerSwifter · GitHub
Skip to content
Updated to Swift3#23

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Open

juanpablofernandez
wants to merge
2
commits into

base:master
Choose a base branch

from

 Open


Updated to Swift3
#23
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
0f6a8da

Updated to Swift 3, fixed compiler warnings and errors


t0mball Mar 16, 2017
0c7f13b

Updated to recommended settings


t0mball Mar 16, 2017

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


12 changes: 6 additions & 6 deletions
Hacker Swifter/Hacker Swifter/Extensions/HTMLScanner.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,13 +8,13 @@

import Foundation

extension NSScanner {
 func scanTag(startTag: String, endTag: String) -> String {
extension Scanner {
 func scanTag(_ startTag: String, endTag: String) -> String {
 var temp: NSString? = ""
 var result: NSString? = ""
 self.scanUpToString(startTag, intoString: &temp)
 self.scanString(startTag, intoString: &temp)
 self.scanUpToString(endTag, intoString: &result)
 self.scanUpTo(startTag, into: &temp)
 self.scanString(startTag, into: &temp)
 self.scanUpTo(endTag, into: &result)
 return result as! String
 }
}
}

38 changes: 19 additions & 19 deletions
Hacker Swifter/Hacker Swifter/Extensions/HTMLString.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,29 +9,29 @@
import Foundation

extension String {
 static func stringByRemovingHTMLEntities(string: String) -> String {
 static func stringByRemovingHTMLEntities(_ string: String) -> String {
 var result = string

 result = result.stringByReplacingOccurrencesOfString("<p>", withString: "\n\n", options: .CaseInsensitiveSearch, range: nil)
 result = result.stringByReplacingOccurrencesOfString("</p>", withString: "", options: .CaseInsensitiveSearch, range: nil)
 result = result.stringByReplacingOccurrencesOfString("<i>", withString: "", options: .CaseInsensitiveSearch, range: nil)
 result = result.stringByReplacingOccurrencesOfString("</i>", withString: "", options: .CaseInsensitiveSearch, range: nil)
 result = result.stringByReplacingOccurrencesOfString("&#38;", withString: "&", options: .CaseInsensitiveSearch, range: nil)
 result = result.stringByReplacingOccurrencesOfString("&#62;", withString: ">", options: .CaseInsensitiveSearch, range: nil)
 result = result.stringByReplacingOccurrencesOfString("&#x27;", withString: "'", options: .CaseInsensitiveSearch, range: nil)
 result = result.stringByReplacingOccurrencesOfString("&#x2F;", withString: "/", options: .CaseInsensitiveSearch, range: nil)
 result = result.stringByReplacingOccurrencesOfString("&quot;", withString: "\"", options: .CaseInsensitiveSearch, range: nil)
 result = result.stringByReplacingOccurrencesOfString("&#60;", withString: "<", options: .CaseInsensitiveSearch, range: nil)
 result = result.stringByReplacingOccurrencesOfString("&lt;", withString: "<", options: .CaseInsensitiveSearch, range: nil)
 result = result.stringByReplacingOccurrencesOfString("&gt;", withString: ">", options: .CaseInsensitiveSearch, range: nil)
 result = result.stringByReplacingOccurrencesOfString("&amp;", withString: "&", options: .CaseInsensitiveSearch, range: nil)
 result = result.stringByReplacingOccurrencesOfString("<pre><code>", withString: "", options: .CaseInsensitiveSearch, range: nil)
 result = result.stringByReplacingOccurrencesOfString("</code></pre>", withString: "", options: .CaseInsensitiveSearch, range: nil)
 result = result.replacingOccurrences(of: "<p>", with: "\n\n", options: .caseInsensitive, range: nil)
 result = result.replacingOccurrences(of: "</p>", with: "", options: .caseInsensitive, range: nil)
 result = result.replacingOccurrences(of: "<i>", with: "", options: .caseInsensitive, range: nil)
 result = result.replacingOccurrences(of: "</i>", with: "", options: .caseInsensitive, range: nil)
 result = result.replacingOccurrences(of: "&#38;", with: "&", options: .caseInsensitive, range: nil)
 result = result.replacingOccurrences(of: "&#62;", with: ">", options: .caseInsensitive, range: nil)
 result = result.replacingOccurrences(of: "&#x27;", with: "'", options: .caseInsensitive, range: nil)
 result = result.replacingOccurrences(of: "&#x2F;", with: "/", options: .caseInsensitive, range: nil)
 result = result.replacingOccurrences(of: "&quot;", with: "\"", options: .caseInsensitive, range: nil)
 result = result.replacingOccurrences(of: "&#60;", with: "<", options: .caseInsensitive, range: nil)
 result = result.replacingOccurrences(of: "&lt;", with: "<", options: .caseInsensitive, range: nil)
 result = result.replacingOccurrences(of: "&gt;", with: ">", options: .caseInsensitive, range: nil)
 result = result.replacingOccurrences(of: "&amp;", with: "&", options: .caseInsensitive, range: nil)
 result = result.replacingOccurrences(of: "<pre><code>", with: "", options: .caseInsensitive, range: nil)
 result = result.replacingOccurrences(of: "</code></pre>", with: "", options: .caseInsensitive, range: nil)

 let regex = try? NSRegularExpression(pattern: "<a[^>]+href=\"(.*?)\"[^>]*>.*?</a>",
 options: NSRegularExpressionOptions.CaseInsensitive)
 result = regex!.stringByReplacingMatchesInString(result, options: [], range: NSMakeRange(0, result.utf16.count), withTemplate: "$1")
 options: NSRegularExpression.Options.caseInsensitive)
 result = regex!.stringByReplacingMatches(in: result, options: [], range: NSMakeRange(0, result.utf16.count), withTemplate: "$1")

 return result
 }
}
}

91 changes: 46 additions & 45 deletions
Hacker Swifter/Hacker Swifter/HTTP/Cache.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,32 +14,32 @@ private let _DiskCache = DiskCache()

public typealias cacheCompletion = (AnyObject!) -> Void

public class Cache {
open class Cache {

public class var sharedCache: Cache {
open class var sharedCache: Cache {
 return _Cache
 }

 init() {

 }

public class func generateCacheKey(path: String) -> String {
open class func generateCacheKey(_ path: String) -> String {
 if (path == "") {
 return "root"
 }
 return path.stringByReplacingOccurrencesOfString("/",
withString: "#", options: NSStringCompareOptions.CaseInsensitiveSearch, range: nil)
 return path.replacingOccurrences(of: "/",
with: "#", options: NSString.CompareOptions.caseInsensitive, range: nil)
 }

public func setObject(object: AnyObject, key: String) {
 if (object.conformsToProtocol(NSCoding)) {
open func setObject(_ object: AnyObject, key: String) {
 if (object.conforms(to: NSCoding.self)) {
 MemoryCache.sharedMemoryCache.setObject(object, key: key)
 DiskCache.sharedDiskCache.setObject(object, key: key)
 }
 }

public func objectForKey(key: String, completion: cacheCompletion) {
open func objectForKey(_ key: String, completion: cacheCompletion) {
 MemoryCache.sharedMemoryCache.objectForKey(key, completion: {(object: AnyObject!) in
 if let realObject: AnyObject = object {
 completion(realObject)
Expand All@@ -52,63 +52,64 @@ public class Cache {
 })
 }

public func objectForKeySync(key: String) -> AnyObject! {
open func objectForKeySync(_ key: String) -> AnyObject! {
 let ramObject: AnyObject! = MemoryCache.sharedMemoryCache.objectForKeySync(key)
 return (ramObject != nil) ? ramObject : DiskCache.sharedDiskCache.objectForKeySync(key)
 }

public func removeObject(key: String) {
open func removeObject(_ key: String) {
 MemoryCache.sharedMemoryCache.removeObject(key)
 DiskCache.sharedDiskCache.removeObject(key)
 }

public func removeAllObject() {
open func removeAllObject() {
 MemoryCache.sharedMemoryCache.removeAllObject()
 DiskCache.sharedDiskCache.removeAllObject()
 }
}

public class DiskCache: Cache {
open class DiskCache: Cache {

private struct files {
fileprivate struct files {
 static var filepath: String {
 let manager = NSFileManager.defaultManager()
 var paths = NSSearchPathForDirectoriesInDomains(NSSearchPathDirectory.CachesDirectory,
NSSearchPathDomainMask.UserDomainMask, true)
 let manager = FileManager.default
 var paths = NSSearchPathForDirectoriesInDomains(FileManager.SearchPathDirectory.cachesDirectory,
FileManager.SearchPathDomainMask.userDomainMask, true)
 let cachePath = paths[0] + "/modelCache/"
 if (!manager.fileExistsAtPath(cachePath)) {
 if (!manager.fileExists(atPath: cachePath)) {
 do {
 try manager.createDirectoryAtPath(cachePath, withIntermediateDirectories: true, attributes: nil)
 try manager.createDirectory(atPath: cachePath, withIntermediateDirectories: true, attributes: nil)
 } catch _ {
 }
 }
 return cachePath
 }
 }

 private let priority = DISPATCH_QUEUE_PRIORITY_DEFAULT
 fileprivate let priority = DispatchQoS.QoSClass.default


public class var sharedDiskCache: Cache {
open class var sharedDiskCache: Cache {
 return _DiskCache
 }

 override init() {

 }

public func fullPath(key: String) -> String {
open func fullPath(_ key: String) -> String {
 return files.filepath + key
 }

public func objectExist(key: String) -> Bool {
 return NSFileManager.defaultManager().fileExistsAtPath(fullPath(key))
open func objectExist(_ key: String) -> Bool {
 return FileManager.default.fileExists(atPath: fullPath(key))
 }

public override func objectForKey(key: String, completion: cacheCompletion) {
open func objectForKey(_ key: String, completion: @escaping cacheCompletion) {
 if (self.objectExist(key)) {
dispatch_async(dispatch_get_global_queue(self.priority, UInt(0)), { ()->() in
 let object: AnyObject! = NSKeyedUnarchiver.unarchiveObjectWithFile(self.fullPath(key))
dispatch_async(dispatch_get_main_queue(), { ()->() in
DispatchQueue.global(qos: self.priority).async(execute: { ()->() in
 let object: AnyObject! = NSKeyedUnarchiver.unarchiveObject(withFile: self.fullPath(key)) as AnyObject!
DispatchQueue.main.async(execute: { ()->() in
 completion(object)
 })
 })
Expand All@@ -118,60 +119,60 @@ public class DiskCache: Cache {
 }
 }

public override func objectForKeySync(key: String) -> AnyObject! {
open override func objectForKeySync(_ key: String) -> AnyObject! {
 if (self.objectExist(key)) {
 return NSKeyedUnarchiver.unarchiveObjectWithFile(self.fullPath(key))
 return NSKeyedUnarchiver.unarchiveObject(withFile: self.fullPath(key)) as AnyObject!
 }
 return nil
 }

public override func setObject(object: AnyObject, key: String) {
open override func setObject(_ object: AnyObject, key: String) {
 NSKeyedArchiver.archiveRootObject(object, toFile: self.fullPath(key))
 }

public override func removeObject(key: String) {
open override func removeObject(_ key: String) {
 if (self.objectExist(key)) {
 do {
 try NSFileManager.defaultManager().removeItemAtPath(self.fullPath(key))
 try FileManager.default.removeItem(atPath: self.fullPath(key))
 } catch _ {
 }
 }
 }

public override func removeAllObject() {
open override func removeAllObject() {

 }
}

public class MemoryCache: Cache {
open class MemoryCache: Cache {

private var memoryCache = NSCache()
fileprivate var memoryCache = NSCache<AnyObject, AnyObject>()

public class var sharedMemoryCache: Cache {
open class var sharedMemoryCache: Cache {
 return _MemoryCache
 }

 override init() {

 }

public override func objectForKeySync(key: String) -> AnyObject! {
 return self.memoryCache.objectForKey(key)
open override func objectForKeySync(_ key: String) -> AnyObject! {
 return self.memoryCache.object(forKey: key as AnyObject)
 }

public override func objectForKey(key: String, completion: cacheCompletion) {
 completion(self.memoryCache.objectForKey(key))
open override func objectForKey(_ key: String, completion: cacheCompletion) {
 completion(self.memoryCache.object(forKey: key as AnyObject))
 }

public override func setObject(object: AnyObject, key: String) {
 self.memoryCache.setObject(object, forKey: key)
open override func setObject(_ object: AnyObject, key: String) {
 self.memoryCache.setObject(object, forKey: key as AnyObject)
 }

public override func removeObject(key: String) {
 self.memoryCache.removeObjectForKey(key)
open override func removeObject(_ key: String) {
 self.memoryCache.removeObject(forKey: key as AnyObject)
 }

public override func removeAllObject() {
open override func removeAllObject() {
 self.memoryCache.removeAllObjects()
 }

Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Highlight search terms from Google/DuckDuckGo/Bing referrer
(function() {
var ref = document.referrer;
var terms = [];
if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {
var url = new URL(ref);
var q = url.searchParams.get('q') || url.searchParams.get('p');
if (q) {
terms = q.split(/\s+/).filter(function(t) { return t.length > 2; });
}
}
if (terms.length === 0) return;
var style = document.createElement('style');
style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';
document.head.appendChild(style);
function highlight(node) {
if (node.nodeType === 3) { // text node
var text = node.textContent;
var found = false;
terms.forEach(function(term) {
var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi');
if (regex.test(text)) {
found = true;
var frag = document.createDocumentFragment();
var parts = text.split(regex);
parts.forEach(function(part, i) {
if (i % 2 === 0) {
frag.appendChild(document.createTextNode(part));
} else {
var span = document.createElement('span');
span.className = 'userscript-highlight';
span.textContent = part;
frag.appendChild(span);
}
});
node.parentNode.replaceChild(frag, node);
}
});
} else if (node.nodeType === 1 && node.childNodes) { // element
var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];
if (!skipTags.includes(node.tagName)) {
Array.from(node.childNodes).forEach(highlight);
}
}
}
highlight(document.body);
// Re-highlight on dynamic content
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1 || node.nodeType === 3) highlight(node);
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Updated to Swift3 by juanpablofernandez · Pull Request #23 · Dimillian/HackerSwifter · GitHub
Skip to content
Updated to Swift3#23

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Open

juanpablofernandez
wants to merge
2
commits into

base:master
Choose a base branch

from

 Open


Updated to Swift3
#23
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
0f6a8da

Updated to Swift 3, fixed compiler warnings and errors


t0mball Mar 16, 2017
0c7f13b

Updated to recommended settings


t0mball Mar 16, 2017

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


12 changes: 6 additions & 6 deletions
Hacker Swifter/Hacker Swifter/Extensions/HTMLScanner.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,13 +8,13 @@

import Foundation

extension NSScanner {
 func scanTag(startTag: String, endTag: String) -> String {
extension Scanner {
 func scanTag(_ startTag: String, endTag: String) -> String {
 var temp: NSString? = ""
 var result: NSString? = ""
 self.scanUpToString(startTag, intoString: &temp)
 self.scanString(startTag, intoString: &temp)
 self.scanUpToString(endTag, intoString: &result)
 self.scanUpTo(startTag, into: &temp)
 self.scanString(startTag, into: &temp)
 self.scanUpTo(endTag, into: &result)
 return result as! String
 }
}
}

38 changes: 19 additions & 19 deletions
Hacker Swifter/Hacker Swifter/Extensions/HTMLString.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,29 +9,29 @@
import Foundation

extension String {
 static func stringByRemovingHTMLEntities(string: String) -> String {
 static func stringByRemovingHTMLEntities(_ string: String) -> String {
 var result = string

 result = result.stringByReplacingOccurrencesOfString("<p>", withString: "\n\n", options: .CaseInsensitiveSearch, range: nil)
 result = result.stringByReplacingOccurrencesOfString("</p>", withString: "", options: .CaseInsensitiveSearch, range: nil)
 result = result.stringByReplacingOccurrencesOfString("<i>", withString: "", options: .CaseInsensitiveSearch, range: nil)
 result = result.stringByReplacingOccurrencesOfString("</i>", withString: "", options: .CaseInsensitiveSearch, range: nil)
 result = result.stringByReplacingOccurrencesOfString("&#38;", withString: "&", options: .CaseInsensitiveSearch, range: nil)
 result = result.stringByReplacingOccurrencesOfString("&#62;", withString: ">", options: .CaseInsensitiveSearch, range: nil)
 result = result.stringByReplacingOccurrencesOfString("&#x27;", withString: "'", options: .CaseInsensitiveSearch, range: nil)
 result = result.stringByReplacingOccurrencesOfString("&#x2F;", withString: "/", options: .CaseInsensitiveSearch, range: nil)
 result = result.stringByReplacingOccurrencesOfString("&quot;", withString: "\"", options: .CaseInsensitiveSearch, range: nil)
 result = result.stringByReplacingOccurrencesOfString("&#60;", withString: "<", options: .CaseInsensitiveSearch, range: nil)
 result = result.stringByReplacingOccurrencesOfString("&lt;", withString: "<", options: .CaseInsensitiveSearch, range: nil)
 result = result.stringByReplacingOccurrencesOfString("&gt;", withString: ">", options: .CaseInsensitiveSearch, range: nil)
 result = result.stringByReplacingOccurrencesOfString("&amp;", withString: "&", options: .CaseInsensitiveSearch, range: nil)
 result = result.stringByReplacingOccurrencesOfString("<pre><code>", withString: "", options: .CaseInsensitiveSearch, range: nil)
 result = result.stringByReplacingOccurrencesOfString("</code></pre>", withString: "", options: .CaseInsensitiveSearch, range: nil)
 result = result.replacingOccurrences(of: "<p>", with: "\n\n", options: .caseInsensitive, range: nil)
 result = result.replacingOccurrences(of: "</p>", with: "", options: .caseInsensitive, range: nil)
 result = result.replacingOccurrences(of: "<i>", with: "", options: .caseInsensitive, range: nil)
 result = result.replacingOccurrences(of: "</i>", with: "", options: .caseInsensitive, range: nil)
 result = result.replacingOccurrences(of: "&#38;", with: "&", options: .caseInsensitive, range: nil)
 result = result.replacingOccurrences(of: "&#62;", with: ">", options: .caseInsensitive, range: nil)
 result = result.replacingOccurrences(of: "&#x27;", with: "'", options: .caseInsensitive, range: nil)
 result = result.replacingOccurrences(of: "&#x2F;", with: "/", options: .caseInsensitive, range: nil)
 result = result.replacingOccurrences(of: "&quot;", with: "\"", options: .caseInsensitive, range: nil)
 result = result.replacingOccurrences(of: "&#60;", with: "<", options: .caseInsensitive, range: nil)
 result = result.replacingOccurrences(of: "&lt;", with: "<", options: .caseInsensitive, range: nil)
 result = result.replacingOccurrences(of: "&gt;", with: ">", options: .caseInsensitive, range: nil)
 result = result.replacingOccurrences(of: "&amp;", with: "&", options: .caseInsensitive, range: nil)
 result = result.replacingOccurrences(of: "<pre><code>", with: "", options: .caseInsensitive, range: nil)
 result = result.replacingOccurrences(of: "</code></pre>", with: "", options: .caseInsensitive, range: nil)

 let regex = try? NSRegularExpression(pattern: "<a[^>]+href=\"(.*?)\"[^>]*>.*?</a>",
 options: NSRegularExpressionOptions.CaseInsensitive)
 result = regex!.stringByReplacingMatchesInString(result, options: [], range: NSMakeRange(0, result.utf16.count), withTemplate: "$1")
 options: NSRegularExpression.Options.caseInsensitive)
 result = regex!.stringByReplacingMatches(in: result, options: [], range: NSMakeRange(0, result.utf16.count), withTemplate: "$1")

 return result
 }
}
}

91 changes: 46 additions & 45 deletions
Hacker Swifter/Hacker Swifter/HTTP/Cache.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,32 +14,32 @@ private let _DiskCache = DiskCache()

public typealias cacheCompletion = (AnyObject!) -> Void

public class Cache {
open class Cache {

public class var sharedCache: Cache {
open class var sharedCache: Cache {
 return _Cache
 }

 init() {

 }

public class func generateCacheKey(path: String) -> String {
open class func generateCacheKey(_ path: String) -> String {
 if (path == "") {
 return "root"
 }
 return path.stringByReplacingOccurrencesOfString("/",
withString: "#", options: NSStringCompareOptions.CaseInsensitiveSearch, range: nil)
 return path.replacingOccurrences(of: "/",
with: "#", options: NSString.CompareOptions.caseInsensitive, range: nil)
 }

public func setObject(object: AnyObject, key: String) {
 if (object.conformsToProtocol(NSCoding)) {
open func setObject(_ object: AnyObject, key: String) {
 if (object.conforms(to: NSCoding.self)) {
 MemoryCache.sharedMemoryCache.setObject(object, key: key)
 DiskCache.sharedDiskCache.setObject(object, key: key)
 }
 }

public func objectForKey(key: String, completion: cacheCompletion) {
open func objectForKey(_ key: String, completion: cacheCompletion) {
 MemoryCache.sharedMemoryCache.objectForKey(key, completion: {(object: AnyObject!) in
 if let realObject: AnyObject = object {
 completion(realObject)
Expand All@@ -52,63 +52,64 @@ public class Cache {
 })
 }

public func objectForKeySync(key: String) -> AnyObject! {
open func objectForKeySync(_ key: String) -> AnyObject! {
 let ramObject: AnyObject! = MemoryCache.sharedMemoryCache.objectForKeySync(key)
 return (ramObject != nil) ? ramObject : DiskCache.sharedDiskCache.objectForKeySync(key)
 }

public func removeObject(key: String) {
open func removeObject(_ key: String) {
 MemoryCache.sharedMemoryCache.removeObject(key)
 DiskCache.sharedDiskCache.removeObject(key)
 }

public func removeAllObject() {
open func removeAllObject() {
 MemoryCache.sharedMemoryCache.removeAllObject()
 DiskCache.sharedDiskCache.removeAllObject()
 }
}

public class DiskCache: Cache {
open class DiskCache: Cache {

private struct files {
fileprivate struct files {
 static var filepath: String {
 let manager = NSFileManager.defaultManager()
 var paths = NSSearchPathForDirectoriesInDomains(NSSearchPathDirectory.CachesDirectory,
NSSearchPathDomainMask.UserDomainMask, true)
 let manager = FileManager.default
 var paths = NSSearchPathForDirectoriesInDomains(FileManager.SearchPathDirectory.cachesDirectory,
FileManager.SearchPathDomainMask.userDomainMask, true)
 let cachePath = paths[0] + "/modelCache/"
 if (!manager.fileExistsAtPath(cachePath)) {
 if (!manager.fileExists(atPath: cachePath)) {
 do {
 try manager.createDirectoryAtPath(cachePath, withIntermediateDirectories: true, attributes: nil)
 try manager.createDirectory(atPath: cachePath, withIntermediateDirectories: true, attributes: nil)
 } catch _ {
 }
 }
 return cachePath
 }
 }

 private let priority = DISPATCH_QUEUE_PRIORITY_DEFAULT
 fileprivate let priority = DispatchQoS.QoSClass.default


public class var sharedDiskCache: Cache {
open class var sharedDiskCache: Cache {
 return _DiskCache
 }

 override init() {

 }

public func fullPath(key: String) -> String {
open func fullPath(_ key: String) -> String {
 return files.filepath + key
 }

public func objectExist(key: String) -> Bool {
 return NSFileManager.defaultManager().fileExistsAtPath(fullPath(key))
open func objectExist(_ key: String) -> Bool {
 return FileManager.default.fileExists(atPath: fullPath(key))
 }

public override func objectForKey(key: String, completion: cacheCompletion) {
open func objectForKey(_ key: String, completion: @escaping cacheCompletion) {
 if (self.objectExist(key)) {
dispatch_async(dispatch_get_global_queue(self.priority, UInt(0)), { ()->() in
 let object: AnyObject! = NSKeyedUnarchiver.unarchiveObjectWithFile(self.fullPath(key))
dispatch_async(dispatch_get_main_queue(), { ()->() in
DispatchQueue.global(qos: self.priority).async(execute: { ()->() in
 let object: AnyObject! = NSKeyedUnarchiver.unarchiveObject(withFile: self.fullPath(key)) as AnyObject!
DispatchQueue.main.async(execute: { ()->() in
 completion(object)
 })
 })
Expand All@@ -118,60 +119,60 @@ public class DiskCache: Cache {
 }
 }

public override func objectForKeySync(key: String) -> AnyObject! {
open override func objectForKeySync(_ key: String) -> AnyObject! {
 if (self.objectExist(key)) {
 return NSKeyedUnarchiver.unarchiveObjectWithFile(self.fullPath(key))
 return NSKeyedUnarchiver.unarchiveObject(withFile: self.fullPath(key)) as AnyObject!
 }
 return nil
 }

public override func setObject(object: AnyObject, key: String) {
open override func setObject(_ object: AnyObject, key: String) {
 NSKeyedArchiver.archiveRootObject(object, toFile: self.fullPath(key))
 }

public override func removeObject(key: String) {
open override func removeObject(_ key: String) {
 if (self.objectExist(key)) {
 do {
 try NSFileManager.defaultManager().removeItemAtPath(self.fullPath(key))
 try FileManager.default.removeItem(atPath: self.fullPath(key))
 } catch _ {
 }
 }
 }

public override func removeAllObject() {
open override func removeAllObject() {

 }
}

public class MemoryCache: Cache {
open class MemoryCache: Cache {

private var memoryCache = NSCache()
fileprivate var memoryCache = NSCache<AnyObject, AnyObject>()

public class var sharedMemoryCache: Cache {
open class var sharedMemoryCache: Cache {
 return _MemoryCache
 }

 override init() {

 }

public override func objectForKeySync(key: String) -> AnyObject! {
 return self.memoryCache.objectForKey(key)
open override func objectForKeySync(_ key: String) -> AnyObject! {
 return self.memoryCache.object(forKey: key as AnyObject)
 }

public override func objectForKey(key: String, completion: cacheCompletion) {
 completion(self.memoryCache.objectForKey(key))
open override func objectForKey(_ key: String, completion: cacheCompletion) {
 completion(self.memoryCache.object(forKey: key as AnyObject))
 }

public override func setObject(object: AnyObject, key: String) {
 self.memoryCache.setObject(object, forKey: key)
open override func setObject(_ object: AnyObject, key: String) {
 self.memoryCache.setObject(object, forKey: key as AnyObject)
 }

public override func removeObject(key: String) {
 self.memoryCache.removeObjectForKey(key)
open override func removeObject(_ key: String) {
 self.memoryCache.removeObject(forKey: key as AnyObject)
 }

public override func removeAllObject() {
open override func removeAllObject() {
 self.memoryCache.removeAllObjects()
 }

Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Strip utm_, fbclid, gclid, etc. from all links on page
(function() {
var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',
'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',
'ref', 'ref_src', 'source', 'medium', 'campaign'];
function cleanUrl(url) {
try {
var u = new URL(url, window.location.origin);
var changed = false;
trackingParams.forEach(function(p) {
if (u.searchParams.has(p)) {
u.searchParams.delete(p);
changed = true;
}
});
return changed ? u.toString() : url;
} catch (e) {
return url;
}
}
function cleanLinks() {
document.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
cleanLinks();
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1) {
if (node.tagName === 'A') cleanLinks();
node.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '
Updated to Swift3 by juanpablofernandez · Pull Request #23 · Dimillian/HackerSwifter · GitHub
Skip to content
Updated to Swift3#23

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Open

juanpablofernandez
wants to merge
2
commits into

base:master
Choose a base branch

from

 Open


Updated to Swift3
#23
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
0f6a8da

Updated to Swift 3, fixed compiler warnings and errors


t0mball Mar 16, 2017
0c7f13b

Updated to recommended settings


t0mball Mar 16, 2017

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


12 changes: 6 additions & 6 deletions
Hacker Swifter/Hacker Swifter/Extensions/HTMLScanner.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,13 +8,13 @@

import Foundation

extension NSScanner {
 func scanTag(startTag: String, endTag: String) -> String {
extension Scanner {
 func scanTag(_ startTag: String, endTag: String) -> String {
 var temp: NSString? = ""
 var result: NSString? = ""
 self.scanUpToString(startTag, intoString: &temp)
 self.scanString(startTag, intoString: &temp)
 self.scanUpToString(endTag, intoString: &result)
 self.scanUpTo(startTag, into: &temp)
 self.scanString(startTag, into: &temp)
 self.scanUpTo(endTag, into: &result)
 return result as! String
 }
}
}

38 changes: 19 additions & 19 deletions
Hacker Swifter/Hacker Swifter/Extensions/HTMLString.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,29 +9,29 @@
import Foundation

extension String {
 static func stringByRemovingHTMLEntities(string: String) -> String {
 static func stringByRemovingHTMLEntities(_ string: String) -> String {
 var result = string

 result = result.stringByReplacingOccurrencesOfString("<p>", withString: "\n\n", options: .CaseInsensitiveSearch, range: nil)
 result = result.stringByReplacingOccurrencesOfString("</p>", withString: "", options: .CaseInsensitiveSearch, range: nil)
 result = result.stringByReplacingOccurrencesOfString("<i>", withString: "", options: .CaseInsensitiveSearch, range: nil)
 result = result.stringByReplacingOccurrencesOfString("</i>", withString: "", options: .CaseInsensitiveSearch, range: nil)
 result = result.stringByReplacingOccurrencesOfString("&#38;", withString: "&", options: .CaseInsensitiveSearch, range: nil)
 result = result.stringByReplacingOccurrencesOfString("&#62;", withString: ">", options: .CaseInsensitiveSearch, range: nil)
 result = result.stringByReplacingOccurrencesOfString("&#x27;", withString: "'", options: .CaseInsensitiveSearch, range: nil)
 result = result.stringByReplacingOccurrencesOfString("&#x2F;", withString: "/", options: .CaseInsensitiveSearch, range: nil)
 result = result.stringByReplacingOccurrencesOfString("&quot;", withString: "\"", options: .CaseInsensitiveSearch, range: nil)
 result = result.stringByReplacingOccurrencesOfString("&#60;", withString: "<", options: .CaseInsensitiveSearch, range: nil)
 result = result.stringByReplacingOccurrencesOfString("&lt;", withString: "<", options: .CaseInsensitiveSearch, range: nil)
 result = result.stringByReplacingOccurrencesOfString("&gt;", withString: ">", options: .CaseInsensitiveSearch, range: nil)
 result = result.stringByReplacingOccurrencesOfString("&amp;", withString: "&", options: .CaseInsensitiveSearch, range: nil)
 result = result.stringByReplacingOccurrencesOfString("<pre><code>", withString: "", options: .CaseInsensitiveSearch, range: nil)
 result = result.stringByReplacingOccurrencesOfString("</code></pre>", withString: "", options: .CaseInsensitiveSearch, range: nil)
 result = result.replacingOccurrences(of: "<p>", with: "\n\n", options: .caseInsensitive, range: nil)
 result = result.replacingOccurrences(of: "</p>", with: "", options: .caseInsensitive, range: nil)
 result = result.replacingOccurrences(of: "<i>", with: "", options: .caseInsensitive, range: nil)
 result = result.replacingOccurrences(of: "</i>", with: "", options: .caseInsensitive, range: nil)
 result = result.replacingOccurrences(of: "&#38;", with: "&", options: .caseInsensitive, range: nil)
 result = result.replacingOccurrences(of: "&#62;", with: ">", options: .caseInsensitive, range: nil)
 result = result.replacingOccurrences(of: "&#x27;", with: "'", options: .caseInsensitive, range: nil)
 result = result.replacingOccurrences(of: "&#x2F;", with: "/", options: .caseInsensitive, range: nil)
 result = result.replacingOccurrences(of: "&quot;", with: "\"", options: .caseInsensitive, range: nil)
 result = result.replacingOccurrences(of: "&#60;", with: "<", options: .caseInsensitive, range: nil)
 result = result.replacingOccurrences(of: "&lt;", with: "<", options: .caseInsensitive, range: nil)
 result = result.replacingOccurrences(of: "&gt;", with: ">", options: .caseInsensitive, range: nil)
 result = result.replacingOccurrences(of: "&amp;", with: "&", options: .caseInsensitive, range: nil)
 result = result.replacingOccurrences(of: "<pre><code>", with: "", options: .caseInsensitive, range: nil)
 result = result.replacingOccurrences(of: "</code></pre>", with: "", options: .caseInsensitive, range: nil)

 let regex = try? NSRegularExpression(pattern: "<a[^>]+href=\"(.*?)\"[^>]*>.*?</a>",
 options: NSRegularExpressionOptions.CaseInsensitive)
 result = regex!.stringByReplacingMatchesInString(result, options: [], range: NSMakeRange(0, result.utf16.count), withTemplate: "$1")
 options: NSRegularExpression.Options.caseInsensitive)
 result = regex!.stringByReplacingMatches(in: result, options: [], range: NSMakeRange(0, result.utf16.count), withTemplate: "$1")

 return result
 }
}
}

91 changes: 46 additions & 45 deletions
Hacker Swifter/Hacker Swifter/HTTP/Cache.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,32 +14,32 @@ private let _DiskCache = DiskCache()

public typealias cacheCompletion = (AnyObject!) -> Void

public class Cache {
open class Cache {

public class var sharedCache: Cache {
open class var sharedCache: Cache {
 return _Cache
 }

 init() {

 }

public class func generateCacheKey(path: String) -> String {
open class func generateCacheKey(_ path: String) -> String {
 if (path == "") {
 return "root"
 }
 return path.stringByReplacingOccurrencesOfString("/",
withString: "#", options: NSStringCompareOptions.CaseInsensitiveSearch, range: nil)
 return path.replacingOccurrences(of: "/",
with: "#", options: NSString.CompareOptions.caseInsensitive, range: nil)
 }

public func setObject(object: AnyObject, key: String) {
 if (object.conformsToProtocol(NSCoding)) {
open func setObject(_ object: AnyObject, key: String) {
 if (object.conforms(to: NSCoding.self)) {
 MemoryCache.sharedMemoryCache.setObject(object, key: key)
 DiskCache.sharedDiskCache.setObject(object, key: key)
 }
 }

public func objectForKey(key: String, completion: cacheCompletion) {
open func objectForKey(_ key: String, completion: cacheCompletion) {
 MemoryCache.sharedMemoryCache.objectForKey(key, completion: {(object: AnyObject!) in
 if let realObject: AnyObject = object {
 completion(realObject)
Expand All@@ -52,63 +52,64 @@ public class Cache {
 })
 }

public func objectForKeySync(key: String) -> AnyObject! {
open func objectForKeySync(_ key: String) -> AnyObject! {
 let ramObject: AnyObject! = MemoryCache.sharedMemoryCache.objectForKeySync(key)
 return (ramObject != nil) ? ramObject : DiskCache.sharedDiskCache.objectForKeySync(key)
 }

public func removeObject(key: String) {
open func removeObject(_ key: String) {
 MemoryCache.sharedMemoryCache.removeObject(key)
 DiskCache.sharedDiskCache.removeObject(key)
 }

public func removeAllObject() {
open func removeAllObject() {
 MemoryCache.sharedMemoryCache.removeAllObject()
 DiskCache.sharedDiskCache.removeAllObject()
 }
}

public class DiskCache: Cache {
open class DiskCache: Cache {

private struct files {
fileprivate struct files {
 static var filepath: String {
 let manager = NSFileManager.defaultManager()
 var paths = NSSearchPathForDirectoriesInDomains(NSSearchPathDirectory.CachesDirectory,
NSSearchPathDomainMask.UserDomainMask, true)
 let manager = FileManager.default
 var paths = NSSearchPathForDirectoriesInDomains(FileManager.SearchPathDirectory.cachesDirectory,
FileManager.SearchPathDomainMask.userDomainMask, true)
 let cachePath = paths[0] + "/modelCache/"
 if (!manager.fileExistsAtPath(cachePath)) {
 if (!manager.fileExists(atPath: cachePath)) {
 do {
 try manager.createDirectoryAtPath(cachePath, withIntermediateDirectories: true, attributes: nil)
 try manager.createDirectory(atPath: cachePath, withIntermediateDirectories: true, attributes: nil)
 } catch _ {
 }
 }
 return cachePath
 }
 }

 private let priority = DISPATCH_QUEUE_PRIORITY_DEFAULT
 fileprivate let priority = DispatchQoS.QoSClass.default


public class var sharedDiskCache: Cache {
open class var sharedDiskCache: Cache {
 return _DiskCache
 }

 override init() {

 }

public func fullPath(key: String) -> String {
open func fullPath(_ key: String) -> String {
 return files.filepath + key
 }

public func objectExist(key: String) -> Bool {
 return NSFileManager.defaultManager().fileExistsAtPath(fullPath(key))
open func objectExist(_ key: String) -> Bool {
 return FileManager.default.fileExists(atPath: fullPath(key))
 }

public override func objectForKey(key: String, completion: cacheCompletion) {
open func objectForKey(_ key: String, completion: @escaping cacheCompletion) {
 if (self.objectExist(key)) {
dispatch_async(dispatch_get_global_queue(self.priority, UInt(0)), { ()->() in
 let object: AnyObject! = NSKeyedUnarchiver.unarchiveObjectWithFile(self.fullPath(key))
dispatch_async(dispatch_get_main_queue(), { ()->() in
DispatchQueue.global(qos: self.priority).async(execute: { ()->() in
 let object: AnyObject! = NSKeyedUnarchiver.unarchiveObject(withFile: self.fullPath(key)) as AnyObject!
DispatchQueue.main.async(execute: { ()->() in
 completion(object)
 })
 })
Expand All@@ -118,60 +119,60 @@ public class DiskCache: Cache {
 }
 }

public override func objectForKeySync(key: String) -> AnyObject! {
open override func objectForKeySync(_ key: String) -> AnyObject! {
 if (self.objectExist(key)) {
 return NSKeyedUnarchiver.unarchiveObjectWithFile(self.fullPath(key))
 return NSKeyedUnarchiver.unarchiveObject(withFile: self.fullPath(key)) as AnyObject!
 }
 return nil
 }

public override func setObject(object: AnyObject, key: String) {
open override func setObject(_ object: AnyObject, key: String) {
 NSKeyedArchiver.archiveRootObject(object, toFile: self.fullPath(key))
 }

public override func removeObject(key: String) {
open override func removeObject(_ key: String) {
 if (self.objectExist(key)) {
 do {
 try NSFileManager.defaultManager().removeItemAtPath(self.fullPath(key))
 try FileManager.default.removeItem(atPath: self.fullPath(key))
 } catch _ {
 }
 }
 }

public override func removeAllObject() {
open override func removeAllObject() {

 }
}

public class MemoryCache: Cache {
open class MemoryCache: Cache {

private var memoryCache = NSCache()
fileprivate var memoryCache = NSCache<AnyObject, AnyObject>()

public class var sharedMemoryCache: Cache {
open class var sharedMemoryCache: Cache {
 return _MemoryCache
 }

 override init() {

 }

public override func objectForKeySync(key: String) -> AnyObject! {
 return self.memoryCache.objectForKey(key)
open override func objectForKeySync(_ key: String) -> AnyObject! {
 return self.memoryCache.object(forKey: key as AnyObject)
 }

public override func objectForKey(key: String, completion: cacheCompletion) {
 completion(self.memoryCache.objectForKey(key))
open override func objectForKey(_ key: String, completion: cacheCompletion) {
 completion(self.memoryCache.object(forKey: key as AnyObject))
 }

public override func setObject(object: AnyObject, key: String) {
 self.memoryCache.setObject(object, forKey: key)
open override func setObject(_ object: AnyObject, key: String) {
 self.memoryCache.setObject(object, forKey: key as AnyObject)
 }

public override func removeObject(key: String) {
 self.memoryCache.removeObjectForKey(key)
open override func removeObject(_ key: String) {
 self.memoryCache.removeObject(forKey: key as AnyObject)
 }

public override func removeAllObject() {
open override func removeAllObject() {
 self.memoryCache.removeAllObjects()
 }

Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Auto-enable theater mode on YouTube
(function() {
function tryTheater() {
var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]');
if (btn && !btn.classList.contains('activated')) {
btn.click();
}
}
// Try immediately
tryTheater();
// Try after navigation (SPA)
var lastUrl = location.href;
setInterval(function() {
if (location.href !== lastUrl) {
lastUrl = location.href;
setTimeout(tryTheater, 500);
}
}, 1000);
// Also try on player load
var observer = new MutationObserver(tryTheater);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Updated to Swift3 by juanpablofernandez · Pull Request #23 · Dimillian/HackerSwifter · GitHub
Skip to content
Updated to Swift3#23

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Open

juanpablofernandez
wants to merge
2
commits into

base:master
Choose a base branch

from

 Open


Updated to Swift3
#23
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
0f6a8da

Updated to Swift 3, fixed compiler warnings and errors


t0mball Mar 16, 2017
0c7f13b

Updated to recommended settings


t0mball Mar 16, 2017

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


12 changes: 6 additions & 6 deletions
Hacker Swifter/Hacker Swifter/Extensions/HTMLScanner.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,13 +8,13 @@

import Foundation

extension NSScanner {
 func scanTag(startTag: String, endTag: String) -> String {
extension Scanner {
 func scanTag(_ startTag: String, endTag: String) -> String {
 var temp: NSString? = ""
 var result: NSString? = ""
 self.scanUpToString(startTag, intoString: &temp)
 self.scanString(startTag, intoString: &temp)
 self.scanUpToString(endTag, intoString: &result)
 self.scanUpTo(startTag, into: &temp)
 self.scanString(startTag, into: &temp)
 self.scanUpTo(endTag, into: &result)
 return result as! String
 }
}
}

38 changes: 19 additions & 19 deletions
Hacker Swifter/Hacker Swifter/Extensions/HTMLString.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,29 +9,29 @@
import Foundation

extension String {
 static func stringByRemovingHTMLEntities(string: String) -> String {
 static func stringByRemovingHTMLEntities(_ string: String) -> String {
 var result = string

 result = result.stringByReplacingOccurrencesOfString("<p>", withString: "\n\n", options: .CaseInsensitiveSearch, range: nil)
 result = result.stringByReplacingOccurrencesOfString("</p>", withString: "", options: .CaseInsensitiveSearch, range: nil)
 result = result.stringByReplacingOccurrencesOfString("<i>", withString: "", options: .CaseInsensitiveSearch, range: nil)
 result = result.stringByReplacingOccurrencesOfString("</i>", withString: "", options: .CaseInsensitiveSearch, range: nil)
 result = result.stringByReplacingOccurrencesOfString("&#38;", withString: "&", options: .CaseInsensitiveSearch, range: nil)
 result = result.stringByReplacingOccurrencesOfString("&#62;", withString: ">", options: .CaseInsensitiveSearch, range: nil)
 result = result.stringByReplacingOccurrencesOfString("&#x27;", withString: "'", options: .CaseInsensitiveSearch, range: nil)
 result = result.stringByReplacingOccurrencesOfString("&#x2F;", withString: "/", options: .CaseInsensitiveSearch, range: nil)
 result = result.stringByReplacingOccurrencesOfString("&quot;", withString: "\"", options: .CaseInsensitiveSearch, range: nil)
 result = result.stringByReplacingOccurrencesOfString("&#60;", withString: "<", options: .CaseInsensitiveSearch, range: nil)
 result = result.stringByReplacingOccurrencesOfString("&lt;", withString: "<", options: .CaseInsensitiveSearch, range: nil)
 result = result.stringByReplacingOccurrencesOfString("&gt;", withString: ">", options: .CaseInsensitiveSearch, range: nil)
 result = result.stringByReplacingOccurrencesOfString("&amp;", withString: "&", options: .CaseInsensitiveSearch, range: nil)
 result = result.stringByReplacingOccurrencesOfString("<pre><code>", withString: "", options: .CaseInsensitiveSearch, range: nil)
 result = result.stringByReplacingOccurrencesOfString("</code></pre>", withString: "", options: .CaseInsensitiveSearch, range: nil)
 result = result.replacingOccurrences(of: "<p>", with: "\n\n", options: .caseInsensitive, range: nil)
 result = result.replacingOccurrences(of: "</p>", with: "", options: .caseInsensitive, range: nil)
 result = result.replacingOccurrences(of: "<i>", with: "", options: .caseInsensitive, range: nil)
 result = result.replacingOccurrences(of: "</i>", with: "", options: .caseInsensitive, range: nil)
 result = result.replacingOccurrences(of: "&#38;", with: "&", options: .caseInsensitive, range: nil)
 result = result.replacingOccurrences(of: "&#62;", with: ">", options: .caseInsensitive, range: nil)
 result = result.replacingOccurrences(of: "&#x27;", with: "'", options: .caseInsensitive, range: nil)
 result = result.replacingOccurrences(of: "&#x2F;", with: "/", options: .caseInsensitive, range: nil)
 result = result.replacingOccurrences(of: "&quot;", with: "\"", options: .caseInsensitive, range: nil)
 result = result.replacingOccurrences(of: "&#60;", with: "<", options: .caseInsensitive, range: nil)
 result = result.replacingOccurrences(of: "&lt;", with: "<", options: .caseInsensitive, range: nil)
 result = result.replacingOccurrences(of: "&gt;", with: ">", options: .caseInsensitive, range: nil)
 result = result.replacingOccurrences(of: "&amp;", with: "&", options: .caseInsensitive, range: nil)
 result = result.replacingOccurrences(of: "<pre><code>", with: "", options: .caseInsensitive, range: nil)
 result = result.replacingOccurrences(of: "</code></pre>", with: "", options: .caseInsensitive, range: nil)

 let regex = try? NSRegularExpression(pattern: "<a[^>]+href=\"(.*?)\"[^>]*>.*?</a>",
 options: NSRegularExpressionOptions.CaseInsensitive)
 result = regex!.stringByReplacingMatchesInString(result, options: [], range: NSMakeRange(0, result.utf16.count), withTemplate: "$1")
 options: NSRegularExpression.Options.caseInsensitive)
 result = regex!.stringByReplacingMatches(in: result, options: [], range: NSMakeRange(0, result.utf16.count), withTemplate: "$1")

 return result
 }
}
}

91 changes: 46 additions & 45 deletions
Hacker Swifter/Hacker Swifter/HTTP/Cache.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,32 +14,32 @@ private let _DiskCache = DiskCache()

public typealias cacheCompletion = (AnyObject!) -> Void

public class Cache {
open class Cache {

public class var sharedCache: Cache {
open class var sharedCache: Cache {
 return _Cache
 }

 init() {

 }

public class func generateCacheKey(path: String) -> String {
open class func generateCacheKey(_ path: String) -> String {
 if (path == "") {
 return "root"
 }
 return path.stringByReplacingOccurrencesOfString("/",
withString: "#", options: NSStringCompareOptions.CaseInsensitiveSearch, range: nil)
 return path.replacingOccurrences(of: "/",
with: "#", options: NSString.CompareOptions.caseInsensitive, range: nil)
 }

public func setObject(object: AnyObject, key: String) {
 if (object.conformsToProtocol(NSCoding)) {
open func setObject(_ object: AnyObject, key: String) {
 if (object.conforms(to: NSCoding.self)) {
 MemoryCache.sharedMemoryCache.setObject(object, key: key)
 DiskCache.sharedDiskCache.setObject(object, key: key)
 }
 }

public func objectForKey(key: String, completion: cacheCompletion) {
open func objectForKey(_ key: String, completion: cacheCompletion) {
 MemoryCache.sharedMemoryCache.objectForKey(key, completion: {(object: AnyObject!) in
 if let realObject: AnyObject = object {
 completion(realObject)
Expand All@@ -52,63 +52,64 @@ public class Cache {
 })
 }

public func objectForKeySync(key: String) -> AnyObject! {
open func objectForKeySync(_ key: String) -> AnyObject! {
 let ramObject: AnyObject! = MemoryCache.sharedMemoryCache.objectForKeySync(key)
 return (ramObject != nil) ? ramObject : DiskCache.sharedDiskCache.objectForKeySync(key)
 }

public func removeObject(key: String) {
open func removeObject(_ key: String) {
 MemoryCache.sharedMemoryCache.removeObject(key)
 DiskCache.sharedDiskCache.removeObject(key)
 }

public func removeAllObject() {
open func removeAllObject() {
 MemoryCache.sharedMemoryCache.removeAllObject()
 DiskCache.sharedDiskCache.removeAllObject()
 }
}

public class DiskCache: Cache {
open class DiskCache: Cache {

private struct files {
fileprivate struct files {
 static var filepath: String {
 let manager = NSFileManager.defaultManager()
 var paths = NSSearchPathForDirectoriesInDomains(NSSearchPathDirectory.CachesDirectory,
NSSearchPathDomainMask.UserDomainMask, true)
 let manager = FileManager.default
 var paths = NSSearchPathForDirectoriesInDomains(FileManager.SearchPathDirectory.cachesDirectory,
FileManager.SearchPathDomainMask.userDomainMask, true)
 let cachePath = paths[0] + "/modelCache/"
 if (!manager.fileExistsAtPath(cachePath)) {
 if (!manager.fileExists(atPath: cachePath)) {
 do {
 try manager.createDirectoryAtPath(cachePath, withIntermediateDirectories: true, attributes: nil)
 try manager.createDirectory(atPath: cachePath, withIntermediateDirectories: true, attributes: nil)
 } catch _ {
 }
 }
 return cachePath
 }
 }

 private let priority = DISPATCH_QUEUE_PRIORITY_DEFAULT
 fileprivate let priority = DispatchQoS.QoSClass.default


public class var sharedDiskCache: Cache {
open class var sharedDiskCache: Cache {
 return _DiskCache
 }

 override init() {

 }

public func fullPath(key: String) -> String {
open func fullPath(_ key: String) -> String {
 return files.filepath + key
 }

public func objectExist(key: String) -> Bool {
 return NSFileManager.defaultManager().fileExistsAtPath(fullPath(key))
open func objectExist(_ key: String) -> Bool {
 return FileManager.default.fileExists(atPath: fullPath(key))
 }

public override func objectForKey(key: String, completion: cacheCompletion) {
open func objectForKey(_ key: String, completion: @escaping cacheCompletion) {
 if (self.objectExist(key)) {
dispatch_async(dispatch_get_global_queue(self.priority, UInt(0)), { ()->() in
 let object: AnyObject! = NSKeyedUnarchiver.unarchiveObjectWithFile(self.fullPath(key))
dispatch_async(dispatch_get_main_queue(), { ()->() in
DispatchQueue.global(qos: self.priority).async(execute: { ()->() in
 let object: AnyObject! = NSKeyedUnarchiver.unarchiveObject(withFile: self.fullPath(key)) as AnyObject!
DispatchQueue.main.async(execute: { ()->() in
 completion(object)
 })
 })
Expand All@@ -118,60 +119,60 @@ public class DiskCache: Cache {
 }
 }

public override func objectForKeySync(key: String) -> AnyObject! {
open override func objectForKeySync(_ key: String) -> AnyObject! {
 if (self.objectExist(key)) {
 return NSKeyedUnarchiver.unarchiveObjectWithFile(self.fullPath(key))
 return NSKeyedUnarchiver.unarchiveObject(withFile: self.fullPath(key)) as AnyObject!
 }
 return nil
 }

public override func setObject(object: AnyObject, key: String) {
open override func setObject(_ object: AnyObject, key: String) {
 NSKeyedArchiver.archiveRootObject(object, toFile: self.fullPath(key))
 }

public override func removeObject(key: String) {
open override func removeObject(_ key: String) {
 if (self.objectExist(key)) {
 do {
 try NSFileManager.defaultManager().removeItemAtPath(self.fullPath(key))
 try FileManager.default.removeItem(atPath: self.fullPath(key))
 } catch _ {
 }
 }
 }

public override func removeAllObject() {
open override func removeAllObject() {

 }
}

public class MemoryCache: Cache {
open class MemoryCache: Cache {

private var memoryCache = NSCache()
fileprivate var memoryCache = NSCache<AnyObject, AnyObject>()

public class var sharedMemoryCache: Cache {
open class var sharedMemoryCache: Cache {
 return _MemoryCache
 }

 override init() {

 }

public override func objectForKeySync(key: String) -> AnyObject! {
 return self.memoryCache.objectForKey(key)
open override func objectForKeySync(_ key: String) -> AnyObject! {
 return self.memoryCache.object(forKey: key as AnyObject)
 }

public override func objectForKey(key: String, completion: cacheCompletion) {
 completion(self.memoryCache.objectForKey(key))
open override func objectForKey(_ key: String, completion: cacheCompletion) {
 completion(self.memoryCache.object(forKey: key as AnyObject))
 }

public override func setObject(object: AnyObject, key: String) {
 self.memoryCache.setObject(object, forKey: key)
open override func setObject(_ object: AnyObject, key: String) {
 self.memoryCache.setObject(object, forKey: key as AnyObject)
 }

public override func removeObject(key: String) {
 self.memoryCache.removeObjectForKey(key)
open override func removeObject(_ key: String) {
 self.memoryCache.removeObject(forKey: key as AnyObject)
 }

public override func removeAllObject() {
open override func removeAllObject() {
 self.memoryCache.removeAllObjects()
 }

Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Remove or un-stick sticky/fixed headers that block content
(function() {
function unstick() {
document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) {
if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {
el.style.position = 'static';
el.style.top = 'auto';
el.style.zIndex = 'auto';
}
});
}
unstick();
var observer = new MutationObserver(unstick);
observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });
})();
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Updated to Swift3 by juanpablofernandez · Pull Request #23 · Dimillian/HackerSwifter · GitHub
Skip to content
Updated to Swift3#23

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Open

juanpablofernandez
wants to merge
2
commits into

base:master
Choose a base branch

from

 Open


Updated to Swift3
#23
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
0f6a8da

Updated to Swift 3, fixed compiler warnings and errors


t0mball Mar 16, 2017
0c7f13b

Updated to recommended settings


t0mball Mar 16, 2017

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


12 changes: 6 additions & 6 deletions
Hacker Swifter/Hacker Swifter/Extensions/HTMLScanner.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,13 +8,13 @@

import Foundation

extension NSScanner {
 func scanTag(startTag: String, endTag: String) -> String {
extension Scanner {
 func scanTag(_ startTag: String, endTag: String) -> String {
 var temp: NSString? = ""
 var result: NSString? = ""
 self.scanUpToString(startTag, intoString: &temp)
 self.scanString(startTag, intoString: &temp)
 self.scanUpToString(endTag, intoString: &result)
 self.scanUpTo(startTag, into: &temp)
 self.scanString(startTag, into: &temp)
 self.scanUpTo(endTag, into: &result)
 return result as! String
 }
}
}

38 changes: 19 additions & 19 deletions
Hacker Swifter/Hacker Swifter/Extensions/HTMLString.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,29 +9,29 @@
import Foundation

extension String {
 static func stringByRemovingHTMLEntities(string: String) -> String {
 static func stringByRemovingHTMLEntities(_ string: String) -> String {
 var result = string

 result = result.stringByReplacingOccurrencesOfString("<p>", withString: "\n\n", options: .CaseInsensitiveSearch, range: nil)
 result = result.stringByReplacingOccurrencesOfString("</p>", withString: "", options: .CaseInsensitiveSearch, range: nil)
 result = result.stringByReplacingOccurrencesOfString("<i>", withString: "", options: .CaseInsensitiveSearch, range: nil)
 result = result.stringByReplacingOccurrencesOfString("</i>", withString: "", options: .CaseInsensitiveSearch, range: nil)
 result = result.stringByReplacingOccurrencesOfString("&#38;", withString: "&", options: .CaseInsensitiveSearch, range: nil)
 result = result.stringByReplacingOccurrencesOfString("&#62;", withString: ">", options: .CaseInsensitiveSearch, range: nil)
 result = result.stringByReplacingOccurrencesOfString("&#x27;", withString: "'", options: .CaseInsensitiveSearch, range: nil)
 result = result.stringByReplacingOccurrencesOfString("&#x2F;", withString: "/", options: .CaseInsensitiveSearch, range: nil)
 result = result.stringByReplacingOccurrencesOfString("&quot;", withString: "\"", options: .CaseInsensitiveSearch, range: nil)
 result = result.stringByReplacingOccurrencesOfString("&#60;", withString: "<", options: .CaseInsensitiveSearch, range: nil)
 result = result.stringByReplacingOccurrencesOfString("&lt;", withString: "<", options: .CaseInsensitiveSearch, range: nil)
 result = result.stringByReplacingOccurrencesOfString("&gt;", withString: ">", options: .CaseInsensitiveSearch, range: nil)
 result = result.stringByReplacingOccurrencesOfString("&amp;", withString: "&", options: .CaseInsensitiveSearch, range: nil)
 result = result.stringByReplacingOccurrencesOfString("<pre><code>", withString: "", options: .CaseInsensitiveSearch, range: nil)
 result = result.stringByReplacingOccurrencesOfString("</code></pre>", withString: "", options: .CaseInsensitiveSearch, range: nil)
 result = result.replacingOccurrences(of: "<p>", with: "\n\n", options: .caseInsensitive, range: nil)
 result = result.replacingOccurrences(of: "</p>", with: "", options: .caseInsensitive, range: nil)
 result = result.replacingOccurrences(of: "<i>", with: "", options: .caseInsensitive, range: nil)
 result = result.replacingOccurrences(of: "</i>", with: "", options: .caseInsensitive, range: nil)
 result = result.replacingOccurrences(of: "&#38;", with: "&", options: .caseInsensitive, range: nil)
 result = result.replacingOccurrences(of: "&#62;", with: ">", options: .caseInsensitive, range: nil)
 result = result.replacingOccurrences(of: "&#x27;", with: "'", options: .caseInsensitive, range: nil)
 result = result.replacingOccurrences(of: "&#x2F;", with: "/", options: .caseInsensitive, range: nil)
 result = result.replacingOccurrences(of: "&quot;", with: "\"", options: .caseInsensitive, range: nil)
 result = result.replacingOccurrences(of: "&#60;", with: "<", options: .caseInsensitive, range: nil)
 result = result.replacingOccurrences(of: "&lt;", with: "<", options: .caseInsensitive, range: nil)
 result = result.replacingOccurrences(of: "&gt;", with: ">", options: .caseInsensitive, range: nil)
 result = result.replacingOccurrences(of: "&amp;", with: "&", options: .caseInsensitive, range: nil)
 result = result.replacingOccurrences(of: "<pre><code>", with: "", options: .caseInsensitive, range: nil)
 result = result.replacingOccurrences(of: "</code></pre>", with: "", options: .caseInsensitive, range: nil)

 let regex = try? NSRegularExpression(pattern: "<a[^>]+href=\"(.*?)\"[^>]*>.*?</a>",
 options: NSRegularExpressionOptions.CaseInsensitive)
 result = regex!.stringByReplacingMatchesInString(result, options: [], range: NSMakeRange(0, result.utf16.count), withTemplate: "$1")
 options: NSRegularExpression.Options.caseInsensitive)
 result = regex!.stringByReplacingMatches(in: result, options: [], range: NSMakeRange(0, result.utf16.count), withTemplate: "$1")

 return result
 }
}
}

91 changes: 46 additions & 45 deletions
Hacker Swifter/Hacker Swifter/HTTP/Cache.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,32 +14,32 @@ private let _DiskCache = DiskCache()

public typealias cacheCompletion = (AnyObject!) -> Void

public class Cache {
open class Cache {

public class var sharedCache: Cache {
open class var sharedCache: Cache {
 return _Cache
 }

 init() {

 }

public class func generateCacheKey(path: String) -> String {
open class func generateCacheKey(_ path: String) -> String {
 if (path == "") {
 return "root"
 }
 return path.stringByReplacingOccurrencesOfString("/",
withString: "#", options: NSStringCompareOptions.CaseInsensitiveSearch, range: nil)
 return path.replacingOccurrences(of: "/",
with: "#", options: NSString.CompareOptions.caseInsensitive, range: nil)
 }

public func setObject(object: AnyObject, key: String) {
 if (object.conformsToProtocol(NSCoding)) {
open func setObject(_ object: AnyObject, key: String) {
 if (object.conforms(to: NSCoding.self)) {
 MemoryCache.sharedMemoryCache.setObject(object, key: key)
 DiskCache.sharedDiskCache.setObject(object, key: key)
 }
 }

public func objectForKey(key: String, completion: cacheCompletion) {
open func objectForKey(_ key: String, completion: cacheCompletion) {
 MemoryCache.sharedMemoryCache.objectForKey(key, completion: {(object: AnyObject!) in
 if let realObject: AnyObject = object {
 completion(realObject)
Expand All@@ -52,63 +52,64 @@ public class Cache {
 })
 }

public func objectForKeySync(key: String) -> AnyObject! {
open func objectForKeySync(_ key: String) -> AnyObject! {
 let ramObject: AnyObject! = MemoryCache.sharedMemoryCache.objectForKeySync(key)
 return (ramObject != nil) ? ramObject : DiskCache.sharedDiskCache.objectForKeySync(key)
 }

public func removeObject(key: String) {
open func removeObject(_ key: String) {
 MemoryCache.sharedMemoryCache.removeObject(key)
 DiskCache.sharedDiskCache.removeObject(key)
 }

public func removeAllObject() {
open func removeAllObject() {
 MemoryCache.sharedMemoryCache.removeAllObject()
 DiskCache.sharedDiskCache.removeAllObject()
 }
}

public class DiskCache: Cache {
open class DiskCache: Cache {

private struct files {
fileprivate struct files {
 static var filepath: String {
 let manager = NSFileManager.defaultManager()
 var paths = NSSearchPathForDirectoriesInDomains(NSSearchPathDirectory.CachesDirectory,
NSSearchPathDomainMask.UserDomainMask, true)
 let manager = FileManager.default
 var paths = NSSearchPathForDirectoriesInDomains(FileManager.SearchPathDirectory.cachesDirectory,
FileManager.SearchPathDomainMask.userDomainMask, true)
 let cachePath = paths[0] + "/modelCache/"
 if (!manager.fileExistsAtPath(cachePath)) {
 if (!manager.fileExists(atPath: cachePath)) {
 do {
 try manager.createDirectoryAtPath(cachePath, withIntermediateDirectories: true, attributes: nil)
 try manager.createDirectory(atPath: cachePath, withIntermediateDirectories: true, attributes: nil)
 } catch _ {
 }
 }
 return cachePath
 }
 }

 private let priority = DISPATCH_QUEUE_PRIORITY_DEFAULT
 fileprivate let priority = DispatchQoS.QoSClass.default


public class var sharedDiskCache: Cache {
open class var sharedDiskCache: Cache {
 return _DiskCache
 }

 override init() {

 }

public func fullPath(key: String) -> String {
open func fullPath(_ key: String) -> String {
 return files.filepath + key
 }

public func objectExist(key: String) -> Bool {
 return NSFileManager.defaultManager().fileExistsAtPath(fullPath(key))
open func objectExist(_ key: String) -> Bool {
 return FileManager.default.fileExists(atPath: fullPath(key))
 }

public override func objectForKey(key: String, completion: cacheCompletion) {
open func objectForKey(_ key: String, completion: @escaping cacheCompletion) {
 if (self.objectExist(key)) {
dispatch_async(dispatch_get_global_queue(self.priority, UInt(0)), { ()->() in
 let object: AnyObject! = NSKeyedUnarchiver.unarchiveObjectWithFile(self.fullPath(key))
dispatch_async(dispatch_get_main_queue(), { ()->() in
DispatchQueue.global(qos: self.priority).async(execute: { ()->() in
 let object: AnyObject! = NSKeyedUnarchiver.unarchiveObject(withFile: self.fullPath(key)) as AnyObject!
DispatchQueue.main.async(execute: { ()->() in
 completion(object)
 })
 })
Expand All@@ -118,60 +119,60 @@ public class DiskCache: Cache {
 }
 }

public override func objectForKeySync(key: String) -> AnyObject! {
open override func objectForKeySync(_ key: String) -> AnyObject! {
 if (self.objectExist(key)) {
 return NSKeyedUnarchiver.unarchiveObjectWithFile(self.fullPath(key))
 return NSKeyedUnarchiver.unarchiveObject(withFile: self.fullPath(key)) as AnyObject!
 }
 return nil
 }

public override func setObject(object: AnyObject, key: String) {
open override func setObject(_ object: AnyObject, key: String) {
 NSKeyedArchiver.archiveRootObject(object, toFile: self.fullPath(key))
 }

public override func removeObject(key: String) {
open override func removeObject(_ key: String) {
 if (self.objectExist(key)) {
 do {
 try NSFileManager.defaultManager().removeItemAtPath(self.fullPath(key))
 try FileManager.default.removeItem(atPath: self.fullPath(key))
 } catch _ {
 }
 }
 }

public override func removeAllObject() {
open override func removeAllObject() {

 }
}

public class MemoryCache: Cache {
open class MemoryCache: Cache {

private var memoryCache = NSCache()
fileprivate var memoryCache = NSCache<AnyObject, AnyObject>()

public class var sharedMemoryCache: Cache {
open class var sharedMemoryCache: Cache {
 return _MemoryCache
 }

 override init() {

 }

public override func objectForKeySync(key: String) -> AnyObject! {
 return self.memoryCache.objectForKey(key)
open override func objectForKeySync(_ key: String) -> AnyObject! {
 return self.memoryCache.object(forKey: key as AnyObject)
 }

public override func objectForKey(key: String, completion: cacheCompletion) {
 completion(self.memoryCache.objectForKey(key))
open override func objectForKey(_ key: String, completion: cacheCompletion) {
 completion(self.memoryCache.object(forKey: key as AnyObject))
 }

public override func setObject(object: AnyObject, key: String) {
 self.memoryCache.setObject(object, forKey: key)
open override func setObject(_ object: AnyObject, key: String) {
 self.memoryCache.setObject(object, forKey: key as AnyObject)
 }

public override func removeObject(key: String) {
 self.memoryCache.removeObjectForKey(key)
open override func removeObject(_ key: String) {
 self.memoryCache.removeObject(forKey: key as AnyObject)
 }

public override func removeAllObject() {
open override func removeAllObject() {
 self.memoryCache.removeAllObjects()
 }

Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Universal Dark Mode - works on any site
(function() {
var enabled = true;
function applyDarkMode() {
if (!enabled) return;
// Create style element if it doesn't exist
var style = document.getElementById('universal-dark-mode-style');
if (!style) {
style = document.createElement('style');
style.id = 'universal-dark-mode-style';
document.head.appendChild(style);
}
// Dark mode CSS - inverts colors but preserves images/video
style.textContent = '
/* Invert everything except media */
html {
filter: invert(1) hue-rotate(180deg) !important;
background: #1a1a2e !important;
}
/* Restore images, videos, iframes, canvas */
img, video, iframe, canvas, svg, picture, [style*="background-image"] {
filter: invert(1) hue-rotate(180deg) !important;
}
/* Preserve specific elements that should not be inverted */
.no-dark-mode, .no-dark-mode *,
[data-theme="light"], [data-theme="light"],
.ace_editor, .ace_editor *,
.CodeMirror, .CodeMirror *,
.monaco-editor, .monaco-editor *,
.markdown-body pre, .markdown-body pre *,
.highlight, .highlight *,
pre code, pre code * {
filter: none !important;
}
/* Fix common UI elements */
.modal, .popup, .dropdown-menu, .tooltip, .popover {
filter: invert(1) hue-rotate(180deg) !important;
background: #2d2d44 !important;
border-color: #444 !important;
}
/* Scrollbars */
::-webkit-scrollbar { background: #1a1a2e !important; }
::-webkit-scrollbar-thumb { background: #444 !important; }
::-webkit-scrollbar-thumb:hover { background: #555 !important; }
/* Selection */
::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
';
}
function removeDarkMode() {
var style = document.getElementById('universal-dark-mode-style');
if (style) style.remove();
}
// Toggle with Alt+Shift+D
document.addEventListener('keydown', function(e) {
if (e.altKey && e.shiftKey && e.key === 'D') {
e.preventDefault();
enabled = !enabled;
if (enabled) {
applyDarkMode();
console.log('[Universal Dark Mode] Enabled');
} else {
removeDarkMode();
console.log('[Universal Dark Mode] Disabled');
}
}
});
// Apply on load
applyDarkMode();
// Re-apply on dynamic content
var observer = new MutationObserver(function(mutations) {
if (enabled && !document.getElementById('universal-dark-mode-style')) {
applyDarkMode();
}
});
observer.observe(document.head, { childList: true });
console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');
})();
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();
Updated to Swift3 by juanpablofernandez · Pull Request #23 · Dimillian/HackerSwifter · GitHub
Skip to content
Updated to Swift3#23

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Open

juanpablofernandez
wants to merge
2
commits into

base:master
Choose a base branch

from

 Open


Updated to Swift3
#23
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
0f6a8da

Updated to Swift 3, fixed compiler warnings and errors


t0mball Mar 16, 2017
0c7f13b

Updated to recommended settings


t0mball Mar 16, 2017

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


12 changes: 6 additions & 6 deletions
Hacker Swifter/Hacker Swifter/Extensions/HTMLScanner.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,13 +8,13 @@

import Foundation

extension NSScanner {
 func scanTag(startTag: String, endTag: String) -> String {
extension Scanner {
 func scanTag(_ startTag: String, endTag: String) -> String {
 var temp: NSString? = ""
 var result: NSString? = ""
 self.scanUpToString(startTag, intoString: &temp)
 self.scanString(startTag, intoString: &temp)
 self.scanUpToString(endTag, intoString: &result)
 self.scanUpTo(startTag, into: &temp)
 self.scanString(startTag, into: &temp)
 self.scanUpTo(endTag, into: &result)
 return result as! String
 }
}
}

38 changes: 19 additions & 19 deletions
Hacker Swifter/Hacker Swifter/Extensions/HTMLString.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,29 +9,29 @@
import Foundation

extension String {
 static func stringByRemovingHTMLEntities(string: String) -> String {
 static func stringByRemovingHTMLEntities(_ string: String) -> String {
 var result = string

 result = result.stringByReplacingOccurrencesOfString("<p>", withString: "\n\n", options: .CaseInsensitiveSearch, range: nil)
 result = result.stringByReplacingOccurrencesOfString("</p>", withString: "", options: .CaseInsensitiveSearch, range: nil)
 result = result.stringByReplacingOccurrencesOfString("<i>", withString: "", options: .CaseInsensitiveSearch, range: nil)
 result = result.stringByReplacingOccurrencesOfString("</i>", withString: "", options: .CaseInsensitiveSearch, range: nil)
 result = result.stringByReplacingOccurrencesOfString("&#38;", withString: "&", options: .CaseInsensitiveSearch, range: nil)
 result = result.stringByReplacingOccurrencesOfString("&#62;", withString: ">", options: .CaseInsensitiveSearch, range: nil)
 result = result.stringByReplacingOccurrencesOfString("&#x27;", withString: "'", options: .CaseInsensitiveSearch, range: nil)
 result = result.stringByReplacingOccurrencesOfString("&#x2F;", withString: "/", options: .CaseInsensitiveSearch, range: nil)
 result = result.stringByReplacingOccurrencesOfString("&quot;", withString: "\"", options: .CaseInsensitiveSearch, range: nil)
 result = result.stringByReplacingOccurrencesOfString("&#60;", withString: "<", options: .CaseInsensitiveSearch, range: nil)
 result = result.stringByReplacingOccurrencesOfString("&lt;", withString: "<", options: .CaseInsensitiveSearch, range: nil)
 result = result.stringByReplacingOccurrencesOfString("&gt;", withString: ">", options: .CaseInsensitiveSearch, range: nil)
 result = result.stringByReplacingOccurrencesOfString("&amp;", withString: "&", options: .CaseInsensitiveSearch, range: nil)
 result = result.stringByReplacingOccurrencesOfString("<pre><code>", withString: "", options: .CaseInsensitiveSearch, range: nil)
 result = result.stringByReplacingOccurrencesOfString("</code></pre>", withString: "", options: .CaseInsensitiveSearch, range: nil)
 result = result.replacingOccurrences(of: "<p>", with: "\n\n", options: .caseInsensitive, range: nil)
 result = result.replacingOccurrences(of: "</p>", with: "", options: .caseInsensitive, range: nil)
 result = result.replacingOccurrences(of: "<i>", with: "", options: .caseInsensitive, range: nil)
 result = result.replacingOccurrences(of: "</i>", with: "", options: .caseInsensitive, range: nil)
 result = result.replacingOccurrences(of: "&#38;", with: "&", options: .caseInsensitive, range: nil)
 result = result.replacingOccurrences(of: "&#62;", with: ">", options: .caseInsensitive, range: nil)
 result = result.replacingOccurrences(of: "&#x27;", with: "'", options: .caseInsensitive, range: nil)
 result = result.replacingOccurrences(of: "&#x2F;", with: "/", options: .caseInsensitive, range: nil)
 result = result.replacingOccurrences(of: "&quot;", with: "\"", options: .caseInsensitive, range: nil)
 result = result.replacingOccurrences(of: "&#60;", with: "<", options: .caseInsensitive, range: nil)
 result = result.replacingOccurrences(of: "&lt;", with: "<", options: .caseInsensitive, range: nil)
 result = result.replacingOccurrences(of: "&gt;", with: ">", options: .caseInsensitive, range: nil)
 result = result.replacingOccurrences(of: "&amp;", with: "&", options: .caseInsensitive, range: nil)
 result = result.replacingOccurrences(of: "<pre><code>", with: "", options: .caseInsensitive, range: nil)
 result = result.replacingOccurrences(of: "</code></pre>", with: "", options: .caseInsensitive, range: nil)

 let regex = try? NSRegularExpression(pattern: "<a[^>]+href=\"(.*?)\"[^>]*>.*?</a>",
 options: NSRegularExpressionOptions.CaseInsensitive)
 result = regex!.stringByReplacingMatchesInString(result, options: [], range: NSMakeRange(0, result.utf16.count), withTemplate: "$1")
 options: NSRegularExpression.Options.caseInsensitive)
 result = regex!.stringByReplacingMatches(in: result, options: [], range: NSMakeRange(0, result.utf16.count), withTemplate: "$1")

 return result
 }
}
}

91 changes: 46 additions & 45 deletions
Hacker Swifter/Hacker Swifter/HTTP/Cache.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,32 +14,32 @@ private let _DiskCache = DiskCache()

public typealias cacheCompletion = (AnyObject!) -> Void

public class Cache {
open class Cache {

public class var sharedCache: Cache {
open class var sharedCache: Cache {
 return _Cache
 }

 init() {

 }

public class func generateCacheKey(path: String) -> String {
open class func generateCacheKey(_ path: String) -> String {
 if (path == "") {
 return "root"
 }
 return path.stringByReplacingOccurrencesOfString("/",
withString: "#", options: NSStringCompareOptions.CaseInsensitiveSearch, range: nil)
 return path.replacingOccurrences(of: "/",
with: "#", options: NSString.CompareOptions.caseInsensitive, range: nil)
 }

public func setObject(object: AnyObject, key: String) {
 if (object.conformsToProtocol(NSCoding)) {
open func setObject(_ object: AnyObject, key: String) {
 if (object.conforms(to: NSCoding.self)) {
 MemoryCache.sharedMemoryCache.setObject(object, key: key)
 DiskCache.sharedDiskCache.setObject(object, key: key)
 }
 }

public func objectForKey(key: String, completion: cacheCompletion) {
open func objectForKey(_ key: String, completion: cacheCompletion) {
 MemoryCache.sharedMemoryCache.objectForKey(key, completion: {(object: AnyObject!) in
 if let realObject: AnyObject = object {
 completion(realObject)
Expand All@@ -52,63 +52,64 @@ public class Cache {
 })
 }

public func objectForKeySync(key: String) -> AnyObject! {
open func objectForKeySync(_ key: String) -> AnyObject! {
 let ramObject: AnyObject! = MemoryCache.sharedMemoryCache.objectForKeySync(key)
 return (ramObject != nil) ? ramObject : DiskCache.sharedDiskCache.objectForKeySync(key)
 }

public func removeObject(key: String) {
open func removeObject(_ key: String) {
 MemoryCache.sharedMemoryCache.removeObject(key)
 DiskCache.sharedDiskCache.removeObject(key)
 }

public func removeAllObject() {
open func removeAllObject() {
 MemoryCache.sharedMemoryCache.removeAllObject()
 DiskCache.sharedDiskCache.removeAllObject()
 }
}

public class DiskCache: Cache {
open class DiskCache: Cache {

private struct files {
fileprivate struct files {
 static var filepath: String {
 let manager = NSFileManager.defaultManager()
 var paths = NSSearchPathForDirectoriesInDomains(NSSearchPathDirectory.CachesDirectory,
NSSearchPathDomainMask.UserDomainMask, true)
 let manager = FileManager.default
 var paths = NSSearchPathForDirectoriesInDomains(FileManager.SearchPathDirectory.cachesDirectory,
FileManager.SearchPathDomainMask.userDomainMask, true)
 let cachePath = paths[0] + "/modelCache/"
 if (!manager.fileExistsAtPath(cachePath)) {
 if (!manager.fileExists(atPath: cachePath)) {
 do {
 try manager.createDirectoryAtPath(cachePath, withIntermediateDirectories: true, attributes: nil)
 try manager.createDirectory(atPath: cachePath, withIntermediateDirectories: true, attributes: nil)
 } catch _ {
 }
 }
 return cachePath
 }
 }

 private let priority = DISPATCH_QUEUE_PRIORITY_DEFAULT
 fileprivate let priority = DispatchQoS.QoSClass.default


public class var sharedDiskCache: Cache {
open class var sharedDiskCache: Cache {
 return _DiskCache
 }

 override init() {

 }

public func fullPath(key: String) -> String {
open func fullPath(_ key: String) -> String {
 return files.filepath + key
 }

public func objectExist(key: String) -> Bool {
 return NSFileManager.defaultManager().fileExistsAtPath(fullPath(key))
open func objectExist(_ key: String) -> Bool {
 return FileManager.default.fileExists(atPath: fullPath(key))
 }

public override func objectForKey(key: String, completion: cacheCompletion) {
open func objectForKey(_ key: String, completion: @escaping cacheCompletion) {
 if (self.objectExist(key)) {
dispatch_async(dispatch_get_global_queue(self.priority, UInt(0)), { ()->() in
 let object: AnyObject! = NSKeyedUnarchiver.unarchiveObjectWithFile(self.fullPath(key))
dispatch_async(dispatch_get_main_queue(), { ()->() in
DispatchQueue.global(qos: self.priority).async(execute: { ()->() in
 let object: AnyObject! = NSKeyedUnarchiver.unarchiveObject(withFile: self.fullPath(key)) as AnyObject!
DispatchQueue.main.async(execute: { ()->() in
 completion(object)
 })
 })
Expand All@@ -118,60 +119,60 @@ public class DiskCache: Cache {
 }
 }

public override func objectForKeySync(key: String) -> AnyObject! {
open override func objectForKeySync(_ key: String) -> AnyObject! {
 if (self.objectExist(key)) {
 return NSKeyedUnarchiver.unarchiveObjectWithFile(self.fullPath(key))
 return NSKeyedUnarchiver.unarchiveObject(withFile: self.fullPath(key)) as AnyObject!
 }
 return nil
 }

public override func setObject(object: AnyObject, key: String) {
open override func setObject(_ object: AnyObject, key: String) {
 NSKeyedArchiver.archiveRootObject(object, toFile: self.fullPath(key))
 }

public override func removeObject(key: String) {
open override func removeObject(_ key: String) {
 if (self.objectExist(key)) {
 do {
 try NSFileManager.defaultManager().removeItemAtPath(self.fullPath(key))
 try FileManager.default.removeItem(atPath: self.fullPath(key))
 } catch _ {
 }
 }
 }

public override func removeAllObject() {
open override func removeAllObject() {

 }
}

public class MemoryCache: Cache {
open class MemoryCache: Cache {

private var memoryCache = NSCache()
fileprivate var memoryCache = NSCache<AnyObject, AnyObject>()

public class var sharedMemoryCache: Cache {
open class var sharedMemoryCache: Cache {
 return _MemoryCache
 }

 override init() {

 }

public override func objectForKeySync(key: String) -> AnyObject! {
 return self.memoryCache.objectForKey(key)
open override func objectForKeySync(_ key: String) -> AnyObject! {
 return self.memoryCache.object(forKey: key as AnyObject)
 }

public override func objectForKey(key: String, completion: cacheCompletion) {
 completion(self.memoryCache.objectForKey(key))
open override func objectForKey(_ key: String, completion: cacheCompletion) {
 completion(self.memoryCache.object(forKey: key as AnyObject))
 }

public override func setObject(object: AnyObject, key: String) {
 self.memoryCache.setObject(object, forKey: key)
open override func setObject(_ object: AnyObject, key: String) {
 self.memoryCache.setObject(object, forKey: key as AnyObject)
 }

public override func removeObject(key: String) {
 self.memoryCache.removeObjectForKey(key)
open override func removeObject(_ key: String) {
 self.memoryCache.removeObject(forKey: key as AnyObject)
 }

public override func removeAllObject() {
open override func removeAllObject() {
 self.memoryCache.removeAllObjects()
 }

Expand Down
Loading