Flattened file structure.

- Gone is that despised, original structure.

Author: dsoprea

gdrivefs/gdtool/account_info.py renamed to gdrivefs/account_info.py

@@ -1,7 +1,7 @@
 import logging
 
-from gdrivefs.general.livereader_base import LiveReaderBase
-from gdrivefs.gdtool.drive import get_gdrive
+from gdrivefs.livereader_base import LiveReaderBase
+from gdrivefs.drive import get_gdrive
 
 _logger = logging.getLogger(__name__)
 

gdrivefs/general/buffer_segments.py renamed to gdrivefs/buffer_segments.py

@@ -8,7 +8,7 @@
 import gdrivefs.state
 
 from gdrivefs.conf import Conf
-from gdrivefs.cache.cache_registry import CacheRegistry, CacheFault
+from gdrivefs.cache_registry import CacheRegistry, CacheFault
 
 _logger = logging.getLogger(__name__)
 _logger.setLevel(logging.INFO)

gdrivefs/cache/__init__.py

@@ -1,6 +1,6 @@
 import logging
 
-from gdrivefs.cache.cache_agent import CacheAgent
+from gdrivefs.cache_agent import CacheAgent
 
 _logger = logging.getLogger(__name__)
 

gdrivefs/cache/cache_agent.py renamed to gdrivefs/cache_agent.py

@@ -5,9 +5,9 @@
 import gdrivefs.state
 
 from gdrivefs.conf import Conf
-from gdrivefs.gdtool.account_info import AccountInfo
-from gdrivefs.gdtool.drive import get_gdrive
-from gdrivefs.cache.volume import PathRelations, EntryCache
+from gdrivefs.account_info import AccountInfo
+from gdrivefs.drive import get_gdrive
+from gdrivefs.volume import PathRelations, EntryCache
 
 _logger = logging.getLogger(__name__)
 _logger.setLevel(logging.WARNING)

gdrivefs/cache/cache_registry.py renamed to gdrivefs/cache_registry.py

@@ -6,8 +6,8 @@
 from os import makedirs
 from os.path import isdir
 
-from gdrivefs.gdtool.drive import get_gdrive
-from gdrivefs.gdtool.normal_entry import NormalEntry
+from gdrivefs.drive import get_gdrive
+from gdrivefs.normal_entry import NormalEntry
 from gdrivefs.conf import Conf
 
 _logger = logging.getLogger(__name__)

gdrivefs/cache/cacheclient_base.py renamed to gdrivefs/cacheclient_base.py

@@ -24,8 +24,8 @@ import gipc
 
 from gdrivefs.config import download_agent
 from gdrivefs.utility import utility
-from gdrivefs.gdtool.chunked_download import ChunkedDownload
-from gdrivefs.gdtool.drive import GdriveAuth
+from gdrivefs.chunked_download import ChunkedDownload
+from gdrivefs.drive import GdriveAuth
 
 _RT_PROGRESS = 'p'
 _RT_ERROR = 'e'

gdrivefs/change.py

@@ -21,12 +21,12 @@
 import gdrivefs.constants
 import gdrivefs.config
 import gdrivefs.conf
-import gdrivefs.gdtool.chunked_download
+import gdrivefs.chunked_download
 import gdrivefs.errors
-import gdrivefs.gdtool.oauth_authorize
-import gdrivefs.gdtool.normal_entry
+import gdrivefs.oauth_authorize
+import gdrivefs.normal_entry
 import gdrivefs.time_support
-import gdrivefs.gdfs.fsutility
+import gdrivefs.fsutility
 
 _CONF_SERVICE_NAME = 'drive'
 _CONF_SERVICE_VERSION = 'v2'
@@ -96,7 +96,7 @@ def wrapper(*args, **kwargs):
                 _logger.info("There was an authorization fault under "
                              "action [%s]. Attempting refresh.", action)
 
-                authorize = gdrivefs.gdtool.oauth_authorize.get_auth()
+                authorize = gdrivefs.oauth_authorize.get_auth()
                 authorize.check_credential_state()
 
                 # Re-attempt the action.
@@ -110,7 +110,7 @@ def wrapper(*args, **kwargs):
 class GdriveAuth(object):
     def __init__(self):
         self.__client = None
-        self.__authorize = gdrivefs.gdtool.oauth_authorize.get_auth()
+        self.__authorize = gdrivefs.oauth_authorize.get_auth()
         self.__check_authorization()
         self.__http = None
 
@@ -239,7 +239,7 @@ def list_changes(self, start_change_id=None, page_token=None):
                 normalized_entry = None
             else:
                 normalized_entry = \
-                    gdrivefs.gdtool.normal_entry.NormalEntry(
+                    gdrivefs.normal_entry.NormalEntry(
                         'list_changes', 
                         entry)
 
@@ -281,10 +281,10 @@ def get_children_under_parent_id(self,
 
         if query_is_string:
             query = ("title='%s'" % 
-                     (gdrivefs.gdfs.fsutility.escape_filename_for_query(query_is_string)))
+                     (gdrivefs.fsutility.escape_filename_for_query(query_is_string)))
         elif query_contains_string:
             query = ("title contains '%s'" % 
-                     (gdrivefs.gdfs.fsutility.escape_filename_for_query(query_contains_string)))
+                     (gdrivefs.fsutility.escape_filename_for_query(query_contains_string)))
         else:
             query = None
 
@@ -318,7 +318,7 @@ def get_entry(self, entry_id):
         self.__assert_response_kind(response, 'drive#file')
 
         return \
-            gdrivefs.gdtool.normal_entry.NormalEntry('direct_read', response)
+            gdrivefs.normal_entry.NormalEntry('direct_read', response)
 
     @_marshall
     def list_files(self, query_contains_string=None, query_is_string=None, 
@@ -345,10 +345,10 @@ def list_files(self, query_contains_string=None, query_is_string=None,
 
         if query_is_string:
             query_components.append("title='%s'" % 
-                                    (gdrivefs.gdfs.fsutility.escape_filename_for_query(query_is_string)))
+                                    (gdrivefs.fsutility.escape_filename_for_query(query_is_string)))
         elif query_contains_string:
             query_components.append("title contains '%s'" % 
-                                    (gdrivefs.gdfs.fsutility.escape_filename_for_query(query_contains_string)))
+                                    (gdrivefs.fsutility.escape_filename_for_query(query_contains_string)))
 
         # Make sure that we don't get any entries that we would have to ignore.
 
@@ -377,7 +377,7 @@ def list_files(self, query_contains_string=None, query_is_string=None,
 
             for entry_raw in result[u'items']:
                 entry = \
-                    gdrivefs.gdtool.normal_entry.NormalEntry(
+                    gdrivefs.normal_entry.NormalEntry(
                         'list_files', 
                         entry_raw)
 
@@ -460,7 +460,7 @@ def download_to_local(self, output_file_path, normalized_entry,
         url = normalized_entry.download_links[mime_type]
 
         with open(output_file_path, 'wb') as f:
-            downloader = gdrivefs.gdtool.chunked_download.ChunkedDownload(
+            downloader = gdrivefs.chunked_download.ChunkedDownload(
                             f, 
                             authed_http, 
                             url)
@@ -608,7 +608,7 @@ def __insert_entry(self, is_file, filename, parents, mime_type,
         self.__assert_response_kind(response, 'drive#file')
 
         normalized_entry = \
-            gdrivefs.gdtool.normal_entry.NormalEntry(
+            gdrivefs.normal_entry.NormalEntry(
                 'insert_entry', 
                 response)
 
@@ -721,7 +721,7 @@ def update_entry(self, normalized_entry, filename=None, data_filepath=None,
                     data_filepath is not None)
 
         normalized_entry = \
-            gdrivefs.gdtool.normal_entry.NormalEntry('update_entry', result)
+            gdrivefs.normal_entry.NormalEntry('update_entry', result)
 
         _logger.debug("Entry updated: [%s]", normalized_entry)
 
@@ -754,7 +754,7 @@ def __finish_upload(self, filename, request, has_file):
     @_marshall
     def rename(self, normalized_entry, new_filename):
 
-        result = gdrivefs.gdfs.fsutility.split_path_nolookups(new_filename)
+        result = gdrivefs.fsutility.split_path_nolookups(new_filename)
         (path, filename_stripped, mime_type, is_hidden) = result
 
         _logger.debug("Renaming entry [%s] to [%s]. IS_HIDDEN=[%s]",

gdrivefs/gdtool/chunked_download.py renamed to gdrivefs/chunked_download.py

@@ -17,26 +17,26 @@
 from datetime import datetime
 from os.path import split
 
-import gdrivefs.gdfs.fsutility
-import gdrivefs.gdfs.opened_file
+import gdrivefs.fsutility
+import gdrivefs.opened_file
 import gdrivefs.config
 import gdrivefs.config.changes
 import gdrivefs.config.fs
 
 from gdrivefs.utility import utility
 from gdrivefs.change import get_change_manager
-from gdrivefs.cache.volume import PathRelations, EntryCache, \
+from gdrivefs.volume import PathRelations, EntryCache, \
                                   CLAUSE_ENTRY, CLAUSE_PARENT, \
                                   CLAUSE_CHILDREN, CLAUSE_ID, \
                                   CLAUSE_CHILDREN_LOADED
 from gdrivefs.conf import Conf
-from gdrivefs.gdtool.drive import get_gdrive
-from gdrivefs.gdtool.account_info import AccountInfo
+from gdrivefs.drive import get_gdrive
+from gdrivefs.account_info import AccountInfo
 
-from gdrivefs.gdfs.fsutility import strip_export_type, split_path,\
+from gdrivefs.fsutility import strip_export_type, split_path,\
                                     build_filepath, dec_hint
-from gdrivefs.gdfs.displaced_file import DisplacedFile
-from gdrivefs.cache.volume import path_resolver
+from gdrivefs.displaced_file import DisplacedFile
+from gdrivefs.volume import path_resolver
 from gdrivefs.errors import GdNotFoundError
 from gdrivefs.time_support import get_flat_normal_fs_time_from_epoch
 
@@ -218,7 +218,7 @@ def readdir(self, path, offset):
     @dec_hint(['raw_path', 'length', 'offset', 'fh'])
     def read(self, raw_path, length, offset, fh):
 
-        om = gdrivefs.gdfs.opened_file.get_om()
+        om = gdrivefs.opened_file.get_om()
 
         try:
             opened_file = om.get_by_fh(fh)
@@ -338,7 +338,7 @@ def __create(self, filepath, mode=None):
     def create(self, raw_filepath, mode):
         """Create a new file. This always precedes a write."""
 
-        om = gdrivefs.gdfs.opened_file.get_om()
+        om = gdrivefs.opened_file.get_om()
 
         try:
             fh = om.get_new_handle()
@@ -351,7 +351,7 @@ def create(self, raw_filepath, mode):
         (entry, path, filename, mime_type) = self.__create(raw_filepath)
 
         try:
-            opened_file = gdrivefs.gdfs.opened_file.OpenedFile(
+            opened_file = gdrivefs.opened_file.OpenedFile(
                             entry.id, 
                             path, 
                             filename, 
@@ -366,7 +366,7 @@ def create(self, raw_filepath, mode):
         _logger.debug("Registering OpenedFile object with handle (%d), "
                       "path [%s], and ID [%s].", fh, raw_filepath, entry.id)
 
-        om = gdrivefs.gdfs.opened_file.get_om()
+        om = gdrivefs.opened_file.get_om()
 
         try:
             om.add(opened_file, fh=fh)
@@ -385,7 +385,7 @@ def open(self, filepath, flags):
 # TODO: Fail if does not exist and the mode/flags is read only.
 
         try:
-            opened_file = gdrivefs.gdfs.opened_file.\
+            opened_file = gdrivefs.opened_file.\
                             create_for_existing_filepath(filepath)
         except GdNotFoundError:
             _logger.exception("Could not create handle for requested [%s] "
@@ -396,7 +396,7 @@ def open(self, filepath, flags):
                                  "opened filepath [%s].", filepath)
             raise FuseOSError(EIO)
 
-        om = gdrivefs.gdfs.opened_file.get_om()
+        om = gdrivefs.opened_file.get_om()
 
         try:
             fh = om.add(opened_file)
@@ -414,7 +414,7 @@ def open(self, filepath, flags):
     def release(self, filepath, fh):
         """Close a file."""
 
-        om = gdrivefs.gdfs.opened_file.get_om()
+        om = gdrivefs.opened_file.get_om()
 
         try:
             om.remove_by_fh(fh)
@@ -426,7 +426,7 @@ def release(self, filepath, fh):
 
     @dec_hint(['filepath', 'data', 'offset', 'fh'], ['data'])
     def write(self, filepath, data, offset, fh):
-        om = gdrivefs.gdfs.opened_file.get_om()
+        om = gdrivefs.opened_file.get_om()
 
         try:
             opened_file = om.get_by_fh(fh=fh)
@@ -445,7 +445,7 @@ def write(self, filepath, data, offset, fh):
     @dec_hint(['filepath', 'fh'])
     def flush(self, filepath, fh):
 
-        om = gdrivefs.gdfs.opened_file.get_om()
+        om = gdrivefs.opened_file.get_om()
 
         try:
             opened_file = om.get_by_fh(fh=fh)
@@ -628,7 +628,7 @@ def rename(self, filepath_old, filepath_new):
     @dec_hint(['filepath', 'length', 'fh'])
     def truncate(self, filepath, length, fh=None):
         if fh is not None:
-            om = gdrivefs.gdfs.opened_file.get_om()
+            om = gdrivefs.opened_file.get_om()
 
             try:
                 opened_file = om.get_by_fh(fh)
@@ -719,7 +719,7 @@ def unlink(self, file_path):
 
         # Remove from among opened-files.
 
-        om = gdrivefs.gdfs.opened_file.get_om()
+        om = gdrivefs.opened_file.get_om()
 
         try:
             opened_file = om.remove_by_filepath(file_path)
@@ -860,7 +860,7 @@ def mount(auth_storage_filepath, mountpoint, debug=None, nothreads=None,
     name = ("gdfs(%s)" % (auth_storage_filepath,))
 
     # Make sure we can connect.
-    gdrivefs.gdtool.account_info.AccountInfo().get_data()
+    gdrivefs.account_info.AccountInfo().get_data()
 
     fuse = FUSE(
             GDriveFS(),