{ "info": { "author": "Roman Inflianskas", "author_email": "infroma@gmail.com", "bugtrack_url": null, "classifiers": [ "Development Status :: 3 - Alpha", "Environment :: Console", "Intended Audience :: End Users/Desktop", "License :: OSI Approved :: GNU General Public License v3 or later (GPLv3+)", "Programming Language :: Python :: 3", "Programming Language :: Python :: 3.3", "Programming Language :: Python :: 3.4", "Topic :: Utilities" ], "description": "ownCloud and Seafile conflict files resolver\n============================================\n\nownCloud often generates bunch of conflict files. Seafile is far better, but it happens. Some of conflict files are completely senseless (they are equivalent to non conflict files laying beside them), some of them really differs from their neighborhoods. The aim of this script is to resolve conflict files of both types. \n\nInstallation\n------------\n\nDependencies\n~~~~~~~~~~~~\n\n`python3.3` or newer.\n\nPython 3.3 specific packages: `pathlib flufl.enum`.\n\nAdditional\n\"\"\"\"\"\"\"\"\"\"\n\nPython package: `send2trash` (for deleting files to trash).\n\n`kdiff3` (for file comparison).\n\n\nUsage\n-----\n\nSimple execution\n~~~~~~~~~~~~~~~~\n\n.. code:: bash\n\n cloud-resolve-conflicts ~/ownCloud\n\nThis executes backup of all conflict files into `~/ownCloud/conflict_files_backup.tar`, removes all senseless conflict files (permanently) and asks your decision for real conflict files (it shows `kdiff3` window with files opened side by side). You can specify other program such as `vimdiff` or `meld` with the option `--program-name`.\n\nRemoving all conflict files with extension\n~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n\nRemoving all conflict `*.aux` files (with their corresponding normal files) in current directory using `ag` and `pyp` (you can use `grep` and `xargs` if you prefer):\n\n.. code:: bash\n\n cloud-resolve-conflicts --list-all | ag '.aux$' | pyp \"'rm \\\"{}\\\"'.format(p)\" | sh\n\n(simplier examples with proper spaces escaping are welcome)\n\nOther usages\n~~~~~~~~~~~~\n\nFor more options (such as disabling backups, deleting files to trash, using different compare program, etc.) use:\n\n.. code:: bash\n\n cloud-resolve-conflicts --help\n\nContributing\n------------\n\nSend bug reports (especially with serious bugs such as data loss) and make pull requests on BitBucket_. Star this script if it helped you.\n\nWarranty\n--------\n\nI wrote this script for myself and used it successfully. I hope this program will work for you too. I wrote some tests to be sure that it will do things correctly. But as always:\n\nTHE SOFTWARE IS PROVIDED \"AS IS\" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.\n\n.. _BitBucket: https://bitbucket.org/rominf/cloud-resolve-conflicts", "description_content_type": null, "docs_url": null, "download_url": null, "downloads": { "last_day": -1, "last_month": -1, "last_week": -1 }, "home_page": "https://bitbucket.org/rominf/cloud-resolve-conflicts", "keywords": "cloud seafile owncloud remove conflict file duplicate", "license": "LGPLv3+", "maintainer": null, "maintainer_email": null, "name": "cloud-resolve-conflicts", "package_url": "https://pypi.org/project/cloud-resolve-conflicts/", "platform": "UNKNOWN", "project_url": "https://pypi.org/project/cloud-resolve-conflicts/", "project_urls": { "Homepage": "https://bitbucket.org/rominf/cloud-resolve-conflicts" }, "release_url": "https://pypi.org/project/cloud-resolve-conflicts/0.0.8/", "requires_dist": null, "requires_python": null, "summary": "ownCloud and Seafile conflict resolver", "version": "0.0.8" }, "last_serial": 1311488, "releases": { "0.0.1": [ { "comment_text": "", "digests": { "md5": "73556bfbf71abb2dd6f5842cc8e60653", "sha256": "a174172667ca05eee75a390c168619665aca068e965e7ca701bcffd8d0cfaac7" }, "downloads": -1, "filename": "cloud-resolve-conflicts-0.0.1.tar.gz", "has_sig": false, "md5_digest": "73556bfbf71abb2dd6f5842cc8e60653", "packagetype": "sdist", "python_version": "source", "requires_python": null, "size": 6457, "upload_time": "2014-06-05T09:56:55", "url": "https://files.pythonhosted.org/packages/b5/77/10f61a61426d1662977edf2513c9604d231ffcaff413420f060f0fdc8258/cloud-resolve-conflicts-0.0.1.tar.gz" } ], "0.0.2": [ { "comment_text": "", "digests": { "md5": "57b6150996b9917fd899f62f3d8ca4a6", "sha256": "0af92ed53b7f7f760bafda42993f32067206153285cf503b6c43fb3838b66ce7" }, "downloads": -1, "filename": "cloud-resolve-conflicts-0.0.2.tar.gz", "has_sig": false, "md5_digest": "57b6150996b9917fd899f62f3d8ca4a6", "packagetype": "sdist", "python_version": "source", "requires_python": null, "size": 6774, "upload_time": "2014-06-05T11:03:09", "url": "https://files.pythonhosted.org/packages/3b/36/7c4fc9dce028cdfb507482c96fe0946c4170e4c2796cfc7581a718198c6c/cloud-resolve-conflicts-0.0.2.tar.gz" } ], "0.0.3": [ { "comment_text": "", "digests": { "md5": "d72b4afe4d3ad6e4baea1ecbf6db34cb", "sha256": "f8677e20ebb339e1cbc6f1bf3c44bbc6ee2199476284dd23d3182e5df6102883" }, "downloads": -1, "filename": "cloud-resolve-conflicts-0.0.3.tar.gz", "has_sig": false, "md5_digest": "d72b4afe4d3ad6e4baea1ecbf6db34cb", "packagetype": "sdist", "python_version": "source", "requires_python": null, "size": 7188, "upload_time": "2014-06-05T11:56:50", "url": "https://files.pythonhosted.org/packages/bb/18/60e7806d92616ce2647bb9674311e40a554f194dcc6bc7b51e84711cf1db/cloud-resolve-conflicts-0.0.3.tar.gz" } ], "0.0.4": [ { "comment_text": "", "digests": { "md5": "df9c11ae6c5f077750b04c240cc1f48d", "sha256": "fa142a0c64a37f79bdf2dec8d25f4276e377316b14a369a5956b1ce73544edb9" }, "downloads": -1, "filename": "cloud-resolve-conflicts-0.0.4.tar.gz", "has_sig": false, "md5_digest": "df9c11ae6c5f077750b04c240cc1f48d", "packagetype": "sdist", "python_version": "source", "requires_python": null, "size": 7328, "upload_time": "2014-06-05T14:12:05", "url": "https://files.pythonhosted.org/packages/ba/0a/68f8f7d0cddc08d8f89d02e7ff24ea6b4ed21b8482527479cbf2640397ce/cloud-resolve-conflicts-0.0.4.tar.gz" } ], "0.0.5": [ { "comment_text": "", "digests": { "md5": "d8e731e5e506330b30703128f1a3aba0", "sha256": "9a1c8740de6e1a570a0c70d7559aa0ce930db9f9945264e233815c80ba4e222e" }, "downloads": -1, "filename": "cloud-resolve-conflicts-0.0.5.tar.gz", "has_sig": false, "md5_digest": "d8e731e5e506330b30703128f1a3aba0", "packagetype": "sdist", "python_version": "source", "requires_python": null, "size": 7927, "upload_time": "2014-06-07T09:25:09", "url": "https://files.pythonhosted.org/packages/44/d7/ba297ab00f54d59a97957e360480b954368ed8c4458df3f57bbbf3a062f8/cloud-resolve-conflicts-0.0.5.tar.gz" } ], "0.0.6": [ { "comment_text": "", "digests": { "md5": "65910f5fc42d5af6d767d9585ae78ff2", "sha256": "407a46a861342679568dfa360ab5b068b463dda634b1780b51236dc39e777824" }, "downloads": -1, "filename": "cloud-resolve-conflicts-0.0.6.tar.gz", "has_sig": false, "md5_digest": "65910f5fc42d5af6d767d9585ae78ff2", "packagetype": "sdist", "python_version": "source", "requires_python": null, "size": 7921, "upload_time": "2014-06-09T11:47:26", "url": "https://files.pythonhosted.org/packages/f9/07/e31fb3a62b210a63cb6934908a4ad573a010ff1e0d92b7c8867c90124c4d/cloud-resolve-conflicts-0.0.6.tar.gz" } ], "0.0.7": [ { "comment_text": "", "digests": { "md5": "a209ec46fc63fb894d2b2509062e29a2", "sha256": "7afe85c4d9be13d47b1ac80a9edcd3906daf48bea32b297a8d3ba7f7604f31e4" }, "downloads": -1, "filename": "cloud-resolve-conflicts-0.0.7.tar.gz", "has_sig": false, "md5_digest": "a209ec46fc63fb894d2b2509062e29a2", "packagetype": "sdist", "python_version": "source", "requires_python": null, "size": 7968, "upload_time": "2014-11-08T21:48:55", "url": "https://files.pythonhosted.org/packages/49/68/5e81caf9541e505c5bb60f24af16193e2ed1e2e876be37d0d35bc17ddfff/cloud-resolve-conflicts-0.0.7.tar.gz" } ], "0.0.8": [ { "comment_text": "", "digests": { "md5": "cd5f23644c5f417f09f014c22137d31a", "sha256": "73953dbf5c5204db81b0c9be8d21c2252e4fa9ae7d5c0ba8e2adb1fa8a58d5f8" }, "downloads": -1, "filename": "cloud-resolve-conflicts-0.0.8.tar.gz", "has_sig": false, "md5_digest": "cd5f23644c5f417f09f014c22137d31a", "packagetype": "sdist", "python_version": "source", "requires_python": null, "size": 8131, "upload_time": "2014-11-18T14:21:51", "url": "https://files.pythonhosted.org/packages/2d/15/121a651579cbaf6c3d2ecb8d08eed7af7281146e2f0675bf1ad2a4ba54d5/cloud-resolve-conflicts-0.0.8.tar.gz" } ] }, "urls": [ { "comment_text": "", "digests": { "md5": "cd5f23644c5f417f09f014c22137d31a", "sha256": "73953dbf5c5204db81b0c9be8d21c2252e4fa9ae7d5c0ba8e2adb1fa8a58d5f8" }, "downloads": -1, "filename": "cloud-resolve-conflicts-0.0.8.tar.gz", "has_sig": false, "md5_digest": "cd5f23644c5f417f09f014c22137d31a", "packagetype": "sdist", "python_version": "source", "requires_python": null, "size": 8131, "upload_time": "2014-11-18T14:21:51", "url": "https://files.pythonhosted.org/packages/2d/15/121a651579cbaf6c3d2ecb8d08eed7af7281146e2f0675bf1ad2a4ba54d5/cloud-resolve-conflicts-0.0.8.tar.gz" } ] }