Marco
/
kplayer
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Search

master
Marco Schmickler 10 years ago
parent
0bb90a7450
commit
1157508864
7 changed files with 125 additions and 67 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      kplayer/Base.lproj/Main.storyboard
  2. 3
      kplayer/core/ItemModel.swift
  3. 2
      kplayer/core/MediaItem.swift
  4. 40
      kplayer/core/NetworkManager.swift
  5. 55
      kplayer/detail/DetailViewController.swift
  6. 8
      kplayer/detail/ItemCell.swift
  7. 80
      kplayer/master/MasterViewController.swift

4
kplayer/Base.lproj/Main.storyboard
View File

@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="9531" systemVersion="15C50" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" initialViewController="H1p-Uh-vWS">
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="10117" systemVersion="15F34" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" initialViewController="H1p-Uh-vWS">
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="9529"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="10085"/>
</dependencies>
<scenes>
<!--Master-->

3
kplayer/core/ItemModel.swift
View File

@ -14,7 +14,8 @@ class ItemModel {
var folder = itemsMap[path]
if folder == nil {
folder = MediaItem(name: "", path: item.path, root: item.root, type: ItemType.FOLDER)
folder = MediaItem(name: item.path, path: item.path, root: item.root, type: ItemType.FOLDER)
folder!.loaded = true
itemsMap[path] = folder!
items.append(folder!)
}

2
kplayer/core/MediaItem.swift
View File

@ -146,7 +146,7 @@ class MediaItem: CustomDebugStringConvertible {
}
var playerURL: NSURL? {
let enc = name.stringByReplacingOccurrencesOfString(" ", withString: "%20")
let enc = "/" + name.stringByReplacingOccurrencesOfString(" ", withString: "%20")
return NSURL(string: NetworkManager.sharedInstance.baseurl + "/service/stream" + encodedDir! + enc)
}

40
kplayer/core/NetworkManager.swift
View File

@ -22,8 +22,17 @@ class NetworkManager {
internal typealias Weiter = ([MediaItem]) -> Void
func loadDirs(root: String, completionHandler: Weiter) -> Void {
let url1 = baseurl + "/service/listvideos" + root
func loadDirs(rootParam: String, completionHandler: Weiter) -> Void {
var root = rootParam
if root.containsString("*") {
root = rootParam[rootParam.startIndex..<rootParam.rangeOfString("*")!.startIndex]
}
if root.endsWith("/") {
root = root[root.startIndex..<root.endIndex.predecessor()]
}
let url1 = baseurl + "/service/listvideos" + rootParam
let len = root.characters.count
var res = [MediaItem]()
let url = (url1 as NSString).stringByReplacingOccurrencesOfString(" ", withString: "+")
@ -62,8 +71,18 @@ class NetworkManager {
}
}
func loadPicDirs(root: String, completionHandler: Weiter) -> Void {
let url1 = baseurl + "/service/listpicdirs" + root
func loadPicDirs(rootParam: String, completionHandler: Weiter) -> Void {
var root = rootParam
if root.containsString("*") {
root = rootParam[rootParam.startIndex..<rootParam.rangeOfString("*")!.startIndex]
}
if root.endsWith("/") {
root = root[root.startIndex..<root.endIndex.predecessor()]
}
let url1 = baseurl + "/service/listpicdirs" + rootParam
let len = root.characters.count
var res = [MediaItem]()
let url = (url1 as NSString).stringByReplacingOccurrencesOfString(" ", withString: "+")
@ -110,6 +129,8 @@ class NetworkManager {
picfolder.children.append(i)
} else {
let iff = MediaItem(name: folderName, path: fpath, root: root, type: ItemType.PICS)
iff.thumbUrl = i.thumbUrl
items[path] = iff
res.append(iff)
iff.children.append(i)
@ -183,12 +204,6 @@ class NetworkManager {
return
}
if (item.loaded) {
return
}
// Alamofire.Manager.sharedInstance.session.invalidateAndCancel()
var j = 0
for i in item.children {
loadItem(i, index: j)
@ -199,6 +214,11 @@ class NetworkManager {
func loadItem(item: MediaItem, index: Int) {
if (item.type != ItemType.VIDEO) {
var j = 0
for i in item.children {
loadItem(i, index: j)
j+=1
}
return
}

55
kplayer/detail/DetailViewController.swift
View File

@ -122,32 +122,41 @@ class DetailViewController: UIViewController, UICollectionViewDelegateFlowLayout
let oid = ObjectIdentifier(self)
if let detail: MediaItem = self.detailItem {
if i.parent! !== detail {
return
}
if i.type == ItemType.VIDEO {
if i.parent!.type != ItemType.DETAILS {
let path = NSIndexPath(forItem: index, inSection: i.parent!.index)
self.collectionView.reloadItemsAtIndexPaths([path])
}
print("Object: \(oid.hashValue) Index \(index) Item: \(i) Parent: \(i.parent) Detail: \(detailItem)")
} else {
if i.parent! !== detail {
return
}
collectionView.performBatchUpdates({
var newItems = [NSIndexPath]()
var j = 0
print("Object: \(oid.hashValue) Index \(index) Item: \(i) Parent: \(i.parent) Detail: \(detailItem)")
if detail.children.count > index {
let path = NSIndexPath(forItem: 0, inSection: index)
self.collectionView.reloadItemsAtIndexPaths([path])
collectionView.performBatchUpdates({
var newItems = [NSIndexPath]()
var j = 0
for _ in detail.children[index].children {
if j >= 1 {
newItems.append(NSIndexPath(forItem: j, inSection: index))
if detail.children.count > index {
let path = NSIndexPath(forItem: 0, inSection: index)
self.collectionView.reloadItemsAtIndexPaths([path])
for _ in detail.children[index].children {
if j >= 1 {
newItems.append(NSIndexPath(forItem: j, inSection: index))
}
j += 1
}
j+=1
self.collectionView.insertItemsAtIndexPaths(newItems)
}
self.collectionView.insertItemsAtIndexPaths(newItems)
}
return
}, completion: nil)
return
}, completion: nil)
}
}
}
func handleLongPress(gestureRecognizer: UILongPressGestureRecognizer) {
@ -248,7 +257,7 @@ class DetailViewController: UIViewController, UICollectionViewDelegateFlowLayout
func collectionView(collectionView: UICollectionView, didSelectItemAtIndexPath indexPath: NSIndexPath) {
if let detail: MediaItem = self.detailItem {
var items = detail.children[indexPath.section]
if (items.loaded || items.type == ItemType.VIDEO) {
if (items.loaded) {
if indexPath.item >= items.children.count {
print(items.name)
} else {
@ -257,8 +266,12 @@ class DetailViewController: UIViewController, UICollectionViewDelegateFlowLayout
}
self.currentItem = items
}
if items.type == ItemType.VIDEO {
performSegueWithIdentifier("showVideo", sender: self)
} else {
}
else {
let len = items.root.characters.count
let url = NetworkManager.sharedInstance.baseurl + "/service/listfiles" + items.fullPath

8
kplayer/detail/ItemCell.swift
View File

@ -39,7 +39,13 @@ class ItemCell: UICollectionViewCell {
} else {
if let i = item.image {
image.image = i.scaleToSize(15 * 16, height: 15 * 9)
} else {
} else if item.children.count > 0 {
if let _ = item.children[0].thumbUrl, nsurl = NSURL(string: item.children[0].thumbUrlAbsolute) {
image.hnk_setImageFromURL(nsurl, placeholder: defaultImage)
}
}
else
{
image.image = defaultImage
}
}

80
kplayer/master/MasterViewController.swift
View File

@ -9,8 +9,8 @@
import UIKit
import CoreData
class MasterViewController: UITableViewController {
class MasterViewController: UITableViewController, UISearchResultsUpdating {
let searchController = UISearchController(searchResultsController: nil)
let model = ItemModel()
override func awakeFromNib() {
@ -22,7 +22,10 @@ class MasterViewController: UITableViewController {
}
override func viewDidLoad() {
searchController.searchResultsUpdater = self
searchController.dimsBackgroundDuringPresentation = false
definesPresentationContext = true
tableView.tableHeaderView = searchController.searchBar
}
override func didReceiveMemoryWarning() {
@ -32,20 +35,31 @@ class MasterViewController: UITableViewController {
// Dispose of any resources that can be recreated.
}
func updateSearchResultsForSearchController(search: UISearchController) {
let str = search.searchBar.text!
if str.hasSuffix("*") {
let txt = str[str.startIndex ..< str.endIndex.advancedBy(-1)]
let neu = MediaItem(name: txt, path: model.items[0].parent!.path + "*" + txt, root: model.items[0].parent!.root, type: ItemType.DETAILS)
model.items.append(neu)
neu.parent = model.items[0].parent
self.tableView.reloadData()
}
}
func selectLoadedItem(selectedItem: MediaItem) {
switch selectedItem.type {
case ItemType.DETAILS:
performSegueWithIdentifier("showDetail", sender: self)
case ItemType.DETAILS:
performSegueWithIdentifier("showDetail", sender: self)
case ItemType.FOLDER:
if selectedItem.children.first?.type == ItemType.VIDEO {
performSegueWithIdentifier("showDetail", sender: self)
}
else {
gotoNextFolder(selectedItem)
}
default:
print(selectedItem.type)
case ItemType.FOLDER:
if selectedItem.children.first?.type == ItemType.VIDEO {
performSegueWithIdentifier("showDetail", sender: self)
} else {
gotoNextFolder(selectedItem)
}
default:
print(selectedItem.type)
}
}
@ -56,7 +70,7 @@ class MasterViewController: UITableViewController {
if selectedItem.type == ItemType.DETAILS {
gotoDetails(selectedItem)
return
// selectLoadedItem(selectedItem)
// selectLoadedItem(selectedItem)
}
@ -88,8 +102,7 @@ class MasterViewController: UITableViewController {
neu.children.append(details)
hasDetails = true
}
}
else {
} else {
// item.type = ItemType.FOLDER
item.parent = selectedItem
neu.children.append(item)
@ -132,26 +145,31 @@ class MasterViewController: UITableViewController {
selectedItem.children = model.items
selectedItem.loaded = false
var all: [MediaItem]?
if selectedItem.path.containsString("*") {
selectedItem.loaded = true
} else
{
var all: [MediaItem]?
for f in selectedItem.children {
print(f.path)
if f.type == ItemType.FOLDER && f.path == "" {
all = f.children
break
for f in selectedItem.children {
print(f.path)
if f.type == ItemType.FOLDER && f.path == "" {
all = f.children
break
}
}
}
if all != nil {
selectedItem.children = all!
selectedItem.loaded = false
if all != nil {
selectedItem.children = all!
selectedItem.loaded = false
for f in all! {
f.loaded = false
f.parent = selectedItem
for f in all! {
f.loaded = false
f.parent = selectedItem
}
}
}
self.performSegueWithIdentifier("showDetail", sender: self)
return
}

Write Preview
Loading…
Cancel
Save