瀏覽代碼

Removed Mac Finder mode

Pierre-Olivier Latour 11 年之前
父節點
當前提交
9f0544b449
共有 3 個文件被更改,包括 4 次插入11 次删除
  1. 0 1
      GCDWebDAVServer/GCDWebDAVServer.h
  2. 3 9
      GCDWebDAVServer/GCDWebDAVServer.m
  3. 1 1
      Mac/main.m

+ 0 - 1
GCDWebDAVServer/GCDWebDAVServer.h

@@ -47,7 +47,6 @@
 @property(nonatomic, copy) NSArray* allowedFileExtensions;  // Default is nil i.e. all file extensions are allowed
 @property(nonatomic) BOOL showHiddenFiles;  // Default is NO
 - (instancetype)initWithUploadDirectory:(NSString*)path;
-- (instancetype)initWithUploadDirectory:(NSString*)path macFinderMode:(BOOL)macFinderMode;  // If Mac Finder mode is ON, WebDAV server can be mounted read-write instead of read-only in OS X Finder
 @end
 
 @interface GCDWebDAVServer (Subclassing)

+ 3 - 9
GCDWebDAVServer/GCDWebDAVServer.m

@@ -51,7 +51,6 @@ typedef NS_ENUM(NSInteger, DAVProperties) {
 @interface GCDWebDAVServer () {
 @private
   NSString* _uploadDirectory;
-  BOOL _macMode;
   id<GCDWebDAVServerDelegate> __unsafe_unretained _delegate;
   NSArray* _allowedExtensions;
   BOOL _showHidden;
@@ -74,7 +73,7 @@ static inline BOOL _IsMacFinder(GCDWebServerRequest* request) {
 
 - (GCDWebServerResponse*)performOPTIONS:(GCDWebServerRequest*)request {
   GCDWebServerResponse* response = [GCDWebServerResponse response];
-  if (_macMode && _IsMacFinder(request)) {
+  if (_IsMacFinder(request)) {
     [response setValue:@"1, 2" forAdditionalHeader:@"DAV"];  // Classes 1 and 2
   } else {
     [response setValue:@"1" forAdditionalHeader:@"DAV"];  // Class 1
@@ -446,7 +445,7 @@ static inline xmlNodePtr _XMLChildWithName(xmlNodePtr child, const xmlChar* name
 }
 
 - (GCDWebServerResponse*)performLOCK:(GCDWebServerDataRequest*)request {
-  if (!_macMode || !_IsMacFinder(request)) {
+  if (!_IsMacFinder(request)) {
     return [GCDWebServerErrorResponse responseWithClientError:kGCDWebServerHTTPStatusCode_MethodNotAllowed message:@"LOCK method only allowed for Mac Finder"];
   }
   
@@ -534,7 +533,7 @@ static inline xmlNodePtr _XMLChildWithName(xmlNodePtr child, const xmlChar* name
 }
 
 - (GCDWebServerResponse*)performUNLOCK:(GCDWebServerRequest*)request {
-  if (!_macMode || !_IsMacFinder(request)) {
+  if (!_IsMacFinder(request)) {
     return [GCDWebServerErrorResponse responseWithClientError:kGCDWebServerHTTPStatusCode_MethodNotAllowed message:@"UNLOCK method only allowed for Mac Finder"];
   }
   
@@ -560,13 +559,8 @@ static inline xmlNodePtr _XMLChildWithName(xmlNodePtr child, const xmlChar* name
 @synthesize uploadDirectory=_uploadDirectory, delegate=_delegate, allowedFileExtensions=_allowedExtensions, showHiddenFiles=_showHidden;
 
 - (instancetype)initWithUploadDirectory:(NSString*)path {
-  return [self initWithUploadDirectory:path macFinderMode:NO];
-}
-
-- (instancetype)initWithUploadDirectory:(NSString*)path macFinderMode:(BOOL)macFinderMode {
   if ((self = [super init])) {
     _uploadDirectory = [[path stringByStandardizingPath] copy];
-    _macMode = macFinderMode;
     GCDWebDAVServer* __unsafe_unretained server = self;
     
     // 9.1 PROPFIND method

+ 1 - 1
Mac/main.m

@@ -97,7 +97,7 @@ int main(int argc, const char* argv[]) {
       }
       
       case 3: {
-        webServer = [[GCDWebDAVServer alloc] initWithUploadDirectory:[[NSFileManager defaultManager] currentDirectoryPath] macFinderMode:YES];
+        webServer = [[GCDWebDAVServer alloc] initWithUploadDirectory:[[NSFileManager defaultManager] currentDirectoryPath]];
         break;
       }